summaryrefslogtreecommitdiff
path: root/wt-status.c
AgeCommit message (Expand)AuthorFilesLines
2016-09-19Merge branch 'bc/object-id'Libravatar Junio C Hamano1-2/+2
2016-09-15use strbuf_addstr() for adding constant strings to a strbuf, part 2Libravatar René Scharfe1-3/+3
2016-09-08Merge branch 'jh/status-v2-porcelain'Libravatar Junio C Hamano1-59/+511
2016-08-11status: print branch info with --porcelain=v2 --branchLibravatar Jeff Hostetler1-0/+90
2016-08-11status: print per-file porcelain v2 status dataLibravatar Jeff Hostetler1-1/+284
2016-08-11status: collect per-file data for --porcelain=v2Libravatar Jeff Hostetler1-2/+62
2016-08-10Merge branch 'js/am-3-merge-recursive-direct'Libravatar Junio C Hamano1-2/+2
2016-08-05status: cleanup API to wt_status_printLibravatar Jeff Hostetler1-3/+22
2016-08-05status: rename long-format print routinesLibravatar Jeff Hostetler1-55/+55
2016-08-03Merge branch 'mm/status-suggest-merge-abort'Libravatar Junio C Hamano1-2/+5
2016-07-26die("bug"): report bugs consistentlyLibravatar Johannes Schindelin1-2/+2
2016-07-25Merge branch 'rs/use-strbuf-addbuf'Libravatar Junio C Hamano1-1/+1
2016-07-22status: suggest 'git merge --abort' when appropriateLibravatar Matthieu Moy1-2/+5
2016-07-19Merge branch 'bc/cocci'Libravatar Junio C Hamano1-1/+2
2016-07-19use strbuf_addbuf() for appending a strbuf to anotherLibravatar René Scharfe1-1/+1
2016-07-13Merge branch 'va/i18n-even-more'Libravatar Junio C Hamano1-2/+2
2016-06-28diff: convert struct diff_filespec to struct object_idLibravatar brian m. carlson1-1/+2
2016-06-17i18n: unmark die messages for translationLibravatar Vasco Almeida1-2/+2
2016-06-09Use "working tree" instead of "working directory" for git statusLibravatar Lars Vogel1-1/+1
2016-05-23Merge branch 'nd/worktree-various-heads'Libravatar Junio C Hamano1-20/+43
2016-05-23Merge branch 'ss/commit-dry-run-resolve-merge-to-no-op'Libravatar Junio C Hamano1-0/+1
2016-04-22wt-status.c: split bisect detection out of wt_status_get_state()Libravatar Nguyễn Thái Ngọc Duy1-9/+14
2016-04-22wt-status.c: make wt_status_check_rebase() work on any worktreeLibravatar Nguyễn Thái Ngọc Duy1-13/+20
2016-04-22wt-status.c: split rebase detection out of wt_status_get_state()Libravatar Nguyễn Thái Ngọc Duy1-6/+17
2016-04-13Merge branch 'sb/misc-cleanups'Libravatar Junio C Hamano1-3/+1
2016-04-01abbrev_sha1_in_line: don't leak memoryLibravatar Stefan Beller1-3/+1
2016-03-14Merge branch 'mg/wt-status-mismarked-i18n'Libravatar Junio C Hamano1-2/+2
2016-03-14wt-status: allow "ahead " to be picked up by l10nLibravatar Michael J Gruber1-2/+2
2016-02-17wt-status.c: set commitable bit if there is a meaningful merge.Libravatar Stephen P. Smith1-0/+1
2016-01-15strbuf: introduce strbuf_getline_{lf,nul}()Libravatar Junio C Hamano1-2/+2
2015-12-10Merge branch 'bc/object-id'Libravatar Junio C Hamano1-1/+1
2015-11-28wt-status: correct and simplify check for detached HEADLibravatar René Scharfe1-5/+4
2015-11-20Remove get_object_hash.Libravatar brian m. carlson1-1/+1
2015-11-20Add several uses of get_object_hash.Libravatar brian m. carlson1-1/+1
2015-11-05Merge branch 'rs/wt-status-detached-branch-fix' into maintLibravatar Junio C Hamano1-35/+29
2015-11-03Merge branch 'rs/wt-status-detached-branch-fix'Libravatar Junio C Hamano1-35/+29
2015-11-01wt-status: use skip_prefix() to get rid of magic string length constantsLibravatar René Scharfe1-21/+15
2015-11-01wt-status: don't skip a magical number of characters blindlyLibravatar René Scharfe1-1/+1
2015-11-01wt-status: avoid building bogus branch name with detached HEADLibravatar René Scharfe1-6/+9
2015-11-01wt-status: exit early using goto in wt_shortstatus_print_tracking()Libravatar René Scharfe1-8/+5
2015-10-16Merge branch 'mm/detach-at-HEAD-reflog' into maintLibravatar Junio C Hamano1-0/+6
2015-10-15Merge branch 'mm/detach-at-HEAD-reflog'Libravatar Junio C Hamano1-0/+6
2015-10-02status: don't say 'HEAD detached at HEAD'Libravatar Matthieu Moy1-0/+6
2015-09-03Merge branch 'sg/wt-status-header-inclusion' into maintLibravatar Junio C Hamano1-1/+0
2015-08-26Merge branch 'sg/wt-status-header-inclusion'Libravatar Junio C Hamano1-1/+0
2015-08-21wt-status: move #include "pathspec.h" to the headerLibravatar SZEDER Gábor1-1/+0
2015-08-10memoize common git-path "constant" filesLibravatar Jeff King1-4/+4
2015-08-03Merge branch 'gp/status-rebase-i-info'Libravatar Junio C Hamano1-17/+134
2015-08-03Merge branch 'sg/commit-cleanup-scissors' into maintLibravatar Junio C Hamano1-4/+5
2015-07-06status: give more information during rebase -iLibravatar Guillaume Pagès1-0/+114