summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'nd/worktree-kill-parse-ref'Junio C Hamano2017-09-101-0/+13
|\
| * branch: fix branch renaming not updating HEADs correctlynd/worktree-kill-parse-refNguyễn Thái Ngọc Duy2017-08-241-0/+13
* | Merge branch 'mm/send-email-cc-cruft'Junio C Hamano2017-09-101-0/+4
|\ \
| * | send-email: fix garbage removal after addressMatthieu Moy2017-08-241-0/+4
| * | Merge branch 'jt/t1450-fsck-corrupt-packfile' into maintJunio C Hamano2017-08-231-0/+16
| |\ \
| * \ \ Merge branch 'jb/t8008-cleanup' into maintJunio C Hamano2017-08-231-14/+16
| |\ \ \
| * \ \ \ Merge branch 'jt/subprocess-handshake' into maintJunio C Hamano2017-08-232-101/+293
| |\ \ \ \
| * \ \ \ \ Merge branch 'jk/reflog-walk' into maintJunio C Hamano2017-08-233-12/+136
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jk/ref-filter-colors' into maintJunio C Hamano2017-08-236-72/+175
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge branch 'ma/up-to-date'Junio C Hamano2017-09-101-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | treewide: correct several "up-to-date" to "up to date"ma/up-to-dateMartin Ågren2017-08-231-2/+2
| |/ / / / / / /
* | | | | | | | Merge branch 'rs/archive-excluded-directory'Junio C Hamano2017-09-061-3/+44
|\ \ \ \ \ \ \ \
| * | | | | | | | archive: don't queue excluded directoriesRené Scharfe2017-08-191-2/+2
| * | | | | | | | t5001: add tests for export-ignore attributes and exclude pathspecsRené Scharfe2017-08-191-3/+44
| |/ / / / / / /
* | | | | | | | Merge branch 'ks/branch-set-upstream'Junio C Hamano2017-09-062-58/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | builtin/branch: stop supporting the "--set-upstream" optionKaartic Sivaraam2017-08-172-58/+9
| * | | | | | | | t3200: cleanup cruft of a testKaartic Sivaraam2017-08-171-0/+1
* | | | | | | | | Merge branch 'mg/killed-merge'Junio C Hamano2017-08-261-0/+15
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | merge: save merge state earliermg/killed-mergeMichael J Gruber2017-08-231-0/+15
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jc/cutoff-config'Junio C Hamano2017-08-261-18/+39
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | rerere: allow approxidate in gc.rerereResolved/gc.rerereUnresolvedjc/cutoff-configJunio C Hamano2017-08-221-0/+2
| * | | | | | | | | t4200: parameterize "rerere gc" custom expiry testJunio C Hamano2017-08-221-25/+33
| * | | | | | | | | t4200: gather "rerere gc" togetherJunio C Hamano2017-08-221-27/+27
| * | | | | | | | | t4200: make "rerere gc" test more robustJunio C Hamano2017-08-221-5/+14
| * | | | | | | | | t4200: give us a clean slate after "rerere gc" testsJunio C Hamano2017-08-221-0/+2
| |/ / / / / / / /
* | | | | | | | | Merge branch 'kw/write-index-reduce-alloc'Junio C Hamano2017-08-262-0/+52
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | perf: add test for writing the indexKevin Willford2017-08-212-0/+52
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'bw/submodule-config-cleanup'Junio C Hamano2017-08-264-156/+15
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | submodule: remove gitmodules_configBrandon Williams2017-08-031-1/+0
| * | | | | | | | | submodule-config: remove support for overlaying repository configBrandon Williams2017-08-032-78/+0
| * | | | | | | | | diff: stop allowing diff to have submodules configured in .git/configBrandon Williams2017-08-031-67/+0
| * | | | | | | | | t7411: check configuration parsing errorsBrandon Williams2017-08-022-10/+15
| * | | | | | | | | Merge branch 'bc/object-id' into bw/submodule-config-cleanupJunio C Hamano2017-08-021-5/+5
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Merge branch 'tb/apply-with-crlf'Junio C Hamano2017-08-261-6/+27
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | apply: file commited with CRLF should roundtrip diff and applytb/apply-with-crlfTorsten Bögershausen2017-08-191-6/+27
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jt/stash-tests'Junio C Hamano2017-08-261-0/+34
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | stash: add a test for stashing in a detached statejt/stash-testsJoel Teichroeb2017-08-191-0/+12
| * | | | | | | | | | | stash: add a test for when apply fails during stash branchJoel Teichroeb2017-08-191-0/+14
| * | | | | | | | | | | stash: add a test for stash create with no filesJoel Teichroeb2017-08-191-0/+8
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jk/trailers-parse'Junio C Hamano2017-08-262-7/+120
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | pretty: support normalization options for %(trailers)Jeff King2017-08-151-0/+33
| * | | | | | | | | | | t4205: refactor %(trailers) testsJeff King2017-08-151-8/+12
| * | | | | | | | | | | interpret-trailers: add an option to unfold valuesJeff King2017-08-151-0/+21
| * | | | | | | | | | | interpret-trailers: add an option to show only existing trailersJeff King2017-08-151-0/+16
| * | | | | | | | | | | interpret-trailers: add an option to show only the trailersJeff King2017-08-151-0/+39
* | | | | | | | | | | | Merge branch 'pb/trailers-from-command-line'Junio C Hamano2017-08-261-0/+66
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | interpret-trailers: add options for actionsPaolo Bonzini2017-08-141-0/+66
| | |_|_|/ / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'jt/diff-color-move-fix'Junio C Hamano2017-08-261-68/+193
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | diff: define block by number of alphanumeric charsjt/diff-color-move-fixJonathan Tan2017-08-161-69/+157
| * | | | | | | | | | | | diff: respect MIN_BLOCK_LENGTH for last blockJonathan Tan2017-08-161-0/+37
View Lorry Controller Status