aboutsummaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAge
* reset: add test cases for "--keep" optionChristian Couder2010-01-24
* Merge branch 'jc/fix-tree-walk'Junio C Hamano2010-01-24
|\
| * unpack-trees.c: look ahead in the indexJunio C Hamano2010-01-07
| * Aggressive three-way merge: fix D/F caseJunio C Hamano2010-01-03
| * traverse_trees(): handle D/F conflict case sanelyJunio C Hamano2010-01-03
| * more D/F conflict testsJunio C Hamano2010-01-03
| * tests: move convenience regexp to match object names to test-lib.shJunio C Hamano2010-01-03
* | Make test numbers uniqueJohannes Sixt2010-01-24
* | pull: re-fix command line generationJunio C Hamano2010-01-24
* | Merge git://git.bogomips.org/git-svnJunio C Hamano2010-01-23
|\ \
| * | git-svn: allow subset of branches/tags to be specified in glob specJay Soffian2010-01-23
| * | git-svn: allow UUID to be manually remapped via rewriteUUIDJay Soffian2010-01-23
| * | git-svn: update svn mergeinfo test suiteAndrew Myrick2010-01-23
* | | t7800-difftool.sh: Test mergetool.prompt fallbackDavid Aguilar2010-01-22
|/ /
* | Merge branch 'maint'Junio C Hamano2010-01-22
|\ \
| * | ignore duplicated slashes in make_relative_path()Junio C Hamano2010-01-22
* | | Merge branch 'jc/branch-d'Junio C Hamano2010-01-22
|\ \ \
| * | | branch -d: base the "already-merged" safety on the branch it merges withJunio C Hamano2009-12-30
* | | | Merge branch 'il/rev-glob'Junio C Hamano2010-01-22
|\ \ \ \
| * | | | rev-parse --branches/--tags/--remotes=patternIlari Liusvaara2010-01-20
| * | | | rev-parse --globIlari Liusvaara2010-01-20
* | | | | Merge branch 'js/refer-upstream'Junio C Hamano2010-01-22
|\ \ \ \ \
| * | | | | Teach @{upstream} syntax to strbuf_branchanme()Junio C Hamano2010-01-20
| * | | | | t1506: more test for @{upstream} syntaxJunio C Hamano2010-01-20
| * | | | | Introduce <branch>@{upstream} notationJohannes Schindelin2010-01-12
| | |_|_|/ | |/| | |
* | | | | Merge branch 'jl/submodule-diff'Junio C Hamano2010-01-22
|\ \ \ \ \
| * | | | | git status: Show uncommitted submodule changes too when enabledJens Lehmann2010-01-17
| * | | | | Teach diff that modified submodule directory is dirtyJunio C Hamano2010-01-16
| * | | | | Show submodules as modified when they contain a dirty work treeJens Lehmann2010-01-16
* | | | | | Merge branch 'il/remote-updates'Junio C Hamano2010-01-22
|\ \ \ \ \ \
| * | | | | | Add git remote set-urlIlari Liusvaara2010-01-18
* | | | | | | Merge branch 'il/branch-set-upstream'Junio C Hamano2010-01-22
|\ \ \ \ \ \ \
| * | | | | | | Add branch --set-upstreamIlari Liusvaara2010-01-18
| |/ / / / / /
* | | | | | | Merge branch 'jc/maint-limit-note-output'Junio C Hamano2010-01-22
|\ \ \ \ \ \ \
| * | | | | | | Fix "log --oneline" not to show notesJunio C Hamano2010-01-21
| * | | | | | | Fix "log" family not to be too agressive about showing notesJunio C Hamano2010-01-20
| | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge branch 'bg/maint-remote-update-default' into maintJunio C Hamano2010-01-20
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'sb/maint-octopus' into maintJunio C Hamano2010-01-20
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'maint-1.6.5' into maintJunio C Hamano2010-01-20
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'jk/maint-1.6.5-reset-hard' into maint-1.6.5Junio C Hamano2010-01-20
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'maint-1.6.4' into maint-1.6.5Junio C Hamano2010-01-18
| | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge branch 'maint-1.6.3' into maint-1.6.4Junio C Hamano2010-01-18
| | | |\ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ Merge branch 'maint-1.6.2' into maint-1.6.3Junio C Hamano2010-01-18
| | | | |\ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ Merge branch 'maint-1.6.1' into maint-1.6.2Junio C Hamano2010-01-10
| | | | | |\ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2010-01-10
| | | | | | |\ \ \ \ \ \ \ \ \
| | | * | | | \ \ \ \ \ \ \ \ \ Merge commit 'v1.6.4.4-8-g8de6518' into maint-1.6.4Junio C Hamano2010-01-18
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | Fix mis-backport of t7002Junio C Hamano2010-01-18
* | | | | | | | | | | | | | | | | git-mv: fix moving more than one source to a single destinationJunio C Hamano2010-01-22
* | | | | | | | | | | | | | | | | rebase -i: Enclose sed command substitution in quotesMichael Haggerty2010-01-22
* | | | | | | | | | | | | | | | | Make 'rerere forget' work from a subdirectory.Johannes Sixt2010-01-21