summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | | | | difftool: Use eval to expand '--extcmd' expressionsDavid Aguilar2010-01-151-0/+13
| * | | | | | | difftool: Add '-x' and as an alias for '--extcmd'David Aguilar2010-01-151-0/+8
| * | | | | | | t7800-difftool.sh: Simplify the --extcmd testDavid Aguilar2010-01-151-8/+5
| * | | | | | | difftool: Allow specifying unconfigured commands with --extcmdDavid Aguilar2010-01-091-1/+18
| * | | | | | | difftool--helper: Remove use of the GIT_MERGE_TOOL variableDavid Aguilar2010-01-091-9/+0
| * | | | | | | git-difftool: Add '--gui' for selecting a GUI toolDavid Aguilar2010-01-031-0/+12
| * | | | | | | t7800-difftool: Set a bogus tool for use by testsDavid Aguilar2010-01-031-1/+2
| |/ / / / / /
* | | | | | | Merge branch 'mh/rebase-fixup'Junio C Hamano2010-01-202-31/+76
|\ \ \ \ \ \ \
| * | | | | | | rebase -i: Retain user-edited commit messages after squash/fixup conflictsMichael Haggerty2010-01-141-0/+36
| * | | | | | | t3404: Set up more of the test repo in the "setup" stepMichael Haggerty2010-01-141-25/+26
| * | | | | | | rebase -i: For fixup commands without squashes, do not start editorMichael Haggerty2010-01-141-4/+3
| * | | | | | | rebase -i: Improve consistency of commit count in generated commit messagesMichael Haggerty2010-01-141-2/+2
| * | | | | | | t3404: Test the commit count in commit messages generated by "rebase -i"Michael Haggerty2010-01-142-3/+12
* | | | | | | | Merge branch 'ns/rebase-auto-squash'Junio C Hamano2010-01-201-0/+73
|\ \ \ \ \ \ \ \
| * | | | | | | | rebase -i --autosquash: auto-squash commitsNanako Shiraishi2010-01-061-0/+73
* | | | | | | | | Merge branch 'mh/rebase-fixup' (early part)Junio C Hamano2010-01-202-53/+94
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | rebase-i: Ignore comments and blank lines in peek_next_commandMichael Haggerty2010-01-121-0/+24
| * | | | | | | | lib-rebase: Allow comments and blank lines to be added to the rebase scriptMichael Haggerty2010-01-121-5/+16
| * | | | | | | | lib-rebase: Provide clearer debugging info about what the editor didMichael Haggerty2010-01-121-2/+3
| |/ / / / / / /
| * | | | | | | Add a command "fixup" to rebase --interactiveMichael Haggerty2009-12-072-3/+34
| * | | | | | | t3404: Use test_commit to set up test repositoryMichael Haggerty2009-12-061-46/+20
View Lorry Controller Status