summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | pull: re-fix command line generationJunio C Hamano2010-01-241-0/+35
| |/ / / / / / |/| | | | | |
* | | | | | | Merge git://git.bogomips.org/git-svnJunio C Hamano2010-01-237-127/+849
|\ \ \ \ \ \ \
| * | | | | | | git-svn: allow subset of branches/tags to be specified in glob specJay Soffian2010-01-232-0/+264
| * | | | | | | git-svn: allow UUID to be manually remapped via rewriteUUIDJay Soffian2010-01-232-0/+100
| * | | | | | | git-svn: update svn mergeinfo test suiteAndrew Myrick2010-01-233-127/+485
* | | | | | | | t7800-difftool.sh: Test mergetool.prompt fallbackDavid Aguilar2010-01-221-0/+12
|/ / / / / / /
* | | | | | | Merge branch 'maint'Junio C Hamano2010-01-221-0/+6
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | ignore duplicated slashes in make_relative_path()Junio C Hamano2010-01-221-0/+6
* | | | | | | Merge branch 'jc/branch-d'Junio C Hamano2010-01-221-0/+26
|\ \ \ \ \ \ \
| * | | | | | | branch -d: base the "already-merged" safety on the branch it merges withJunio C Hamano2009-12-301-0/+26
* | | | | | | | Merge branch 'il/rev-glob'Junio C Hamano2010-01-221-0/+195
|\ \ \ \ \ \ \ \
| * | | | | | | | rev-parse --branches/--tags/--remotes=patternIlari Liusvaara2010-01-201-1/+62
| * | | | | | | | rev-parse --globIlari Liusvaara2010-01-201-0/+134
* | | | | | | | | Merge branch 'js/refer-upstream'Junio C Hamano2010-01-221-0/+110
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Teach @{upstream} syntax to strbuf_branchanme()Junio C Hamano2010-01-201-3/+3
| * | | | | | | | | t1506: more test for @{upstream} syntaxJunio C Hamano2010-01-201-0/+41
| * | | | | | | | | Introduce <branch>@{upstream} notationJohannes Schindelin2010-01-121-0/+69
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jl/submodule-diff'Junio C Hamano2010-01-224-19/+154
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git status: Show uncommitted submodule changes too when enabledJens Lehmann2010-01-172-3/+3
| * | | | | | | | | Teach diff that modified submodule directory is dirtyJunio C Hamano2010-01-161-1/+83
| * | | | | | | | | Show submodules as modified when they contain a dirty work treeJens Lehmann2010-01-161-15/+68
* | | | | | | | | | Merge branch 'il/remote-updates'Junio C Hamano2010-01-221-1/+215
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add git remote set-urlIlari Liusvaara2010-01-181-1/+215
* | | | | | | | | | | Merge branch 'il/branch-set-upstream'Junio C Hamano2010-01-221-0/+21
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add branch --set-upstreamIlari Liusvaara2010-01-181-0/+21
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'jc/maint-limit-note-output'Junio C Hamano2010-01-221-0/+59
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
| * | | | | | | | | | Fix "log --oneline" not to show notesJunio C Hamano2010-01-211-2/+4
| * | | | | | | | | | Fix "log" family not to be too agressive about showing notesJunio C Hamano2010-01-201-0/+57
| | |_|_|_|_|/ / / / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'bg/maint-remote-update-default' into maintJunio C Hamano2010-01-201-0/+14
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'sb/maint-octopus' into maintJunio C Hamano2010-01-201-0/+51
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| * | | | | | | | | | Merge branch 'maint-1.6.5' into maintJunio C Hamano2010-01-201-0/+6
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| | * | | | | | | | | Merge branch 'jk/maint-1.6.5-reset-hard' into maint-1.6.5Junio C Hamano2010-01-201-0/+6
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'maint-1.6.4' into maint-1.6.5Junio C Hamano2010-01-182-20/+20
| | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge branch 'maint-1.6.3' into maint-1.6.4Junio C Hamano2010-01-182-20/+20
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ Merge branch 'maint-1.6.2' into maint-1.6.3Junio C Hamano2010-01-182-20/+20
| | | | |\ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ Merge branch 'maint-1.6.1' into maint-1.6.2Junio C Hamano2010-01-102-20/+20
| | | | | |\ \ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ \ Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2010-01-101-13/+13
| | | | | | |\ \ \ \ \ \ \ \ \ \
| | | * | | | \ \ \ \ \ \ \ \ \ \ Merge commit 'v1.6.4.4-8-g8de6518' into maint-1.6.4Junio C Hamano2010-01-181-1/+5
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | Fix mis-backport of t7002Junio C Hamano2010-01-181-1/+5
* | | | | | | | | | | | | | | | | | git-mv: fix moving more than one source to a single destinationJunio C Hamano2010-01-221-0/+12
* | | | | | | | | | | | | | | | | | rebase -i: Enclose sed command substitution in quotesMichael Haggerty2010-01-221-1/+1
* | | | | | | | | | | | | | | | | | Make 'rerere forget' work from a subdirectory.Johannes Sixt2010-01-211-22/+49
* | | | | | | | | | | | | | | | | | Make test case numbers uniqueJohannes Sixt2010-01-212-0/+0
* | | | | | | | | | | | | | | | | | conflict-marker-size: add test and docsJunio C Hamano2010-01-201-0/+12
* | | | | | | | | | | | | | | | | | Merge branch 'ag/patch-header-verify'Junio C Hamano2010-01-201-0/+38
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | builtin-apply.c: fix the --- and +++ header filename consistency checkAndreas Gruenbacher2010-01-181-0/+38
| |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge branch 'ag/maint-apply-too-large-p'Junio C Hamano2010-01-201-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | builtin-apply.c: Skip filenames without enough componentsAndreas Gruenbacher2010-01-181-0/+5
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'ap/merge-backend-opts'Junio C Hamano2010-01-202-1/+110
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Extend merge-subtree tests to test -Xsubtree=dir.Avery Pennarun2010-01-171-1/+46
View Lorry Controller Status