summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'ko/maint' into jc/diff-index-quick-exit-earlyJunio C Hamano2011-05-31564-4792/+45961
|\
| * Merge branch 'jn/run-command-error-failure' into maintJunio C Hamano2011-05-291-0/+23
| |\
| | * tests: check error message from run_commandJonathan Nieder2011-04-201-0/+23
| * | Merge branch 'jm/maint-diff-words-with-sbe' into maintJunio C Hamano2011-05-261-0/+26
| |\ \
| | * | do not read beyond end of malloc'd bufferJim Meyering2011-05-201-0/+26
| * | | Merge branch 'jc/maint-pathspec-stdin-and-cmdline' into maintJunio C Hamano2011-05-261-0/+17
| |\ \ \
| | * \ \ Merge branch 'jc/maint-1.7.4-pathspec-stdin-and-cmdline'Junio C Hamano2011-05-111-0/+17
| | |\ \ \
| | | * \ \ Merge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline'Junio C Hamano2011-05-111-0/+17
| | | |\ \ \
| | | | * | | setup_revisions(): take pathspec from command line and --stdin correctlyJunio C Hamano2011-05-111-0/+17
| * | | | | | Merge branch 'jk/cherry-pick-root-with-resolve' into maintJunio C Hamano2011-05-261-2/+25
| |\ \ \ \ \ \
| | * | | | | | t3503: test cherry picking and reverting root commitsJeff King2011-05-161-2/+25
| * | | | | | | Merge branch 'jk/git-connection-deadlock-fix' into maintJunio C Hamano2011-05-261-0/+43
| |\ \ \ \ \ \ \
| | * | | | | | | test core.gitproxy configurationJeff King2011-05-181-0/+43
| * | | | | | | | Merge branch 'svn-fe-maint' of git://repo.or.cz/git/jrn into maintJunio C Hamano2011-05-261-104/+2
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Revert "t0081 (line-buffer): add buffering tests"Jonathan Nieder2011-03-301-104/+2
| * | | | | | | | | init/clone: remove short option -L and document --separate-git-dirNguyen Thai Ngoc Duy2011-05-251-1/+1
| * | | | | | | | | git-svn: Fix git svn log --show-commitMichael J Gruber2011-05-201-0/+15
| * | | | | | | | | Merge branch 'jc/t1506-shell-param-expansion-gotcha' into maintJunio C Hamano2011-05-161-2/+5
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | t1507: avoid "${parameter<op>'word'}" inside double-quotesJunio C Hamano2011-05-091-2/+5
| * | | | | | | | | | Merge branch 'jc/fix-add-u-unmerged' into maintJunio C Hamano2011-05-161-17/+7
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fix "add -u" that sometimes fails to resolve unmerged pathsJunio C Hamano2011-04-231-17/+7
| * | | | | | | | | | | Merge branch 'jc/maint-branch-mergeoptions' into maintJunio C Hamano2011-05-161-0/+32
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | merge: make branch.<name>.mergeoptions correctly override merge.<option>Junio C Hamano2011-05-061-0/+32
| * | | | | | | | | | | | Merge branch 'jc/maint-add-p-overlapping-hunks' into maintJunio C Hamano2011-05-161-0/+36
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | t3701: add-p-fix makes the last test to passJunio C Hamano2011-05-081-1/+1
| | * | | | | | | | | | | t3701: Editing a split hunk in an "add -p" sessionJunio C Hamano2011-04-291-0/+36
| * | | | | | | | | | | | Merge branch 'jm/mergetool-submodules' into maintJunio C Hamano2011-05-151-3/+287
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | mergetool: Teach about submodulesJonathon Mah2011-04-131-3/+287
| * | | | | | | | | | | | | Merge branch 'jk/format-patch-quote-special-in-from' into maintJunio C Hamano2011-05-151-0/+42
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | pretty: quote rfc822 specials in email addressesJeff King2011-04-261-0/+42
| * | | | | | | | | | | | | | Merge branch 'aw/maint-rebase-i-p-no-ff' into maintJunio C Hamano2011-05-131-1/+31
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | git-rebase--interactive.sh: preserve-merges fails on merges created with no-ffAndrew Wong2011-04-281-1/+31
| | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | | Merge branch 'js/blame-parsename' into maintJunio C Hamano2011-05-132-2/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | t/annotate-tests: Use echo & cat instead of sedBrian Gernhardt2011-05-051-1/+2
| | * | | | | | | | | | | | | | blame: tolerate bogus e-mail addresses a bit betterJosh Stone2011-04-292-2/+12
| | | |_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'jk/merge-one-file-working-tree' into maintJunio C Hamano2011-05-131-0/+100
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | merge-one-file: fix broken merges with alternate work treesJeff King2011-04-291-2/+2
| | * | | | | | | | | | | | | | add tests for merge-index / merge-one-fileJeff King2011-04-291-0/+100
| * | | | | | | | | | | | | | | Merge branch 'jc/fix-diff-files-unmerged' into maintJunio C Hamano2011-05-1313-22/+102
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | diff-files: show unmerged entries correctlyJunio C Hamano2011-04-231-0/+87
| | * | | | | | | | | | | | | | test: use $_z40 from test-libJunio C Hamano2011-04-2312-22/+15
| * | | | | | | | | | | | | | | Merge branch 'mz/maint-rename-unmerged' into maintJunio C Hamano2011-05-131-0/+62
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | diffcore-rename: don't consider unmerged path as sourceMartin von Zweigbergk2011-03-231-0/+62
| * | | | | | | | | | | | | | | | t5400: Fix a couple of typosJohan Herland2011-05-131-2/+2
| | |_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | t3701: fix here documentJunio C Hamano2011-05-051-3/+2
| * | | | | | | | | | | | | | | Merge branch 'jh/dirstat' into maintJunio C Hamano2011-05-046-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 'jk/maint-stash-oob' into maintJunio C Hamano2011-05-041-5/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status