Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | | | | | | | | Merge branch 'bw/clone-recursive-quiet' into maint | Junio C Hamano | 2017-09-10 | 2 | -0/+9 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | clone: teach recursive clones to respect -qbw/clone-recursive-quiet | Brandon Williams | 2017-08-04 | 2 | -0/+9 | |
| | |_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | Merge branch 'pw/sequence-rerere-autoupdate' into maint | Junio C Hamano | 2017-09-10 | 7 | -50/+171 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | cherry-pick/revert: reject --rerere-autoupdate when continuingpw/sequence-rerere-autoupdate | Phillip Wood | 2017-08-02 | 2 | -0/+15 | |
| * | | | | | | | | | | | | | | | | | | cherry-pick/revert: remember --rerere-autoupdate | Phillip Wood | 2017-08-02 | 2 | -8/+62 | |
| * | | | | | | | | | | | | | | | | | | t3504: use test_commit | Phillip Wood | 2017-08-02 | 1 | -12/+9 | |
| * | | | | | | | | | | | | | | | | | | rebase -i: honor --rerere-autoupdate | Phillip Wood | 2017-08-02 | 3 | -3/+17 | |
| * | | | | | | | | | | | | | | | | | | rebase: honor --rerere-autoupdate | Phillip Wood | 2017-08-02 | 2 | -28/+57 | |
| * | | | | | | | | | | | | | | | | | | am: remember --rerere-autoupdate setting | Phillip Wood | 2017-08-02 | 1 | -0/+12 | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'bw/push-options-recursively-to-submodules' into maint | Junio C Hamano | 2017-09-10 | 3 | -13/+79 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | submodule--helper: teach push-check to handle HEADbw/push-options-recursively-to-submodules | Brandon Williams | 2017-07-20 | 3 | -13/+79 | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'ma/pager-per-subcommand-action' into maint | Junio C Hamano | 2017-09-10 | 6 | -76/+201 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | git.c: ignore pager.* when launching builtin as dashed externalma/pager-per-subcommand-action | Martin Ågren | 2017-08-03 | 2 | -2/+2 | |
| * | | | | | | | | | | | | | | | | | | | | tag: change default of `pager.tag` to "on" | Martin Ågren | 2017-08-03 | 3 | -16/+16 | |
| * | | | | | | | | | | | | | | | | | | | | tag: respect `pager.tag` in list-mode only | Martin Ågren | 2017-08-03 | 4 | -2/+21 | |
| * | | | | | | | | | | | | | | | | | | | | t7006: add tests for how git tag paginates | Martin Ågren | 2017-08-03 | 1 | -0/+67 | |
| * | | | | | | | | | | | | | | | | | | | | git.c: provide setup_auto_pager() | Martin Ågren | 2017-08-03 | 2 | -0/+22 | |
| * | | | | | | | | | | | | | | | | | | | | git.c: let builtins opt for handling `pager.foo` themselves | Martin Ågren | 2017-08-03 | 2 | -1/+11 | |
| * | | | | | | | | | | | | | | | | | | | | builtin.h: take over documentation from api-builtin.txt | Martin Ågren | 2017-08-03 | 2 | -73/+80 | |
| | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/rev-list-empty-input' into maint | Junio C Hamano | 2017-09-10 | 5 | -13/+26 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | revision: do not fallback to default when rev_input_given is setjk/rev-list-empty-input | Jeff King | 2017-08-02 | 2 | -1/+7 | |
| * | | | | | | | | | | | | | | | | | | | | rev-list: don't show usage when we see empty ref patterns | Jeff King | 2017-08-02 | 2 | -4/+5 | |
| * | | | | | | | | | | | | | | | | | | | | revision: add rev_input_given flag | Jeff King | 2017-08-02 | 2 | -0/+8 | |
| * | | | | | | | | | | | | | | | | | | | | t6018: flesh out empty input/output rev-list tests | Jeff King | 2017-08-02 | 1 | -11/+9 | |
| |/ / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | Merge branch 'st/lib-gpg-kill-stray-agent' into maint | Junio C Hamano | 2017-09-10 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | t: lib-gpg: flush gpg agent on startupst/lib-gpg-kill-stray-agent | Santiago Torres | 2017-07-20 | 1 | -0/+1 | |
* | | | | | | | | | | | | | | | | | | | | | Prepare for 2.14.2 | Junio C Hamano | 2017-08-23 | 3 | -2/+37 | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jt/t1450-fsck-corrupt-packfile' into maint | Junio C Hamano | 2017-08-23 | 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' into maint | Junio C Hamano | 2017-08-23 | 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' into maint | Junio C Hamano | 2017-08-23 | 14 | -285/+802 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | sub-process: refactor handshake to common functionjt/subprocess-handshake | Jonathan Tan | 2017-07-26 | 6 | -90/+138 | |
| * | | | | | | | | | | | | | | | | | | | | | Documentation: migrate sub-process docs to header | Jonathan Tan | 2017-07-26 | 2 | -61/+23 | |
| * | | | | | | | | | | | | | | | | | | | | | Merge branch 'ls/filter-process-delayed' into jt/subprocess-handshake | Junio C Hamano | 2017-07-26 | 9 | -161/+668 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | convert: add "status=delayed" to filter process protocol | Lars Schneider | 2017-06-30 | 9 | -90/+575 | |
| | * | | | | | | | | | | | | | | | | | | | | convert: refactor capabilities negotiation | Lars Schneider | 2017-06-30 | 1 | -12/+27 | |
| | * | | | | | | | | | | | | | | | | | | | | convert: move multiple file filter error handling to separate function | Lars Schneider | 2017-06-29 | 1 | -21/+26 | |
| | * | | | | | | | | | | | | | | | | | | | | convert: put the flags field before the flag itself for consistent style | Lars Schneider | 2017-06-29 | 1 | -5/+5 | |
| | * | | | | | | | | | | | | | | | | | | | | 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 'dc/fmt-merge-msg-microcleanup' into maint | Junio C Hamano | 2017-08-23 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | fmt-merge-msg: fix coding styledc/fmt-merge-msg-microcleanup | Dimitrios Christidis | 2017-07-25 | 1 | -1/+2 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ah/doc-wserrorhighlight' into maint | Junio C Hamano | 2017-08-23 | 2 | -13/+15 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | doc: add missing values "none" and "default" for diff.wsErrorHighlightah/doc-wserrorhighlight | Andreas Heiduk | 2017-07-25 | 2 | -13/+15 | |
| |/ / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'cc/ref-is-hidden-microcleanup' into maint | Junio C Hamano | 2017-08-23 | 1 | -5/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | refs: use skip_prefix() in ref_is_hidden()cc/ref-is-hidden-microcleanup | Christian Couder | 2017-07-24 | 1 | -5/+4 | |
| |/ / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/run-process-parallel-api-fix' into maint | Junio C Hamano | 2017-08-23 | 2 | -3/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | run_processes_parallel: change confusing task_cb conventionjs/run-process-parallel-api-fix | Johannes Schindelin | 2017-07-21 | 2 | -3/+3 | |
| | |_|_|_|_|_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |