summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'mz/maint-rename-unmerged'Junio C Hamano2011-05-021-0/+62
|\
| * diffcore-rename: don't consider unmerged path as sourceMartin von Zweigbergk2011-03-231-0/+62
* | t/test-lib.sh: minor readability improvementsMathias Lafeldt2011-04-291-7/+9
* | Merge branch 'jc/diff-irreversible-delete'Junio C Hamano2011-04-281-1/+42
|\ \
| * | git diff -D: omit the preimage of deletesJunio C Hamano2011-04-021-1/+42
* | | Merge branch 'jc/rename-degrade-cc-to-c'Junio C Hamano2011-04-281-0/+25
|\ \ \
| * | | diffcore-rename: fall back to -C when -C -C busts the rename limitJunio C Hamano2011-03-221-0/+25
* | | | Merge branch 'mz/rebase'Junio C Hamano2011-04-284-9/+88
|\ \ \ \
| * | | | rebase: use @{upstream} if no upstream specifiedMartin von Zweigbergk2011-02-101-9/+18
| * | | | rebase -m: remember allow_rerere_autoupdate optionMartin von Zweigbergk2011-02-101-0/+21
| * | | | rebase: remember strategy and strategy optionsMartin von Zweigbergk2011-02-101-0/+29
| * | | | rebase: stricter check of standalone sub commandMartin von Zweigbergk2011-02-103-0/+20
* | | | | Merge branch 'en/merge-recursive'Junio C Hamano2011-04-281-0/+63
|\ \ \ \ \
| * | | | | merge-recursive: When we detect we can skip an update, actually skip itElijah Newren2011-03-021-1/+1
| * | | | | t6022: New test checking for unnecessary updates of files in D/F conflictsElijah Newren2011-03-021-0/+33
| * | | | | t6022: New test checking for unnecessary updates of renamed+modified filesElijah Newren2011-03-021-0/+30
* | | | | | Merge branch 'jh/dirstat'Junio C Hamano2011-04-286-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 'mg/x-years-12-months'Junio C Hamano2011-04-271-0/+1
|\ \ \ \ \ \ \
| * | | | | | | date: avoid "X years, 12 months" in relative datesMichael J Gruber2011-04-201-0/+1
* | | | | | | | Merge branch 'ef/maint-strbuf-init'Junio C Hamano2011-04-271-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | config: support values longer than 1023 bytesErik Faye-Lund2011-04-111-1/+1
* | | | | | | | | Merge branch 'dm/stash-k-i-p'Junio C Hamano2011-04-272-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 'jk/maint-stash-oob'Junio C Hamano2011-04-271-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 'jk/stash-loosen-safety'Junio C Hamano2011-04-271-4/+16
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | stash: drop dirty worktree check on applyJeff King2011-04-061-4/+16
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'mh/git-svn-automkdirs'Junio C Hamano2011-04-271-0/+17
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | git-svn: add an option to skip the creation of empty directoriesMichael Haggerty2011-04-011-0/+17
* | | | | | | | | | | | Merge branch 'mg/reflog-with-options'Junio C Hamano2011-04-271-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 'ar/clean-rmdir-empty'Junio C Hamano2011-04-271-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'Junio C Hamano2011-04-271-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 '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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status