aboutsummaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAge
* files_ref_store: use a transaction to update packed refsMichael Haggerty2017-09-09
* t1404: demonstrate two problems with reference transactionsMichael Haggerty2017-09-09
* Merge branch 'mg/killed-merge'Junio C Hamano2017-08-26
|\
| * merge: save merge state earlierMichael J Gruber2017-08-23
* | Merge branch 'jc/cutoff-config'Junio C Hamano2017-08-26
|\ \
| * | rerere: allow approxidate in gc.rerereResolved/gc.rerereUnresolvedJunio C Hamano2017-08-22
| * | t4200: parameterize "rerere gc" custom expiry testJunio C Hamano2017-08-22
| * | t4200: gather "rerere gc" togetherJunio C Hamano2017-08-22
| * | t4200: make "rerere gc" test more robustJunio C Hamano2017-08-22
| * | t4200: give us a clean slate after "rerere gc" testsJunio C Hamano2017-08-22
| |/
* | Merge branch 'kw/write-index-reduce-alloc'Junio C Hamano2017-08-26
|\ \
| * | perf: add test for writing the indexKevin Willford2017-08-21
* | | Merge branch 'bw/submodule-config-cleanup'Junio C Hamano2017-08-26
|\ \ \
| * | | submodule: remove gitmodules_configBrandon Williams2017-08-03
| * | | submodule-config: remove support for overlaying repository configBrandon Williams2017-08-03
| * | | diff: stop allowing diff to have submodules configured in .git/configBrandon Williams2017-08-03
| * | | t7411: check configuration parsing errorsBrandon Williams2017-08-02
| * | | Merge branch 'bc/object-id' into bw/submodule-config-cleanupJunio C Hamano2017-08-02
| |\ \ \
* | \ \ \ Merge branch 'tb/apply-with-crlf'Junio C Hamano2017-08-26
|\ \ \ \ \
| * | | | | apply: file commited with CRLF should roundtrip diff and applyTorsten Bögershausen2017-08-19
| | |_|_|/ | |/| | |
* | | | | Merge branch 'jt/stash-tests'Junio C Hamano2017-08-26
|\ \ \ \ \
| * | | | | stash: add a test for stashing in a detached stateJoel Teichroeb2017-08-19
| * | | | | stash: add a test for when apply fails during stash branchJoel Teichroeb2017-08-19
| * | | | | stash: add a test for stash create with no filesJoel Teichroeb2017-08-19
| | |_|_|/ | |/| | |
* | | | | Merge branch 'jk/trailers-parse'Junio C Hamano2017-08-26
|\ \ \ \ \
| * | | | | pretty: support normalization options for %(trailers)Jeff King2017-08-15
| * | | | | t4205: refactor %(trailers) testsJeff King2017-08-15
| * | | | | interpret-trailers: add an option to unfold valuesJeff King2017-08-15
| * | | | | interpret-trailers: add an option to show only existing trailersJeff King2017-08-15
| * | | | | interpret-trailers: add an option to show only the trailersJeff King2017-08-15
* | | | | | Merge branch 'pb/trailers-from-command-line'Junio C Hamano2017-08-26
|\ \ \ \ \ \
| * | | | | | interpret-trailers: add options for actionsPaolo Bonzini2017-08-14
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'jt/diff-color-move-fix'Junio C Hamano2017-08-26
|\ \ \ \ \ \
| * | | | | | diff: define block by number of alphanumeric charsJonathan Tan2017-08-16
| * | | | | | diff: respect MIN_BLOCK_LENGTH for last blockJonathan Tan2017-08-16
* | | | | | | Merge branch 'sb/diff-color-move'Junio C Hamano2017-08-26
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | diff.c: add dimming to moved line detectionStefan Beller2017-06-30
| * | | | | | diff.c: color moved lines differently, plain modeStefan Beller2017-06-30
| * | | | | | diff.c: color moved lines differentlyStefan Beller2017-06-30
* | | | | | | Merge branch 'lg/merge-signoff'Junio C Hamano2017-08-24
|\ \ \ \ \ \ \
| * | | | | | | merge: add a --signoff flagŁukasz Gryglicki2017-07-25
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'hv/t5526-andand-chain-fix'Junio C Hamano2017-08-23
|\ \ \ \ \ \ \
| * | | | | | | t5526: fix some broken && chainsHeiko Voigt2017-08-17
* | | | | | | | Merge branch 'as/grep-quiet-no-match-exit-code-fix'Junio C Hamano2017-08-23
|\ \ \ \ \ \ \ \
| * | | | | | | | git-grep: correct exit code with --quiet and -LAnthony Sottile2017-08-17
| |/ / / / / / /
* | | | | | | | Merge branch 'rs/t1002-do-not-use-sum'Junio C Hamano2017-08-23
|\ \ \ \ \ \ \ \
| * | | | | | | | t1002: stop using sum(1)René Scharfe2017-08-15
* | | | | | | | | Merge branch 'nm/stash-untracked'Junio C Hamano2017-08-23
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | stash: clean untracked files before resetNicolas Morey-Chaisemartin2017-08-11
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'mh/packed-ref-store'Junio C Hamano2017-08-22
|\ \ \ \ \ \ \ \ \