Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'nd/worktree-various-heads' | Junio C Hamano | 2016-05-23 | 1 | -20/+43 |
|\ | |||||
| * | wt-status.c: split bisect detection out of wt_status_get_state() | Nguyễn Thái Ngọc Duy | 2016-04-22 | 1 | -9/+14 |
| * | wt-status.c: make wt_status_check_rebase() work on any worktree | Nguyễn Thái Ngọc Duy | 2016-04-22 | 1 | -13/+20 |
| * | wt-status.c: split rebase detection out of wt_status_get_state() | Nguyễn Thái Ngọc Duy | 2016-04-22 | 1 | -6/+17 |
* | | Merge branch 'ss/commit-dry-run-resolve-merge-to-no-op' | Junio C Hamano | 2016-05-23 | 1 | -0/+1 |
|\ \ | |/ |/| | |||||
| * | wt-status.c: set commitable bit if there is a meaningful merge.ss/commit-dry-run-resolve-merge-to-no-op | Stephen P. Smith | 2016-02-17 | 1 | -0/+1 |
* | | Merge branch 'sb/misc-cleanups' | Junio C Hamano | 2016-04-13 | 1 | -3/+1 |
|\ \ | |||||
| * | | abbrev_sha1_in_line: don't leak memory | Stefan Beller | 2016-04-01 | 1 | -3/+1 |
* | | | Merge branch 'mg/wt-status-mismarked-i18n' | Junio C Hamano | 2016-03-14 | 1 | -2/+2 |
|\ \ \ | |||||
| * | | | wt-status: allow "ahead " to be picked up by l10nmg/wt-status-mismarked-i18n | Michael J Gruber | 2016-03-14 | 1 | -2/+2 |
* | | | | strbuf: introduce strbuf_getline_{lf,nul}() | Junio C Hamano | 2016-01-15 | 1 | -2/+2 |
| |/ / |/| | | |||||
* | | | Merge branch 'bc/object-id' | Junio C Hamano | 2015-12-10 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Remove get_object_hash. | brian m. carlson | 2015-11-20 | 1 | -1/+1 |
| * | | | Add several uses of get_object_hash. | brian m. carlson | 2015-11-20 | 1 | -1/+1 |
| * | | | Merge branch 'rs/wt-status-detached-branch-fix' | Junio C Hamano | 2015-11-03 | 1 | -35/+29 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'mm/detach-at-HEAD-reflog' | Junio C Hamano | 2015-10-15 | 1 | -0/+6 |
| |\ \ \ \ | |||||
* | | | | | | wt-status: correct and simplify check for detached HEADrs/status-detached-head-memcmp | René Scharfe | 2015-11-28 | 1 | -5/+4 |
* | | | | | | Merge branch 'rs/wt-status-detached-branch-fix' into maint | Junio C Hamano | 2015-11-05 | 1 | -35/+29 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | wt-status: use skip_prefix() to get rid of magic string length constantsrs/wt-status-detached-branch-fix | René Scharfe | 2015-11-01 | 1 | -21/+15 |
| * | | | | | wt-status: don't skip a magical number of characters blindly | René Scharfe | 2015-11-01 | 1 | -1/+1 |
| * | | | | | wt-status: avoid building bogus branch name with detached HEAD | René Scharfe | 2015-11-01 | 1 | -6/+9 |
| * | | | | | wt-status: exit early using goto in wt_shortstatus_print_tracking() | René Scharfe | 2015-11-01 | 1 | -8/+5 |
| * | | | | | Merge branch 'sg/wt-status-header-inclusion' into maint | Junio C Hamano | 2015-09-03 | 1 | -1/+0 |
| |\ \ \ \ \ | |||||
* | \ \ \ \ \ | Merge branch 'mm/detach-at-HEAD-reflog' into maint | Junio C Hamano | 2015-10-16 | 1 | -0/+6 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | / / / | | |_|/ / / | |/| | | | | |||||
| * | | | | | status: don't say 'HEAD detached at HEAD'mm/detach-at-HEAD-reflog | Matthieu Moy | 2015-10-02 | 1 | -0/+6 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'sg/wt-status-header-inclusion' | Junio C Hamano | 2015-08-26 | 1 | -1/+0 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | wt-status: move #include "pathspec.h" to the headersg/wt-status-header-inclusion | SZEDER Gábor | 2015-08-21 | 1 | -1/+0 |
| |/ / / | |||||
| * | | | Merge branch 'sg/commit-cleanup-scissors' into maint | Junio C Hamano | 2015-08-03 | 1 | -4/+5 |
| |\ \ \ | |||||
* | | | | | memoize common git-path "constant" filesjk/git-path | Jeff King | 2015-08-10 | 1 | -4/+4 |
* | | | | | Merge branch 'gp/status-rebase-i-info' | Junio C Hamano | 2015-08-03 | 1 | -17/+134 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | status: give more information during rebase -i | Guillaume Pagès | 2015-07-06 | 1 | -0/+114 |
| * | | | | status: differentiate interactive from non-interactive rebases | Guillaume Pagès | 2015-06-30 | 1 | -1/+4 |
| * | | | | status: factor two rebase-related messages together | Guillaume Pagès | 2015-06-30 | 1 | -16/+16 |
* | | | | | Merge branch 'sg/commit-cleanup-scissors' | Junio C Hamano | 2015-06-24 | 1 | -4/+5 |
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| | | |||||
| * | | | commit: cope with scissors lines in commit messagesg/commit-cleanup-scissors | SZEDER Gábor | 2015-06-09 | 1 | -4/+5 |
* | | | | Merge branch 'jk/at-push-sha1' | Junio C Hamano | 2015-06-05 | 1 | -12/+6 |
|\ \ \ \ | |||||
| * | | | | remote.c: return upstream name from stat_tracking_info | Jeff King | 2015-05-22 | 1 | -12/+6 |
* | | | | | Merge branch 'nd/untracked-cache' | Junio C Hamano | 2015-05-26 | 1 | -0/+2 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | status: enable untracked cache | Nguyễn Thái Ngọc Duy | 2015-03-12 | 1 | -0/+2 |
* | | | | | Merge branch 'sb/plug-wt-shortstatus-tracking-leak' | Junio C Hamano | 2015-04-14 | 1 | -0/+1 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | wt-status.c: fix a memleaksb/plug-wt-shortstatus-tracking-leak | Stefan Beller | 2015-03-30 | 1 | -0/+1 |
* | | | | | Merge branch 'jk/run-command-capture' | Junio C Hamano | 2015-03-25 | 1 | -7/+3 |
|\ \ \ \ \ | |||||
| * | | | | | wt-status: use capture_command | Jeff King | 2015-03-22 | 1 | -4/+1 |
| * | | | | | wt_status: fix signedness mismatch in strbuf_read call | Jeff King | 2015-03-22 | 1 | -3/+3 |
| * | | | | | wt-status: don't flush before running "submodule status" | Jeff King | 2015-03-22 | 1 | -1/+0 |
| * | | | | | Merge branch 'jk/status-read-branch-name-fix' into maint | Junio C Hamano | 2015-02-24 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
* | \ \ \ \ \ | Merge branch 'mg/detached-head-report' | Junio C Hamano | 2015-03-20 | 1 | -3/+3 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | wt-status: refactor detached HEAD analysis | Michael J Gruber | 2015-03-06 | 1 | -3/+3 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'mg/status-v-v' | Junio C Hamano | 2015-03-17 | 1 | -0/+20 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | |||||
| * | | | | | | commit/status: show the index-worktree diff with -v -v | Michael J Gruber | 2015-03-06 | 1 | -0/+20 |
| |/ / / / / |