aboutsummaryrefslogtreecommitdiff
path: root/wt-status.c
Commit message (Expand)AuthorAge
* Merge branch 'mm/status-suggest-merge-abort'Junio C Hamano2016-08-03
|\
| * status: suggest 'git merge --abort' when appropriateMatthieu Moy2016-07-22
* | Merge branch 'rs/use-strbuf-addbuf'Junio C Hamano2016-07-25
|\ \
| * | use strbuf_addbuf() for appending a strbuf to anotherRené Scharfe2016-07-19
| |/
* | Merge branch 'bc/cocci'Junio C Hamano2016-07-19
|\ \
| * | diff: convert struct diff_filespec to struct object_idbrian m. carlson2016-06-28
* | | Merge branch 'va/i18n-even-more'Junio C Hamano2016-07-13
|\ \ \
| * | | i18n: unmark die messages for translationVasco Almeida2016-06-17
| |/ /
* | | Use "working tree" instead of "working directory" for git statusLars Vogel2016-06-09
|/ /
* | Merge branch 'nd/worktree-various-heads'Junio C Hamano2016-05-23
|\ \
| * | wt-status.c: split bisect detection out of wt_status_get_state()Nguyễn Thái Ngọc Duy2016-04-22
| * | wt-status.c: make wt_status_check_rebase() work on any worktreeNguyễn Thái Ngọc Duy2016-04-22
| * | wt-status.c: split rebase detection out of wt_status_get_state()Nguyễn Thái Ngọc Duy2016-04-22
* | | Merge branch 'ss/commit-dry-run-resolve-merge-to-no-op'Junio C Hamano2016-05-23
|\ \ \ | |/ / |/| |
| * | wt-status.c: set commitable bit if there is a meaningful merge.Stephen P. Smith2016-02-17
* | | Merge branch 'sb/misc-cleanups'Junio C Hamano2016-04-13
|\ \ \
| * | | abbrev_sha1_in_line: don't leak memoryStefan Beller2016-04-01
* | | | Merge branch 'mg/wt-status-mismarked-i18n'Junio C Hamano2016-03-14
|\ \ \ \
| * | | | wt-status: allow "ahead " to be picked up by l10nMichael J Gruber2016-03-14
* | | | | strbuf: introduce strbuf_getline_{lf,nul}()Junio C Hamano2016-01-15
| |/ / / |/| | |
* | | | Merge branch 'bc/object-id'Junio C Hamano2015-12-10
|\ \ \ \ | |_|_|/ |/| | |
| * | | Remove get_object_hash.brian m. carlson2015-11-20
| * | | Add several uses of get_object_hash.brian m. carlson2015-11-20
| * | | Merge branch 'rs/wt-status-detached-branch-fix'Junio C Hamano2015-11-03
| |\ \ \
| * \ \ \ Merge branch 'mm/detach-at-HEAD-reflog'Junio C Hamano2015-10-15
| |\ \ \ \
* | | | | | wt-status: correct and simplify check for detached HEADRené Scharfe2015-11-28
* | | | | | Merge branch 'rs/wt-status-detached-branch-fix' into maintJunio C Hamano2015-11-05
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | wt-status: use skip_prefix() to get rid of magic string length constantsRené Scharfe2015-11-01
| * | | | | wt-status: don't skip a magical number of characters blindlyRené Scharfe2015-11-01
| * | | | | wt-status: avoid building bogus branch name with detached HEADRené Scharfe2015-11-01
| * | | | | wt-status: exit early using goto in wt_shortstatus_print_tracking()René Scharfe2015-11-01
| * | | | | Merge branch 'sg/wt-status-header-inclusion' into maintJunio C Hamano2015-09-03
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'mm/detach-at-HEAD-reflog' into maintJunio C Hamano2015-10-16
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | / / / | | |_|/ / / | |/| | | |
| * | | | | status: don't say 'HEAD detached at HEAD'Matthieu Moy2015-10-02
| | |_|_|/ | |/| | |
* | | | | Merge branch 'sg/wt-status-header-inclusion'Junio C Hamano2015-08-26
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | wt-status: move #include "pathspec.h" to the headerSZEDER Gábor2015-08-21
| |/ / /
| * | | Merge branch 'sg/commit-cleanup-scissors' into maintJunio C Hamano2015-08-03
| |\ \ \
* | | | | memoize common git-path "constant" filesJeff King2015-08-10
* | | | | Merge branch 'gp/status-rebase-i-info'Junio C Hamano2015-08-03
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | status: give more information during rebase -iGuillaume Pagès2015-07-06
| * | | | status: differentiate interactive from non-interactive rebasesGuillaume Pagès2015-06-30
| * | | | status: factor two rebase-related messages togetherGuillaume Pagès2015-06-30
* | | | | Merge branch 'sg/commit-cleanup-scissors'Junio C Hamano2015-06-24
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| |
| * | | commit: cope with scissors lines in commit messageSZEDER Gábor2015-06-09
* | | | Merge branch 'jk/at-push-sha1'Junio C Hamano2015-06-05
|\ \ \ \
| * | | | remote.c: return upstream name from stat_tracking_infoJeff King2015-05-22
* | | | | Merge branch 'nd/untracked-cache'Junio C Hamano2015-05-26
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | status: enable untracked cacheNguyễn Thái Ngọc Duy2015-03-12
* | | | | Merge branch 'sb/plug-wt-shortstatus-tracking-leak'Junio C Hamano2015-04-14
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | wt-status.c: fix a memleakStefan Beller2015-03-30