Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | | | | | Merge branch 'jk/rev-list-empty-input' | Junio C Hamano | 2017-08-11 | 2 | -11/+15 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | revision: do not fallback to default when rev_input_given is setjk/rev-list-empty-input | Jeff King | 2017-08-02 | 1 | -0/+6 | |
| * | | | | | | | | | | | | | | | rev-list: don't show usage when we see empty ref patterns | Jeff King | 2017-08-02 | 1 | -3/+3 | |
| * | | | | | | | | | | | | | | | t6018: flesh out empty input/output rev-list tests | Jeff King | 2017-08-02 | 1 | -11/+9 | |
| |/ / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | Merge branch 'jt/t1450-fsck-corrupt-packfile' | Junio C Hamano | 2017-08-11 | 1 | -0/+16 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | tests: ensure fsck fails on corrupt packfilesjt/t1450-fsck-corrupt-packfile | Jonathan Tan | 2017-07-28 | 1 | -0/+16 | |
| |/ / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | Merge branch 'jb/t8008-cleanup' | Junio C Hamano | 2017-08-11 | 1 | -14/+16 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | t8008: rely on rev-parse'd HEAD instead of sha1 valuejb/t8008-cleanup | Stefan Beller | 2017-07-26 | 1 | -14/+16 | |
| |/ / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | Merge branch 'jt/subprocess-handshake' | Junio C Hamano | 2017-08-11 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | sub-process: refactor handshake to common functionjt/subprocess-handshake | Jonathan Tan | 2017-07-26 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | Merge branch 'ls/filter-process-delayed' into jt/subprocess-handshake | Junio C Hamano | 2017-07-26 | 2 | -100/+292 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | Merge branch 'sb/hashmap-cleanup' | Junio C Hamano | 2017-08-11 | 1 | -18/+16 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | t/helper/test-hashmap: use custom data instead of duplicate cmp functionssb/hashmap-cleanup | Stefan Beller | 2017-07-05 | 1 | -18/+16 | |
* | | | | | | | | | | | | | | | | | Merge branch 'jk/reflog-walk' | Junio C Hamano | 2017-08-11 | 3 | -12/+136 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | reflog-walk: apply --since/--until to reflog datesjk/reflog-walk | Jeff King | 2017-07-09 | 1 | -0/+26 | |
| * | | | | | | | | | | | | | | | | | reflog-walk: stop using fake parents | Jeff King | 2017-07-09 | 2 | -8/+7 | |
| * | | | | | | | | | | | | | | | | | rev-list: check reflog_info before showing usage | Jeff King | 2017-07-09 | 1 | -0/+4 | |
| * | | | | | | | | | | | | | | | | | t1414: document some reflog-walk oddities | Jeff King | 2017-07-07 | 2 | -10/+105 | |
| * | | | | | | | | | | | | | | | | | Merge branch 'jk/reflog-walk-maint' into jk/reflog-walk | Junio C Hamano | 2017-07-07 | 2 | -0/+21 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ls/filter-process-delayed' | Junio C Hamano | 2017-08-11 | 2 | -100/+292 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | convert: add "status=delayed" to filter process protocol | Lars Schneider | 2017-06-30 | 2 | -65/+255 | |
| * | | | | | | | | | | | | | | | | | | t0021: write "OUT <size>" only on success | Lars Schneider | 2017-06-29 | 2 | -6/+6 | |
| * | | | | | | | | | | | | | | | | | | t0021: make debug log file name configurable | Lars Schneider | 2017-06-26 | 2 | -25/+27 | |
| * | | | | | | | | | | | | | | | | | | t0021: keep filter log files on comparison | Lars Schneider | 2017-06-26 | 1 | -6/+6 | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'st/lib-gpg-kill-stray-agent' | Junio C Hamano | 2017-08-11 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | t: lib-gpg: flush gpg agent on startupst/lib-gpg-kill-stray-agent | Santiago Torres | 2017-07-20 | 1 | -0/+1 | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/c99' | Junio C Hamano | 2017-08-11 | 1 | -0/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | clean.c: use designated initializerjk/c99 | Junio C Hamano | 2017-07-18 | 1 | -0/+10 | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/ref-filter-colors' | Junio C Hamano | 2017-08-11 | 6 | -72/+175 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | ref-filter: consult want_color() before emitting colorsjk/ref-filter-colors | Jeff King | 2017-07-13 | 3 | -11/+82 | |
| * | | | | | | | | | | | | | | | | | | | | | pretty: respect color settings for %C placeholders | Jeff King | 2017-07-13 | 1 | -34/+50 | |
| * | | | | | | | | | | | | | | | | | | | | | rev-list: pass diffopt->use_colors through to pretty-print | Jeff King | 2017-07-13 | 1 | -0/+11 | |
| * | | | | | | | | | | | | | | | | | | | | | t: use test_decode_color rather than literal ANSI codes | Jeff King | 2017-07-13 | 4 | -39/+44 | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'wd/rebase-conflict-guide' | Junio C Hamano | 2017-08-11 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | rebase: make resolve message clearer for inexperienced userswd/rebase-conflict-guide | William Duclot | 2017-07-17 | 1 | -2/+2 | |
| | |/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'bc/object-id' | Junio C Hamano | 2017-08-11 | 1 | -5/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | submodule: convert submodule config lookup to use object_id | brian m. carlson | 2017-07-17 | 1 | -5/+5 | |
| | |/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | Merge tag 'v2.13.5' into maint | Junio C Hamano | 2017-08-04 | 4 | -2/+57 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | Merge tag 'v2.12.4' into maint | Junio C Hamano | 2017-08-01 | 4 | -2/+57 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | / | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | Merge tag 'v2.11.3' into maint-2.12 | Junio C Hamano | 2017-07-30 | 3 | -0/+51 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge tag 'v2.10.4' into maint-2.11 | Junio C Hamano | 2017-07-30 | 3 | -0/+51 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | | |/| | | | | | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | | | | | | | Merge tag 'v2.9.5' into maint-2.10 | Junio C Hamano | 2017-07-30 | 3 | -0/+51 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | | |/| | | | | | | | | | | | | | | | | ||||||
| | | | | * | | | | | | | | | | | | | | | | Merge tag 'v2.8.6' into maint-2.9 | Junio C Hamano | 2017-07-30 | 3 | -0/+51 | |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge tag 'v2.7.6' into maint-2.8 | Junio C Hamano | 2017-07-30 | 3 | -0/+51 | |
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | | | * | | | | | | | | | | | | | | | | connect: reject paths that look like command line options | Jeff King | 2017-07-28 | 2 | -0/+37 | |
| | | | | | | * | | | | | | | | | | | | | | | | connect: reject dashed arguments for proxy commands | Jeff King | 2017-07-28 | 1 | -0/+5 | |
| | | | | | | * | | | | | | | | | | | | | | | | t5813: add test for hostname starting with dash | Jeff King | 2017-07-28 | 1 | -0/+9 | |
| | * | | | | | | | | | | | | | | | | | | | | | t/lib-proto-disable: restore protocol.allow after config tests | Jeff King | 2017-07-28 | 1 | -2/+6 | |
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/test-copy-bytes-fix' into maint | Junio C Hamano | 2017-07-31 | 1 | -0/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'pw/unquote-path-in-git-pm' into maint | Junio C Hamano | 2017-07-31 | 1 | -0/+7 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |