summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | Merge branch 'bw/clone-recursive-quiet' into maintJunio C Hamano2017-09-102-0/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | clone: teach recursive clones to respect -qbw/clone-recursive-quietBrandon Williams2017-08-042-0/+9
| | |_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'pw/sequence-rerere-autoupdate' into maintJunio C Hamano2017-09-107-50/+171
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | cherry-pick/revert: reject --rerere-autoupdate when continuingpw/sequence-rerere-autoupdatePhillip Wood2017-08-022-0/+15
| * | | | | | | | | | | | | | | | | | cherry-pick/revert: remember --rerere-autoupdatePhillip Wood2017-08-022-8/+62
| * | | | | | | | | | | | | | | | | | t3504: use test_commitPhillip Wood2017-08-021-12/+9
| * | | | | | | | | | | | | | | | | | rebase -i: honor --rerere-autoupdatePhillip Wood2017-08-023-3/+17
| * | | | | | | | | | | | | | | | | | rebase: honor --rerere-autoupdatePhillip Wood2017-08-022-28/+57
| * | | | | | | | | | | | | | | | | | am: remember --rerere-autoupdate settingPhillip Wood2017-08-021-0/+12
* | | | | | | | | | | | | | | | | | | Merge branch 'bw/push-options-recursively-to-submodules' into maintJunio C Hamano2017-09-103-13/+79
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | submodule--helper: teach push-check to handle HEADbw/push-options-recursively-to-submodulesBrandon Williams2017-07-203-13/+79
* | | | | | | | | | | | | | | | | | | | Merge branch 'ma/pager-per-subcommand-action' into maintJunio C Hamano2017-09-106-76/+201
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | git.c: ignore pager.* when launching builtin as dashed externalma/pager-per-subcommand-actionMartin Ågren2017-08-032-2/+2
| * | | | | | | | | | | | | | | | | | | | tag: change default of `pager.tag` to "on"Martin Ågren2017-08-033-16/+16
| * | | | | | | | | | | | | | | | | | | | tag: respect `pager.tag` in list-mode onlyMartin Ågren2017-08-034-2/+21
| * | | | | | | | | | | | | | | | | | | | t7006: add tests for how git tag paginatesMartin Ågren2017-08-031-0/+67
| * | | | | | | | | | | | | | | | | | | | git.c: provide setup_auto_pager()Martin Ågren2017-08-032-0/+22
| * | | | | | | | | | | | | | | | | | | | git.c: let builtins opt for handling `pager.foo` themselvesMartin Ågren2017-08-032-1/+11
| * | | | | | | | | | | | | | | | | | | | builtin.h: take over documentation from api-builtin.txtMartin Ågren2017-08-032-73/+80
| | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'jk/rev-list-empty-input' into maintJunio C Hamano2017-09-105-13/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | revision: do not fallback to default when rev_input_given is setjk/rev-list-empty-inputJeff King2017-08-022-1/+7
| * | | | | | | | | | | | | | | | | | | | rev-list: don't show usage when we see empty ref patternsJeff King2017-08-022-4/+5
| * | | | | | | | | | | | | | | | | | | | revision: add rev_input_given flagJeff King2017-08-022-0/+8
| * | | | | | | | | | | | | | | | | | | | t6018: flesh out empty input/output rev-list testsJeff King2017-08-021-11/+9
| |/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | Merge branch 'st/lib-gpg-kill-stray-agent' into maintJunio C Hamano2017-09-101-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | t: lib-gpg: flush gpg agent on startupst/lib-gpg-kill-stray-agentSantiago Torres2017-07-201-0/+1
* | | | | | | | | | | | | | | | | | | | | Prepare for 2.14.2Junio C Hamano2017-08-233-2/+37
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jt/t1450-fsck-corrupt-packfile' into maintJunio C Hamano2017-08-231-0/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | tests: ensure fsck fails on corrupt packfilesjt/t1450-fsck-corrupt-packfileJonathan Tan2017-07-281-0/+16
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jb/t8008-cleanup' into maintJunio C Hamano2017-08-231-14/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | t8008: rely on rev-parse'd HEAD instead of sha1 valuejb/t8008-cleanupStefan Beller2017-07-261-14/+16
| |/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jt/subprocess-handshake' into maintJunio C Hamano2017-08-2314-285/+802
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | sub-process: refactor handshake to common functionjt/subprocess-handshakeJonathan Tan2017-07-266-90/+138
| * | | | | | | | | | | | | | | | | | | | | Documentation: migrate sub-process docs to headerJonathan Tan2017-07-262-61/+23
| * | | | | | | | | | | | | | | | | | | | | Merge branch 'ls/filter-process-delayed' into jt/subprocess-handshakeJunio C Hamano2017-07-269-161/+668
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | convert: add "status=delayed" to filter process protocolLars Schneider2017-06-309-90/+575
| | * | | | | | | | | | | | | | | | | | | | convert: refactor capabilities negotiationLars Schneider2017-06-301-12/+27
| | * | | | | | | | | | | | | | | | | | | | convert: move multiple file filter error handling to separate functionLars Schneider2017-06-291-21/+26
| | * | | | | | | | | | | | | | | | | | | | convert: put the flags field before the flag itself for consistent styleLars Schneider2017-06-291-5/+5
| | * | | | | | | | | | | | | | | | | | | | t0021: write "OUT <size>" only on successLars Schneider2017-06-292-6/+6
| | * | | | | | | | | | | | | | | | | | | | t0021: make debug log file name configurableLars Schneider2017-06-262-25/+27
| | * | | | | | | | | | | | | | | | | | | | t0021: keep filter log files on comparisonLars Schneider2017-06-261-6/+6
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'dc/fmt-merge-msg-microcleanup' into maintJunio C Hamano2017-08-231-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | fmt-merge-msg: fix coding styledc/fmt-merge-msg-microcleanupDimitrios Christidis2017-07-251-1/+2
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'ah/doc-wserrorhighlight' into maintJunio C Hamano2017-08-232-13/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | doc: add missing values "none" and "default" for diff.wsErrorHighlightah/doc-wserrorhighlightAndreas Heiduk2017-07-252-13/+15
| |/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'cc/ref-is-hidden-microcleanup' into maintJunio C Hamano2017-08-231-5/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | refs: use skip_prefix() in ref_is_hidden()cc/ref-is-hidden-microcleanupChristian Couder2017-07-241-5/+4
| |/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/run-process-parallel-api-fix' into maintJunio C Hamano2017-08-232-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | run_processes_parallel: change confusing task_cb conventionjs/run-process-parallel-api-fixJohannes Schindelin2017-07-212-3/+3
| | |_|_|_|_|_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |