summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'kk/maint-for-each-ref-multi-sort'Junio C Hamano2012-09-071-0/+10
|\
| * for-each-ref: Fix sort with multiple keysKacper Kornet2012-08-211-1/+1
| * t6300: test sort with multiple keysKacper Kornet2012-08-211-0/+10
* | Merge branch 'pw/p4-use-client-spec-branch-detection'Junio C Hamano2012-09-073-17/+94
|\ \
| * | git p4: make branch detection work with --use-client-specPete Wyckoff2012-08-201-1/+1
| * | git p4 test: add broken --use-client-spec --detect-branches testsPete Wyckoff2012-08-111-0/+77
| * | git p4 test: move client_view() function to libraryPete Wyckoff2012-08-112-17/+17
* | | Merge branch 'nd/i18n-poison-test-updates'Junio C Hamano2012-09-0723-53/+83
|\ \ \
| * | | Fix tests under GETTEXT_POISON on parseoptJiang Xin2012-08-2711-22/+46
| * | | Fix tests under GETTEXT_POISON on git-remoteJiang Xin2012-08-271-11/+17
| * | | Fix tests under GETTEXT_POISON on pack-objectJiang Xin2012-08-272-4/+4
| * | | Fix tests under GETTEXT_POISON on git-applyJiang Xin2012-08-273-6/+6
| * | | Fix tests under GETTEXT_POISON on diffstatJiang Xin2012-08-274-8/+8
| * | | Fix tests under GETTEXT_POISON on git-stashJiang Xin2012-08-271-1/+1
| * | | Fix tests under GETTEXT_POISON on relative datesJiang Xin2012-08-271-1/+1
| |/ /
* | | Merge branch 'sz/submodule-force-update'Junio C Hamano2012-09-031-0/+12
|\ \ \
| * | | Make 'git submodule update --force' always check out submodules.Stefan Zager2012-08-241-0/+12
* | | | Merge branch 'ph/stash-rerere'Junio C Hamano2012-09-031-0/+38
|\ \ \ \
| * | | | stash: invoke rerere in case of conflictPhil Hord2012-08-171-1/+1
| * | | | test: git-stash conflict sets up rererePhil Hord2012-08-171-0/+38
| | |_|/ | |/| |
* | | | Merge branch 'cw/cherry-pick-allow-empty-message'Junio C Hamano2012-09-031-0/+5
|\ \ \ \
| * | | | cherry-pick: add --allow-empty-message optionChris Webb2012-08-061-0/+5
* | | | | Merge branch 'ef/win32-cred-helper'Junio C Hamano2012-08-291-0/+4
|\ \ \ \ \
| * | | | | contrib: add win32 credential-helperErik Faye-Lund2012-08-161-0/+4
| | |_|_|/ | |/| | |
* | | | | Merge branch 'hv/submodule-path-unmatch'Junio C Hamano2012-08-291-4/+22
|\ \ \ \ \
| * | | | | Let submodule command exit with error status if path does not existHeiko Voigt2012-08-141-4/+22
* | | | | | Merge branch 'mz/empty-rebase-test'Junio C Hamano2012-08-291-1/+17
|\ \ \ \ \ \
| * | | | | | add tests for 'git rebase --keep-empty'Martin von Zweigbergk2012-08-091-1/+17
* | | | | | | Merge branch 'js/grep-patterntype-config'Junio C Hamano2012-08-271-0/+181
|\ \ \ \ \ \ \
| * | | | | | | grep: add a grep.patternType configuration settingJ Smith2012-08-031-0/+181
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'bc/receive-pack-stdout-protection'Junio C Hamano2012-08-271-0/+35
|\ \ \ \ \ \ \
| * | | | | | | receive-pack: do not leak output from auto-gc to standard outputJunio C Hamano2012-08-061-1/+1
| * | | | | | | t/t5400: demonstrate breakage caused by informational message from pruneBrandon Casey2012-08-061-0/+35
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'ab/diff-write-incomplete-line'Junio C Hamano2012-08-271-0/+30
|\ \ \ \ \ \ \
| * | | | | | | Fix '\ No newline...' annotation in rewrite diffsAdam Butcher2012-08-051-0/+30
* | | | | | | | Merge branch 'jc/maint-t7406-rev-parse-max-count-huh'Junio C Hamano2012-08-271-8/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | t7406: fix misleading "rev-parse --max-count=1 HEAD"Junio C Hamano2012-07-301-8/+8
* | | | | | | | | Merge branch 'jk/maint-null-in-trees'Junio C Hamano2012-08-273-0/+128
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fsck: detect null sha1 in tree entriesJeff King2012-07-291-0/+26
| * | | | | | | | | do not write null sha1s to on-disk indexJeff King2012-07-291-0/+19
| * | | | | | | | | diff: do not use null sha1 as a sentinel valueJeff King2012-07-291-0/+83
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'mm/push-default-switch-warning'Junio C Hamano2012-08-271-1/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | push: start warning upcoming default change for push.defaultMatthieu Moy2012-06-241-1/+4
* | | | | | | | | | Merge branch 'tr/maint-send-email-2047'Junio C Hamano2012-08-221-0/+13
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | send-email: improve RFC2047 quote parsingThomas Rast2012-07-311-0/+13
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'mk/test-seq'Junio C Hamano2012-08-223-2/+23
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| * | | | | | | | | tests: Introduce test_seqMichaƂ Kiedrowicz2012-08-043-2/+23
| | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'kk/maint-commit-tree' into maintJunio C Hamano2012-07-301-0/+17
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jv/maint-no-ext-diff' into maintJunio C Hamano2012-07-301-0/+59
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jl/maint-1.7.10-recurse-submodules-with-symlink' into maintJunio C Hamano2012-07-301-0/+13
| |\ \ \ \ \ \ \ \ \ \