summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | | | | | | | | | | Teach git-pull to pass -X<option> to git-mergeAvery Pennarun2010-01-171-0/+8
| * | | | | | | | | | | | | git merge -X<option>Avery Pennarun2010-01-171-0/+56
* | | | | | | | | | | | | | Merge branch 'jh/notes' (early part)Junio C Hamano2010-01-203-13/+766
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Add more testcases to test fast-import of notesJohan Herland2009-12-071-0/+623
| * | | | | | | | | | | | | | Rename t9301 to t9350, to make room for more fast-import testsJohan Herland2009-12-071-0/+0
| * | | | | | | | | | | | | | fast-import: Proper notes tree manipulationJohan Herland2009-12-071-13/+143
* | | | | | | | | | | | | | | Merge branch 'jc/cache-unmerge'Junio C Hamano2010-01-201-0/+143
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | rerere forget path: forget recorded resolutionJunio C Hamano2010-01-101-0/+25
| * | | | | | | | | | | | | | | resolve-undo: teach "update-index --unresolve" to use resolve-undo infoJunio C Hamano2009-12-251-0/+7
| * | | | | | | | | | | | | | | resolve-undo: "checkout -m path" uses resolve-undo informationJunio C Hamano2009-12-251-0/+11
| * | | | | | | | | | | | | | | resolve-undo: allow plumbing to clear the informationJunio C Hamano2009-12-251-0/+12
| * | | | | | | | | | | | | | | resolve-undo: basic testsJunio C Hamano2009-12-251-0/+88
| | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'js/exec-error-report'Junio C Hamano2010-01-201-0/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | start_command: detect execvp failures earlyJohannes Sixt2010-01-101-0/+14
| * | | | | | | | | | | | | | | Merge branch 'master' into il/vcs-helperJunio C Hamano2009-12-0678-210/+3548
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/ls-files-ignored-pathspec'Junio C Hamano2010-01-201-0/+39
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | ls-files: fix overeager pathspec optimizationJunio C Hamano2010-01-081-1/+1
| * | | | | | | | | | | | | | | | | t3001: test ls-files -o ignored/dirJunio C Hamano2010-01-081-0/+39
* | | | | | | | | | | | | | | | | | Merge branch 'jc/grep-lookahead'Junio C Hamano2010-01-201-23/+51
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | grep --no-index: allow use of "git grep" outside a git repositoryJunio C Hamano2010-01-151-0/+52
| * | | | | | | | | | | | | | | | | | grep: rip out support for external grepJunio C Hamano2010-01-131-3/+3
| | |_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'mm/conflict-advice'Junio C Hamano2010-01-202-3/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Be more user-friendly when refusing to do something because of conflict.Matthieu Moy2010-01-122-3/+5
| |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge branch 'da/difftool'Junio C Hamano2010-01-201-12/+51
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | difftool: Update copyright notices to list each year separatelyDavid Aguilar2010-01-151-1/+1
View Lorry Controller Status