summaryrefslogtreecommitdiff
path: root/wt-status.c
AgeCommit message (Expand)Author
2016-09-19Merge branch 'bc/object-id'Junio C Hamano
2016-09-09Merge branch 'jh/status-v2-porcelain'Junio C Hamano
2016-08-11status: print branch info with --porcelain=v2 --branchJeff Hostetler
2016-08-11status: print per-file porcelain v2 status dataJeff Hostetler
2016-08-11status: collect per-file data for --porcelain=v2Jeff Hostetler
2016-08-10Merge branch 'js/am-3-merge-recursive-direct'Junio C Hamano
2016-08-05status: cleanup API to wt_status_printJeff Hostetler
2016-08-05status: rename long-format print routinesJeff Hostetler
2016-08-03Merge branch 'mm/status-suggest-merge-abort'Junio C Hamano
2016-07-26die("bug"): report bugs consistentlyJohannes Schindelin
2016-07-25Merge branch 'rs/use-strbuf-addbuf'Junio C Hamano
2016-07-22status: suggest 'git merge --abort' when appropriateMatthieu Moy
2016-07-19Merge branch 'bc/cocci'Junio C Hamano
2016-07-19use strbuf_addbuf() for appending a strbuf to anotherRené Scharfe
2016-07-13Merge branch 'va/i18n-even-more'Junio C Hamano
2016-06-28diff: convert struct diff_filespec to struct object_idbrian m. carlson
2016-06-17i18n: unmark die messages for translationVasco Almeida
2016-06-09Use "working tree" instead of "working directory" for git statusLars Vogel
2016-05-23Merge branch 'nd/worktree-various-heads'Junio C Hamano
2016-05-23Merge branch 'ss/commit-dry-run-resolve-merge-to-no-op'Junio C Hamano
2016-04-22wt-status.c: split bisect detection out of wt_status_get_state()Nguyễn Thái Ngọc Duy
2016-04-22wt-status.c: make wt_status_check_rebase() work on any worktreeNguyễn Thái Ngọc Duy
2016-04-22wt-status.c: split rebase detection out of wt_status_get_state()Nguyễn Thái Ngọc Duy
2016-04-13Merge branch 'sb/misc-cleanups'Junio C Hamano
2016-04-01abbrev_sha1_in_line: don't leak memoryStefan Beller
2016-03-14Merge branch 'mg/wt-status-mismarked-i18n'Junio C Hamano
2016-03-14wt-status: allow "ahead " to be picked up by l10nMichael J Gruber
2016-02-17wt-status.c: set commitable bit if there is a meaningful merge.Stephen P. Smith
2016-01-15strbuf: introduce strbuf_getline_{lf,nul}()Junio C Hamano
2015-12-10Merge branch 'bc/object-id'Junio C Hamano
2015-11-28wt-status: correct and simplify check for detached HEADRené Scharfe
2015-11-20Remove get_object_hash.brian m. carlson
2015-11-20Add several uses of get_object_hash.brian m. carlson
2015-11-05Merge branch 'rs/wt-status-detached-branch-fix' into maintJunio C Hamano
2015-11-03Merge branch 'rs/wt-status-detached-branch-fix'Junio C Hamano
2015-11-01wt-status: use skip_prefix() to get rid of magic string length constantsRené Scharfe
2015-11-01wt-status: don't skip a magical number of characters blindlyRené Scharfe
2015-11-01wt-status: avoid building bogus branch name with detached HEADRené Scharfe
2015-11-01wt-status: exit early using goto in wt_shortstatus_print_tracking()René Scharfe
2015-10-16Merge branch 'mm/detach-at-HEAD-reflog' into maintJunio C Hamano
2015-10-15Merge branch 'mm/detach-at-HEAD-reflog'Junio C Hamano
2015-10-02status: don't say 'HEAD detached at HEAD'Matthieu Moy
2015-09-04Merge branch 'sg/wt-status-header-inclusion' into maintJunio C Hamano
2015-08-26Merge branch 'sg/wt-status-header-inclusion'Junio C Hamano
2015-08-21wt-status: move #include "pathspec.h" to the headerSZEDER Gábor
2015-08-10memoize common git-path "constant" filesJeff King
2015-08-03Merge branch 'gp/status-rebase-i-info'Junio C Hamano
2015-08-03Merge branch 'sg/commit-cleanup-scissors' into maintJunio C Hamano
2015-07-06status: give more information during rebase -iGuillaume Pagès
2015-06-30status: differentiate interactive from non-interactive rebasesGuillaume Pagès