summaryrefslogtreecommitdiff
path: root/wt-status.c
Commit message (Expand)AuthorAgeFilesLines
* status: be prepared for not-yet-started interactive rebasejs/status-pre-rebase-iJohannes Schindelin2017-01-261-4/+10
* use strbuf_add_unique_abbrev() for adding short hashes, part 3René Scharfe2016-10-101-6/+4
* use strbuf_add_unique_abbrev() for adding short hashes, part 2René Scharfe2016-09-271-2/+1
* use strbuf_addstr() for adding constant strings to a strbuf, part 2René Scharfe2016-09-151-3/+3
* Merge branch 'js/am-3-merge-recursive-direct'Junio C Hamano2016-08-101-2/+2
|\
| * die("bug"): report bugs consistentlyJohannes Schindelin2016-07-261-2/+2
* | Merge branch 'mm/status-suggest-merge-abort'Junio C Hamano2016-08-031-2/+5
|\ \ | |/ |/|
| * status: suggest 'git merge --abort' when appropriatemm/status-suggest-merge-abortMatthieu Moy2016-07-221-2/+5
* | Merge branch 'rs/use-strbuf-addbuf'Junio C Hamano2016-07-251-1/+1
|\ \
| * | use strbuf_addbuf() for appending a strbuf to anotherRené Scharfe2016-07-191-1/+1
| |/
* | Merge branch 'bc/cocci'Junio C Hamano2016-07-191-1/+2
|\ \
| * | diff: convert struct diff_filespec to struct object_idbrian m. carlson2016-06-281-1/+2
* | | Merge branch 'va/i18n-even-more'Junio C Hamano2016-07-131-2/+2
|\ \ \
| * | | i18n: unmark die messages for translationVasco Almeida2016-06-171-2/+2
| |/ /
* | | Use "working tree" instead of "working directory" for git statuslv/status-say-working-tree-not-directoryLars Vogel2016-06-091-1/+1
|/ /
* | Merge branch 'nd/worktree-various-heads'Junio C Hamano2016-05-231-20/+43
|\ \
| * | wt-status.c: split bisect detection out of wt_status_get_state()Nguyễn Thái Ngọc Duy2016-04-221-9/+14
| * | wt-status.c: make wt_status_check_rebase() work on any worktreeNguyễn Thái Ngọc Duy2016-04-221-13/+20
| * | wt-status.c: split rebase detection out of wt_status_get_state()Nguyễn Thái Ngọc Duy2016-04-221-6/+17
* | | Merge branch 'ss/commit-dry-run-resolve-merge-to-no-op'Junio C Hamano2016-05-231-0/+1
|\ \ \ | |/ / |/| |
| * | wt-status.c: set commitable bit if there is a meaningful merge.ss/commit-dry-run-resolve-merge-to-no-opStephen P. Smith2016-02-171-0/+1
* | | Merge branch 'sb/misc-cleanups'Junio C Hamano2016-04-131-3/+1
|\ \ \
| * | | abbrev_sha1_in_line: don't leak memoryStefan Beller2016-04-011-3/+1
* | | | Merge branch 'mg/wt-status-mismarked-i18n'Junio C Hamano2016-03-141-2/+2
|\ \ \ \
| * | | | wt-status: allow "ahead " to be picked up by l10nmg/wt-status-mismarked-i18nMichael J Gruber2016-03-141-2/+2
* | | | | strbuf: introduce strbuf_getline_{lf,nul}()Junio C Hamano2016-01-151-2/+2
| |/ / / |/| | |
* | | | Merge branch 'bc/object-id'Junio C Hamano2015-12-101-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Remove get_object_hash.brian m. carlson2015-11-201-1/+1
| * | | Add several uses of get_object_hash.brian m. carlson2015-11-201-1/+1
| * | | Merge branch 'rs/wt-status-detached-branch-fix'Junio C Hamano2015-11-031-35/+29
| |\ \ \
| * \ \ \ Merge branch 'mm/detach-at-HEAD-reflog'Junio C Hamano2015-10-151-0/+6
| |\ \ \ \
* | | | | | wt-status: correct and simplify check for detached HEADrs/status-detached-head-memcmpRené Scharfe2015-11-281-5/+4
* | | | | | Merge branch 'rs/wt-status-detached-branch-fix' into maintJunio C Hamano2015-11-051-35/+29
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | wt-status: use skip_prefix() to get rid of magic string length constantsrs/wt-status-detached-branch-fixRené Scharfe2015-11-011-21/+15
| * | | | | wt-status: don't skip a magical number of characters blindlyRené Scharfe2015-11-011-1/+1
| * | | | | wt-status: avoid building bogus branch name with detached HEADRené Scharfe2015-11-011-6/+9
| * | | | | wt-status: exit early using goto in wt_shortstatus_print_tracking()René Scharfe2015-11-011-8/+5
| * | | | | Merge branch 'sg/wt-status-header-inclusion' into maintJunio C Hamano2015-09-031-1/+0
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'mm/detach-at-HEAD-reflog' into maintJunio C Hamano2015-10-161-0/+6
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | / / / | | |_|/ / / | |/| | | |
| * | | | | status: don't say 'HEAD detached at HEAD'mm/detach-at-HEAD-reflogMatthieu Moy2015-10-021-0/+6
| | |_|_|/ | |/| | |
* | | | | Merge branch 'sg/wt-status-header-inclusion'Junio C Hamano2015-08-261-1/+0
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | wt-status: move #include "pathspec.h" to the headersg/wt-status-header-inclusionSZEDER Gábor2015-08-211-1/+0
| |/ / /
| * | | Merge branch 'sg/commit-cleanup-scissors' into maintJunio C Hamano2015-08-031-4/+5
| |\ \ \
* | | | | memoize common git-path "constant" filesjk/git-pathJeff King2015-08-101-4/+4
* | | | | Merge branch 'gp/status-rebase-i-info'Junio C Hamano2015-08-031-17/+134
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | status: give more information during rebase -iGuillaume Pagès2015-07-061-0/+114
| * | | | status: differentiate interactive from non-interactive rebasesGuillaume Pagès2015-06-301-1/+4
| * | | | status: factor two rebase-related messages togetherGuillaume Pagès2015-06-301-16/+16
* | | | | Merge branch 'sg/commit-cleanup-scissors'Junio C Hamano2015-06-241-4/+5
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| |
| * | | commit: cope with scissors lines in commit messagesg/commit-cleanup-scissorsSZEDER Gábor2015-06-091-4/+5
View Lorry Controller Status