Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'rs/archive-excluded-directory' | Junio C Hamano | 2017-09-06 | 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 'ks/branch-set-upstream' | Junio C Hamano | 2017-09-06 | 2 | -58/+10 |
|\ \ | |||||
| * | | builtin/branch: stop supporting the "--set-upstream" option | Kaartic Sivaraam | 2017-08-17 | 2 | -58/+9 |
| * | | t3200: cleanup cruft of a test | Kaartic Sivaraam | 2017-08-17 | 1 | -0/+1 |
* | | | Merge branch 'mg/killed-merge' | Junio C Hamano | 2017-08-26 | 1 | -0/+15 |
|\ \ \ | |||||
| * | | | merge: save merge state earliermg/killed-merge | Michael J Gruber | 2017-08-23 | 1 | -0/+15 |
| | |/ | |/| | |||||
* | | | Merge branch 'jc/cutoff-config' | Junio C Hamano | 2017-08-26 | 1 | -18/+39 |
|\ \ \ | |||||
| * | | | rerere: allow approxidate in gc.rerereResolved/gc.rerereUnresolvedjc/cutoff-config | Junio C Hamano | 2017-08-22 | 1 | -0/+2 |
| * | | | t4200: parameterize "rerere gc" custom expiry test | Junio C Hamano | 2017-08-22 | 1 | -25/+33 |
| * | | | t4200: gather "rerere gc" together | Junio C Hamano | 2017-08-22 | 1 | -27/+27 |
| * | | | t4200: make "rerere gc" test more robust | Junio C Hamano | 2017-08-22 | 1 | -5/+14 |
| * | | | t4200: give us a clean slate after "rerere gc" tests | Junio C Hamano | 2017-08-22 | 1 | -0/+2 |
| |/ / | |||||
* | | | Merge branch 'kw/write-index-reduce-alloc' | Junio C Hamano | 2017-08-26 | 2 | -0/+52 |
|\ \ \ | |||||
| * | | | perf: add test for writing the index | Kevin Willford | 2017-08-21 | 2 | -0/+52 |
| | |/ | |/| | |||||
* | | | Merge branch 'bw/submodule-config-cleanup' | Junio C Hamano | 2017-08-26 | 4 | -156/+15 |
|\ \ \ | |||||
| * | | | submodule: remove gitmodules_config | Brandon Williams | 2017-08-03 | 1 | -1/+0 |
| * | | | submodule-config: remove support for overlaying repository config | Brandon Williams | 2017-08-03 | 2 | -78/+0 |
| * | | | diff: stop allowing diff to have submodules configured in .git/config | Brandon Williams | 2017-08-03 | 1 | -67/+0 |
| * | | | t7411: check configuration parsing errors | Brandon Williams | 2017-08-02 | 2 | -10/+15 |
| * | | | Merge branch 'bc/object-id' into bw/submodule-config-cleanup | Junio C Hamano | 2017-08-02 | 1 | -5/+5 |
| |\ \ \ | |||||
* | \ \ \ | Merge branch 'tb/apply-with-crlf' | Junio C Hamano | 2017-08-26 | 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 'jt/stash-tests' | Junio C Hamano | 2017-08-26 | 1 | -0/+34 |
|\ \ \ \ \ | |||||
| * | | | | | stash: add a test for stashing in a detached statejt/stash-tests | Joel Teichroeb | 2017-08-19 | 1 | -0/+12 |
| * | | | | | stash: add a test for when apply fails during stash branch | Joel Teichroeb | 2017-08-19 | 1 | -0/+14 |
| * | | | | | stash: add a test for stash create with no files | Joel Teichroeb | 2017-08-19 | 1 | -0/+8 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'jk/trailers-parse' | Junio C Hamano | 2017-08-26 | 2 | -7/+120 |
|\ \ \ \ \ | |||||
| * | | | | | pretty: support normalization options for %(trailers) | Jeff King | 2017-08-15 | 1 | -0/+33 |
| * | | | | | t4205: refactor %(trailers) tests | Jeff King | 2017-08-15 | 1 | -8/+12 |
| * | | | | | interpret-trailers: add an option to unfold values | Jeff King | 2017-08-15 | 1 | -0/+21 |
| * | | | | | interpret-trailers: add an option to show only existing trailers | Jeff King | 2017-08-15 | 1 | -0/+16 |
| * | | | | | interpret-trailers: add an option to show only the trailers | Jeff King | 2017-08-15 | 1 | -0/+39 |
* | | | | | | Merge branch 'pb/trailers-from-command-line' | Junio C Hamano | 2017-08-26 | 1 | -0/+66 |
|\ \ \ \ \ \ | |||||
| * | | | | | | interpret-trailers: add options for actions | Paolo Bonzini | 2017-08-14 | 1 | -0/+66 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge branch 'jt/diff-color-move-fix' | Junio C Hamano | 2017-08-26 | 1 | -68/+193 |
|\ \ \ \ \ \ | |||||
| * | | | | | | diff: define block by number of alphanumeric charsjt/diff-color-move-fix | Jonathan Tan | 2017-08-16 | 1 | -69/+157 |
| * | | | | | | diff: respect MIN_BLOCK_LENGTH for last block | Jonathan Tan | 2017-08-16 | 1 | -0/+37 |
* | | | | | | | Merge branch 'sb/diff-color-move' | Junio C Hamano | 2017-08-26 | 1 | -0/+434 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | diff.c: add dimming to moved line detection | Stefan Beller | 2017-06-30 | 1 | -0/+124 |
| * | | | | | | diff.c: color moved lines differently, plain mode | Stefan Beller | 2017-06-30 | 1 | -1/+50 |
| * | | | | | | diff.c: color moved lines differently | Stefan Beller | 2017-06-30 | 1 | -0/+261 |
* | | | | | | | Merge branch 'lg/merge-signoff' | Junio C Hamano | 2017-08-24 | 1 | -0/+69 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | merge: add a --signoff flaglg/merge-signoff | Łukasz Gryglicki | 2017-07-25 | 1 | -0/+69 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'hv/t5526-andand-chain-fix' | Junio C Hamano | 2017-08-23 | 1 | -4/+4 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | t5526: fix some broken && chainshv/t5526-andand-chain-fix | Heiko Voigt | 2017-08-17 | 1 | -4/+4 |
* | | | | | | | | Merge branch 'as/grep-quiet-no-match-exit-code-fix' | Junio C Hamano | 2017-08-23 | 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 'rs/t1002-do-not-use-sum' | Junio C Hamano | 2017-08-23 | 2 | -35/+35 |
|\ \ \ \ \ \ \ \ |