aboutsummaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAge
* userdiff/perl: anchor "sub" and "package" patterns on the leftJonathan Nieder2011-05-21
* t4018 (funcname patterns): minor cleanupsJonathan Nieder2011-05-21
* t4018 (funcname patterns): make configuration easier to trackJonathan Nieder2011-05-21
* t4018 (funcname patterns): make .gitattributes state easier to trackJonathan Nieder2011-05-21
* git-svn: Fix git svn log --show-commitMichael J Gruber2011-05-20
* Merge branch 'jc/t1506-shell-param-expansion-gotcha' into maintJunio C Hamano2011-05-16
|\
| * t1507: avoid "${parameter<op>'word'}" inside double-quotesJunio C Hamano2011-05-09
* | Merge branch 'jc/fix-add-u-unmerged' into maintJunio C Hamano2011-05-16
|\ \
| * | Fix "add -u" that sometimes fails to resolve unmerged pathsJunio C Hamano2011-04-23
* | | Merge branch 'jc/maint-branch-mergeoptions' into maintJunio C Hamano2011-05-16
|\ \ \
| * | | merge: make branch.<name>.mergeoptions correctly override merge.<option>Junio C Hamano2011-05-06
* | | | Merge branch 'jc/maint-add-p-overlapping-hunks' into maintJunio C Hamano2011-05-16
|\ \ \ \
| * | | | t3701: add-p-fix makes the last test to passJunio C Hamano2011-05-08
| * | | | t3701: Editing a split hunk in an "add -p" sessionJunio C Hamano2011-04-29
* | | | | Merge branch 'jm/mergetool-submodules' into maintJunio C Hamano2011-05-15
|\ \ \ \ \
| * | | | | mergetool: Teach about submodulesJonathon Mah2011-04-13
* | | | | | Merge branch 'jk/format-patch-quote-special-in-from' into maintJunio C Hamano2011-05-15
|\ \ \ \ \ \
| * | | | | | pretty: quote rfc822 specials in email addressesJeff King2011-04-26
* | | | | | | Merge branch 'aw/maint-rebase-i-p-no-ff' into maintJunio C Hamano2011-05-13
|\ \ \ \ \ \ \
| * | | | | | | git-rebase--interactive.sh: preserve-merges fails on merges created with no-ffAndrew Wong2011-04-28
| |/ / / / / /
* | | | | | | Merge branch 'js/blame-parsename' into maintJunio C Hamano2011-05-13
|\ \ \ \ \ \ \
| * | | | | | | t/annotate-tests: Use echo & cat instead of sedBrian Gernhardt2011-05-05
| * | | | | | | blame: tolerate bogus e-mail addresses a bit betterJosh Stone2011-04-29
* | | | | | | | Merge branch 'jk/merge-one-file-working-tree' into maintJunio C Hamano2011-05-13
|\ \ \ \ \ \ \ \
| * | | | | | | | merge-one-file: fix broken merges with alternate work treesJeff King2011-04-29
| * | | | | | | | add tests for merge-index / merge-one-fileJeff King2011-04-29
* | | | | | | | | Merge branch 'jc/fix-diff-files-unmerged' into maintJunio C Hamano2011-05-13
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | diff-files: show unmerged entries correctlyJunio C Hamano2011-04-23
| * | | | | | | | test: use $_z40 from test-libJunio C Hamano2011-04-23
* | | | | | | | | Merge branch 'mz/maint-rename-unmerged' into maintJunio C Hamano2011-05-13
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | diffcore-rename: don't consider unmerged path as sourceMartin von Zweigbergk2011-03-23
* | | | | | | | | | t5400: Fix a couple of typosJohan Herland2011-05-13
* | | | | | | | | | t3701: fix here documentJunio C Hamano2011-05-05
* | | | | | | | | | Merge branch 'jh/dirstat' into maintJunio C Hamano2011-05-04
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Teach --dirstat not to completely ignore rearranged lines within a fileJohan Herland2011-04-11
| * | | | | | | | | | --dirstat-by-file: Make it faster and more correctJohan Herland2011-04-11
| * | | | | | | | | | --dirstat: Describe non-obvious differences relative to --stat or regular diffJohan Herland2011-04-11
* | | | | | | | | | | Merge branch 'jk/maint-stash-oob' into maintJunio C Hamano2011-05-04
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | stash: fix false positive in the invalid ref test.Jon Seymour2011-04-05
| * | | | | | | | | | | stash: fix accidental apply of non-existent stashesJeff King2011-04-05
* | | | | | | | | | | | Merge branch 'dm/stash-k-i-p' into maintJunio C Hamano2011-05-04
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | stash: ensure --no-keep-index and --patch can be used in any orderDan McGee2011-04-07
| * | | | | | | | | | | | stash: add two more tests for --no-keep-indexDan McGee2011-04-07
* | | | | | | | | | | | | Merge branch 'mg/reflog-with-options' into maintJunio C Hamano2011-05-04
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | reflog: fix overriding of command line optionsMichael J Gruber2011-04-01
| * | | | | | | | | | | | | t/t1411: test reflog with formatsMichael J Gruber2011-04-01
* | | | | | | | | | | | | | Merge branch 'jk/stash-loosen-safety' into maintJunio C Hamano2011-05-04
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | stash: drop dirty worktree check on applyJeff King2011-04-06
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'ar/clean-rmdir-empty' into maintJunio C Hamano2011-05-04
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | clean: unreadable directory may still be rmdir-able if it is emptyAlex Riesen2011-04-01
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |