| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'bc/object-id' | Junio C Hamano | 2016-09-19 | 1 | -2/+2 |
|\ |
|
* \ | Merge branch 'jh/status-v2-porcelain' | Junio C Hamano | 2016-09-08 | 1 | -59/+511 |
|\ \
| |/
|/| |
|
| * | status: print branch info with --porcelain=v2 --branch | Jeff Hostetler | 2016-08-11 | 1 | -0/+90 |
| * | status: print per-file porcelain v2 status data | Jeff Hostetler | 2016-08-11 | 1 | -1/+284 |
| * | status: collect per-file data for --porcelain=v2 | Jeff Hostetler | 2016-08-11 | 1 | -2/+62 |
| * | status: cleanup API to wt_status_print | Jeff Hostetler | 2016-08-05 | 1 | -3/+22 |
| * | status: rename long-format print routines | Jeff Hostetler | 2016-08-05 | 1 | -55/+55 |
* | | Merge branch 'js/am-3-merge-recursive-direct' | Junio C Hamano | 2016-08-10 | 1 | -2/+2 |
|\ \ |
|
| * | | die("bug"): report bugs consistently | Johannes Schindelin | 2016-07-26 | 1 | -2/+2 |
| |/ |
|
* | | Merge branch 'mm/status-suggest-merge-abort' | Junio C Hamano | 2016-08-03 | 1 | -2/+5 |
|\ \
| |/
|/| |
|
| * | status: suggest 'git merge --abort' when appropriatemm/status-suggest-merge-abort | Matthieu Moy | 2016-07-22 | 1 | -2/+5 |
* | | Merge branch 'rs/use-strbuf-addbuf' | Junio C Hamano | 2016-07-25 | 1 | -1/+1 |
|\ \ |
|
| * | | use strbuf_addbuf() for appending a strbuf to another | René Scharfe | 2016-07-19 | 1 | -1/+1 |
| |/ |
|
* | | Merge branch 'bc/cocci' | Junio C Hamano | 2016-07-19 | 1 | -1/+2 |
|\ \ |
|
| * | | diff: convert struct diff_filespec to struct object_id | brian m. carlson | 2016-06-28 | 1 | -1/+2 |
* | | | Merge branch 'va/i18n-even-more' | Junio C Hamano | 2016-07-13 | 1 | -2/+2 |
|\ \ \ |
|
| * | | | i18n: unmark die messages for translation | Vasco Almeida | 2016-06-17 | 1 | -2/+2 |
| |/ / |
|
* | | | Use "working tree" instead of "working directory" for git statuslv/status-say-working-tree-not-directory | Lars Vogel | 2016-06-09 | 1 | -1/+1 |
|/ / |
|
* | | 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 |