summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | stash: fix false positive in the invalid ref test.Jon Seymour2011-04-051-5/+5
| * | | | | | | | | | | stash: fix accidental apply of non-existent stashesJeff King2011-04-051-0/+6
* | | | | | | | | | | | Merge branch 'dm/stash-k-i-p' into maintJunio C Hamano2011-05-042-0/+20
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | stash: ensure --no-keep-index and --patch can be used in any orderDan McGee2011-04-071-1/+1
| * | | | | | | | | | | | stash: add two more tests for --no-keep-indexDan McGee2011-04-072-0/+20
* | | | | | | | | | | | | Merge branch 'mg/reflog-with-options' into maintJunio C Hamano2011-05-041-0/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | reflog: fix overriding of command line optionsMichael J Gruber2011-04-011-1/+1
| * | | | | | | | | | | | | t/t1411: test reflog with formatsMichael J Gruber2011-04-011-0/+18
* | | | | | | | | | | | | | Merge branch 'jk/stash-loosen-safety' into maintJunio C Hamano2011-05-041-4/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | stash: drop dirty worktree check on applyJeff King2011-04-061-4/+16
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'ar/clean-rmdir-empty' into maintJunio C Hamano2011-05-041-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | clean: unreadable directory may still be rmdir-able if it is emptyAlex Riesen2011-04-011-0/+7
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'mg/sha1-path-advise' into maintJunio C Hamano2011-05-041-5/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | sha1_name: Suggest commit:./file for path in subdirMichael J Gruber2011-04-031-1/+1
| * | | | | | | | | | | | | t1506: factor out test for "Did you mean..."Michael J Gruber2011-04-031-5/+12
* | | | | | | | | | | | | | Merge branch 'mg/x-years-12-months' into maintJunio C Hamano2011-04-291-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | date: avoid "X years, 12 months" in relative datesMichael J Gruber2011-04-201-0/+1
| | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | |
View Lorry Controller Status