summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/fix-diff-files-unmerged' into maintJunio C Hamano2011-05-1313-22/+102
|\
| * diff-files: show unmerged entries correctlyJunio C Hamano2011-04-231-0/+87
| * test: use $_z40 from test-libJunio C Hamano2011-04-2312-22/+15
* | Merge branch 'mz/maint-rename-unmerged' into maintJunio C Hamano2011-05-131-0/+62
|\ \
| * | diffcore-rename: don't consider unmerged path as sourceMartin von Zweigbergk2011-03-231-0/+62
* | | t5400: Fix a couple of typosJohan Herland2011-05-131-2/+2
* | | t3701: fix here documentJunio C Hamano2011-05-051-3/+2
* | | Merge branch 'jh/dirstat' into maintJunio C Hamano2011-05-046-7/+40
|\ \ \
| * | | Teach --dirstat not to completely ignore rearranged lines within a fileJohan Herland2011-04-112-2/+1
| * | | --dirstat-by-file: Make it faster and more correctJohan Herland2011-04-112-0/+5
| * | | --dirstat: Describe non-obvious differences relative to --stat or regular diffJohan Herland2011-04-115-7/+36
* | | | Merge branch 'jk/maint-stash-oob' into maintJunio C Hamano2011-05-041-5/+11
|\ \ \ \
| * | | | stash: fix false positive in the invalid ref test.Jon Seymour2011-04-051-5/+5
| * | | | stash: fix accidental apply of non-existent stashesJeff King2011-04-051-0/+6
* | | | | Merge branch 'dm/stash-k-i-p' into maintJunio C Hamano2011-05-042-0/+20
|\ \ \ \ \
| * | | | | stash: ensure --no-keep-index and --patch can be used in any orderDan McGee2011-04-071-1/+1
| * | | | | stash: add two more tests for --no-keep-indexDan McGee2011-04-072-0/+20
* | | | | | Merge branch 'mg/reflog-with-options' into maintJunio C Hamano2011-05-041-0/+18
|\ \ \ \ \ \
| * | | | | | reflog: fix overriding of command line optionsMichael J Gruber2011-04-011-1/+1
| * | | | | | t/t1411: test reflog with formatsMichael J Gruber2011-04-011-0/+18
* | | | | | | Merge branch 'jk/stash-loosen-safety' into maintJunio C Hamano2011-05-041-4/+16
|\ \ \ \ \ \ \
| * | | | | | | stash: drop dirty worktree check on applyJeff King2011-04-061-4/+16
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'ar/clean-rmdir-empty' into maintJunio C Hamano2011-05-041-0/+7
|\ \ \ \ \ \ \
| * | | | | | | clean: unreadable directory may still be rmdir-able if it is emptyAlex Riesen2011-04-011-0/+7
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'mg/sha1-path-advise' into maintJunio C Hamano2011-05-041-5/+12
|\ \ \ \ \ \ \
| * | | | | | | sha1_name: Suggest commit:./file for path in subdirMichael J Gruber2011-04-031-1/+1
| * | | | | | | t1506: factor out test for "Did you mean..."Michael J Gruber2011-04-031-5/+12
* | | | | | | | Merge branch 'mg/x-years-12-months' into maintJunio C Hamano2011-04-291-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | date: avoid "X years, 12 months" in relative datesMichael J Gruber2011-04-201-0/+1
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'maint'Junio C Hamano2011-04-142-1/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | t3306,t5304: avoid clock skew issuesMichael J Gruber2011-04-142-1/+5
| * | | | | | | | Merge branch 'js/checkout-untracked-symlink' into maintJunio C Hamano2011-04-131-1/+1
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | Merge branch 'nm/maint-conflicted-submodule-entries' into maintJunio C Hamano2011-04-061-6/+52
| |\ \ \ \ \ \ \ \
| * | | | | | | | | pull: do not clobber untracked files on initial pullJeff King2011-04-031-0/+11
| * | | | | | | | | Merge branch 'jc/maint-rev-list-culled-boundary' into maintJunio C Hamano2011-04-031-0/+27
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'mm/maint-log-n-with-diff-filtering' into maintJunio C Hamano2011-04-034-0/+19
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/format-patch-multiline-header' into maintJunio C Hamano2011-04-031-0/+84
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'lp/config-vername-check' into maintJunio C Hamano2011-04-031-4/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'pk/stash-apply-status-relative' into maintJunio C Hamano2011-04-011-0/+19
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-diff-q-filter' into maintJunio C Hamano2011-04-011-0/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jh/maint-do-not-track-non-branches' into maintJunio C Hamano2011-04-013-15/+31
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/checkout-untracked-symlink' into maintJunio C Hamano2011-04-012-3/+61
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "checkout ambiguous ref bugfix" into maintJunio C Hamano2011-04-011-0/+59
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'js/checkout-untracked-symlink'Junio C Hamano2011-04-121-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | t2021: mark a test as fixedJohannes Sixt2011-04-121-1/+1
| | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'nd/init-gitdir'Junio C Hamano2011-04-121-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | t0001: guard a new test with SYMLINKS prerequisiteJohannes Sixt2011-04-111-1/+1
* | | | | | | | | | | | | | | | | Merge branch 'jk/maint-remote-mirror-safer'Junio C Hamano2011-04-061-0/+78
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | remote: separate the concept of push and fetch mirrorsJeff King2011-03-301-0/+78
* | | | | | | | | | | | | | | | | Merge branch 'jl/submodule-fetch-on-demand'Junio C Hamano2011-04-043-1/+276
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \