Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'kk/maint-for-each-ref-multi-sort' | Junio C Hamano | 2012-09-07 | 1 | -0/+10 |
|\ | |||||
| * | for-each-ref: Fix sort with multiple keys | Kacper Kornet | 2012-08-21 | 1 | -1/+1 |
| * | t6300: test sort with multiple keys | Kacper Kornet | 2012-08-21 | 1 | -0/+10 |
* | | Merge branch 'pw/p4-use-client-spec-branch-detection' | Junio C Hamano | 2012-09-07 | 3 | -17/+94 |
|\ \ | |||||
| * | | git p4: make branch detection work with --use-client-spec | Pete Wyckoff | 2012-08-20 | 1 | -1/+1 |
| * | | git p4 test: add broken --use-client-spec --detect-branches tests | Pete Wyckoff | 2012-08-11 | 1 | -0/+77 |
| * | | git p4 test: move client_view() function to library | Pete Wyckoff | 2012-08-11 | 2 | -17/+17 |
* | | | Merge branch 'nd/i18n-poison-test-updates' | Junio C Hamano | 2012-09-07 | 23 | -53/+83 |
|\ \ \ | |||||
| * | | | Fix tests under GETTEXT_POISON on parseopt | Jiang Xin | 2012-08-27 | 11 | -22/+46 |
| * | | | Fix tests under GETTEXT_POISON on git-remote | Jiang Xin | 2012-08-27 | 1 | -11/+17 |
| * | | | Fix tests under GETTEXT_POISON on pack-object | Jiang Xin | 2012-08-27 | 2 | -4/+4 |
| * | | | Fix tests under GETTEXT_POISON on git-apply | Jiang Xin | 2012-08-27 | 3 | -6/+6 |
| * | | | Fix tests under GETTEXT_POISON on diffstat | Jiang Xin | 2012-08-27 | 4 | -8/+8 |
| * | | | Fix tests under GETTEXT_POISON on git-stash | Jiang Xin | 2012-08-27 | 1 | -1/+1 |
| * | | | Fix tests under GETTEXT_POISON on relative dates | Jiang Xin | 2012-08-27 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge branch 'sz/submodule-force-update' | Junio C Hamano | 2012-09-03 | 1 | -0/+12 |
|\ \ \ | |||||
| * | | | Make 'git submodule update --force' always check out submodules. | Stefan Zager | 2012-08-24 | 1 | -0/+12 |
* | | | | Merge branch 'ph/stash-rerere' | Junio C Hamano | 2012-09-03 | 1 | -0/+38 |
|\ \ \ \ | |||||
| * | | | | stash: invoke rerere in case of conflict | Phil Hord | 2012-08-17 | 1 | -1/+1 |
| * | | | | test: git-stash conflict sets up rerere | Phil Hord | 2012-08-17 | 1 | -0/+38 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'cw/cherry-pick-allow-empty-message' | Junio C Hamano | 2012-09-03 | 1 | -0/+5 |
|\ \ \ \ | |||||
| * | | | | cherry-pick: add --allow-empty-message option | Chris Webb | 2012-08-06 | 1 | -0/+5 |
* | | | | | Merge branch 'ef/win32-cred-helper' | Junio C Hamano | 2012-08-29 | 1 | -0/+4 |
|\ \ \ \ \ | |||||
| * | | | | | contrib: add win32 credential-helper | Erik Faye-Lund | 2012-08-16 | 1 | -0/+4 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'hv/submodule-path-unmatch' | Junio C Hamano | 2012-08-29 | 1 | -4/+22 |
|\ \ \ \ \ | |||||
| * | | | | | Let submodule command exit with error status if path does not exist | Heiko Voigt | 2012-08-14 | 1 | -4/+22 |
* | | | | | | Merge branch 'mz/empty-rebase-test' | Junio C Hamano | 2012-08-29 | 1 | -1/+17 |
|\ \ \ \ \ \ | |||||
| * | | | | | | add tests for 'git rebase --keep-empty' | Martin von Zweigbergk | 2012-08-09 | 1 | -1/+17 |
* | | | | | | | Merge branch 'js/grep-patterntype-config' | Junio C Hamano | 2012-08-27 | 1 | -0/+181 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | grep: add a grep.patternType configuration setting | J Smith | 2012-08-03 | 1 | -0/+181 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'bc/receive-pack-stdout-protection' | Junio C Hamano | 2012-08-27 | 1 | -0/+35 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | receive-pack: do not leak output from auto-gc to standard output | Junio C Hamano | 2012-08-06 | 1 | -1/+1 |
| * | | | | | | | t/t5400: demonstrate breakage caused by informational message from prune | Brandon Casey | 2012-08-06 | 1 | -0/+35 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Merge branch 'ab/diff-write-incomplete-line' | Junio C Hamano | 2012-08-27 | 1 | -0/+30 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix '\ No newline...' annotation in rewrite diffs | Adam Butcher | 2012-08-05 | 1 | -0/+30 |
* | | | | | | | | Merge branch 'jc/maint-t7406-rev-parse-max-count-huh' | Junio C Hamano | 2012-08-27 | 1 | -8/+8 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | t7406: fix misleading "rev-parse --max-count=1 HEAD" | Junio C Hamano | 2012-07-30 | 1 | -8/+8 |
* | | | | | | | | | Merge branch 'jk/maint-null-in-trees' | Junio C Hamano | 2012-08-27 | 3 | -0/+128 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | fsck: detect null sha1 in tree entries | Jeff King | 2012-07-29 | 1 | -0/+26 |
| * | | | | | | | | | do not write null sha1s to on-disk index | Jeff King | 2012-07-29 | 1 | -0/+19 |
| * | | | | | | | | | diff: do not use null sha1 as a sentinel value | Jeff King | 2012-07-29 | 1 | -0/+83 |
| | |_|/ / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'mm/push-default-switch-warning' | Junio C Hamano | 2012-08-27 | 1 | -1/+4 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | push: start warning upcoming default change for push.default | Matthieu Moy | 2012-06-24 | 1 | -1/+4 |
* | | | | | | | | | | Merge branch 'tr/maint-send-email-2047' | Junio C Hamano | 2012-08-22 | 1 | -0/+13 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | send-email: improve RFC2047 quote parsing | Thomas Rast | 2012-07-31 | 1 | -0/+13 |
| | |/ / / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'mk/test-seq' | Junio C Hamano | 2012-08-22 | 3 | -2/+23 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | tests: Introduce test_seq | MichaĆ Kiedrowicz | 2012-08-04 | 3 | -2/+23 |
| | |_|_|/ / / / / | |/| | | | | | | | |||||
| * | | | | | | | | Merge branch 'kk/maint-commit-tree' into maint | Junio C Hamano | 2012-07-30 | 1 | -0/+17 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'jv/maint-no-ext-diff' into maint | Junio C Hamano | 2012-07-30 | 1 | -0/+59 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'jl/maint-1.7.10-recurse-submodules-with-symlink' into maint | Junio C Hamano | 2012-07-30 | 1 | -0/+13 |
| |\ \ \ \ \ \ \ \ \ \ |