summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'mt/send-email-cc-match-fix'Junio C Hamano2013-06-141-0/+75
|\
| * test-send-email: test for pre-sanitized self nameMichael S. Tsirkin2013-06-051-0/+5
| * t/send-email: test suppress-cc=self with non-asciiMichael S. Tsirkin2013-06-051-0/+5
| * t/send-email: add test with quoted senderMichael S. Tsirkin2013-06-051-0/+20
| * t/send-email: test suppress-cc=self on cccmdMichael S. Tsirkin2013-06-051-1/+3
| * t/send-email.sh: add test for suppress-cc=selfMichael S. Tsirkin2013-06-031-0/+43
* | Merge branch 'kb/full-history-compute-treesame-carefully-2'Junio C Hamano2013-06-143-7/+247
|\ \
| * | revision.c: make default history consider bottom commitsKevin Bracey2013-05-161-6/+6
| * | revision.c: don't show all merges for --parentsKevin Bracey2013-05-161-2/+2
| * | revision.c: discount side branches when computing TREESAMEKevin Bracey2013-05-162-6/+14
| * | simplify-merges: drop merge from irrelevant side branchKevin Bracey2013-05-161-1/+1
| * | simplify-merges: never remove all TREESAME parentsKevin Bracey2013-05-161-2/+2
| * | t6012: update test for tweaked full-history traversalJunio C Hamano2013-05-161-6/+23
| * | revision.c: Make --full-history consider more mergesKevin Bracey2013-05-162-14/+14
| * | t6111: add parents to testsKevin Bracey2013-05-161-19/+19
| * | t6111: allow checking the parents as wellJunio C Hamano2013-05-161-9/+21
| * | t6111: new TREESAME test setKevin Bracey2013-05-161-0/+184
| * | t6019: test file dropped in -s ours mergeKevin Bracey2013-05-161-0/+19
* | | Merge branch 'maint'Junio C Hamano2013-06-111-1/+1
|\ \ \
| * \ \ Merge branch 'maint-1.8.2' into maintJunio C Hamano2013-06-111-1/+1
| |\ \ \
| | * | | t0070 "mktemp to unwritable directory" needs SANITYTorsten Bögershausen2013-06-111-1/+1
| | | |/ | | |/|
| * | | Merge branch 'kb/status-ignored-optim-2' into maintJunio C Hamano2013-06-091-0/+18
| |\ \ \
* | \ \ \ Merge branch 'rr/rebase-autostash'Junio C Hamano2013-06-111-0/+148
|\ \ \ \ \
| * | | | | rebase: implement --[no-]autostash and rebase.autostashRamkumar Ramachandra2013-05-291-0/+148
* | | | | | Merge branch 'jk/test-exit-code-by-signal'Junio C Hamano2013-06-111-0/+7
|\ \ \ \ \ \
| * | | | | | t0005: skip signal death exit code test on WindowsJohannes Sixt2013-06-061-1/+1
| * | | | | | t0005: test git exit code from signal deathJeff King2013-06-021-0/+7
* | | | | | | Merge branch 'fc/at-head'Junio C Hamano2013-06-111-20/+48
|\ \ \ \ \ \ \
| * | | | | | | Add new @ shortcut for HEADFelipe Contreras2013-05-081-0/+2
| * | | | | | | tests: at-combinations: @{N} versus HEAD@{N}Ramkumar Ramachandra2013-05-081-0/+13
| * | | | | | | tests: at-combinations: increase coverageRamkumar Ramachandra2013-05-081-0/+8
| * | | | | | | tests: at-combinations: improve nonsense()Felipe Contreras2013-05-081-1/+1
| * | | | | | | tests: at-combinations: check ref names directlyFelipe Contreras2013-05-081-16/+23
| * | | | | | | tests: at-combinations: simplify setupFelipe Contreras2013-05-071-4/+2
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'ar/wildmatch-foldcase'Junio C Hamano2013-06-111-6/+49
|\ \ \ \ \ \ \
| * | | | | | | wildmatch: properly fold case everywhereAnthony Ramine2013-06-021-6/+49
* | | | | | | | Merge branch 'nd/warn-ambiguous-object-name'Junio C Hamano2013-06-111-0/+18
|\ \ \ \ \ \ \ \
| * | | | | | | | get_sha1: warn about full or short object names that look like refsNguyễn Thái Ngọc Duy2013-05-291-0/+18
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'cb/log-follow-with-combined'Junio C Hamano2013-06-111-0/+14
|\ \ \ \ \ \ \ \
| * | | | | | | | fix segfault with git log -c --followClemens Buchacher2013-05-281-0/+14
* | | | | | | | | Merge branch 'tr/test-commit-only-on-orphan'Junio C Hamano2013-06-111-0/+13
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Test 'commit --only' after 'checkout --orphan'Thomas Rast2013-06-021-0/+13
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'rr/die-on-missing-upstream'Junio C Hamano2013-06-111-10/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | sha1_name: fix error message for @{u}Ramkumar Ramachandra2013-05-221-10/+5
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'ks/difftool-dir-diff-copy-fix'Junio C Hamano2013-06-061-0/+19
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | difftool --dir-diff: allow changing any clean working tree fileKenichi Saita2013-05-291-0/+19
| |/ / / / / / / /
* | | | | | | | | Merge branch 'fc/show-branch-in-rebase-am'Junio C Hamano2013-06-061-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | prompt: fix for simple rebaseFelipe Contreras2013-05-291-1/+1
| |/ / / / / / / /
* | | | | | | | | Merge branch 'nd/clone-connectivity-shortcut'Junio C Hamano2013-06-061-0/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fetch-pack: prepare updated shallow file before fetching the packNguyễn Thái Ngọc Duy2013-05-281-0/+7