Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | avoid "write_in_full(fd, buf, len) != len" pattern | Jeff King | 2017-09-14 | 1 | -1/+1 |
* | Merge branch 'hv/t5526-andand-chain-fix' into maint | Junio C Hamano | 2017-09-10 | 1 | -4/+4 |
|\ | |||||
| * | t5526: fix some broken && chainshv/t5526-andand-chain-fix | Heiko Voigt | 2017-08-17 | 1 | -4/+4 |
* | | Merge branch 'rs/t1002-do-not-use-sum' into maint | Junio C Hamano | 2017-09-10 | 2 | -35/+35 |
|\ \ | |||||
| * | | t1002: stop using sum(1)rs/t1002-do-not-use-sum | René Scharfe | 2017-08-15 | 2 | -35/+35 |
* | | | Merge branch 'rs/t3700-clean-leftover' into maint | Junio C Hamano | 2017-09-10 | 1 | -0/+1 |
|\ \ \ | |||||
| * | | | t3700: fix broken test under !POSIXPERMrs/t3700-clean-leftover | René Scharfe | 2017-08-08 | 1 | -0/+1 |
* | | | | Merge branch 'ab/ref-filter-no-contains' into maint | Junio C Hamano | 2017-09-10 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | tests: don't give unportable ">" to "test" built-in, use -gtab/ref-filter-no-contains | Ævar Arnfjörð Bjarmason | 2017-08-07 | 1 | -1/+1 |
* | | | | | Merge branch 'rs/archive-excluded-directory' into maint | Junio C Hamano | 2017-09-10 | 1 | -3/+44 |
|\ \ \ \ \ | |||||
| * | | | | | archive: don't queue excluded directories | René Scharfe | 2017-08-19 | 1 | -2/+2 |
| * | | | | | t5001: add tests for export-ignore attributes and exclude pathspecs | René Scharfe | 2017-08-19 | 1 | -3/+44 |
* | | | | | | Merge branch 'mg/killed-merge' into maint | Junio C Hamano | 2017-09-10 | 1 | -0/+15 |
|\ \ \ \ \ \ | |||||
| * | | | | | | merge: save merge state earliermg/killed-merge | Michael J Gruber | 2017-08-23 | 1 | -0/+15 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'tb/apply-with-crlf' into maint | Junio C Hamano | 2017-09-10 | 1 | -6/+27 |
|\ \ \ \ \ \ | |||||
| * | | | | | | apply: file commited with CRLF should roundtrip diff and applytb/apply-with-crlf | Torsten Bögershausen | 2017-08-19 | 1 | -6/+27 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'as/grep-quiet-no-match-exit-code-fix' into maint | Junio C Hamano | 2017-09-10 | 1 | -0/+5 |
|\ \ \ \ \ \ | |||||
| * | | | | | | git-grep: correct exit code with --quiet and -Las/grep-quiet-no-match-exit-code-fix | Anthony Sottile | 2017-08-17 | 1 | -0/+5 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge branch 'pw/am-signoff' into maint | Junio C Hamano | 2017-09-10 | 1 | -20/+63 |
|\ \ \ \ \ \ | |||||
| * | | | | | | am: fix signoff when other trailers are presentpw/am-signoff | Phillip Wood | 2017-08-08 | 1 | -20/+63 |
* | | | | | | | Merge branch 'rs/in-obsd-basename-dirname-take-const' into maint | Junio C Hamano | 2017-09-10 | 1 | -2/+16 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | test-path-utils: handle const parameter of basename and dirnamers/in-obsd-basename-dirname-take-const | René Scharfe | 2017-08-07 | 1 | -2/+16 |
* | | | | | | | | Merge branch 'rs/t4062-obsd' into maint | Junio C Hamano | 2017-09-10 | 1 | -1/+3 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | t4062: use less than 256 repetitions in regexrs/t4062-obsd | René Scharfe | 2017-08-09 | 1 | -1/+3 |
* | | | | | | | | | Merge branch 'rs/obsd-getcwd-workaround' into maint | Junio C Hamano | 2017-09-10 | 1 | -2/+28 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | t0001: skip test with restrictive permissions if getpwd(3) respects themrs/obsd-getcwd-workaround | René Scharfe | 2017-08-07 | 1 | -2/+28 |
* | | | | | | | | | | Merge branch 'bw/clone-recursive-quiet' into maint | Junio C Hamano | 2017-09-10 | 1 | -0/+6 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | clone: teach recursive clones to respect -qbw/clone-recursive-quiet | Brandon Williams | 2017-08-04 | 1 | -0/+6 |
| | |_|_|/ / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'pw/sequence-rerere-autoupdate' into maint | Junio C Hamano | 2017-09-10 | 2 | -45/+132 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | cherry-pick/revert: reject --rerere-autoupdate when continuingpw/sequence-rerere-autoupdate | Phillip Wood | 2017-08-02 | 1 | -0/+13 |
| * | | | | | | | | | | cherry-pick/revert: remember --rerere-autoupdate | Phillip Wood | 2017-08-02 | 1 | -7/+53 |
| * | | | | | | | | | | t3504: use test_commit | Phillip Wood | 2017-08-02 | 1 | -12/+9 |
| * | | | | | | | | | | rebase -i: honor --rerere-autoupdate | Phillip Wood | 2017-08-02 | 1 | -0/+3 |
| * | | | | | | | | | | rebase: honor --rerere-autoupdate | Phillip Wood | 2017-08-02 | 1 | -27/+55 |
* | | | | | | | | | | | Merge branch 'bw/push-options-recursively-to-submodules' into maint | Junio C Hamano | 2017-09-10 | 1 | -1/+24 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | submodule--helper: teach push-check to handle HEADbw/push-options-recursively-to-submodules | Brandon Williams | 2017-07-20 | 1 | -1/+24 |
* | | | | | | | | | | | | Merge branch 'ma/pager-per-subcommand-action' into maint | Junio C Hamano | 2017-09-10 | 1 | -0/+80 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | git.c: ignore pager.* when launching builtin as dashed externalma/pager-per-subcommand-action | Martin Ågren | 2017-08-03 | 1 | -1/+1 |
| * | | | | | | | | | | | | tag: change default of `pager.tag` to "on" | Martin Ågren | 2017-08-03 | 1 | -14/+14 |
| * | | | | | | | | | | | | tag: respect `pager.tag` in list-mode only | Martin Ågren | 2017-08-03 | 1 | -1/+14 |
| * | | | | | | | | | | | | t7006: add tests for how git tag paginates | Martin Ågren | 2017-08-03 | 1 | -0/+67 |
| | |/ / / / / / / / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'jk/rev-list-empty-input' into maint | Junio C Hamano | 2017-09-10 | 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 '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 |
* | | | | | | | | | | | | | 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 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ |