Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | stash: Don't fail if work dir contains file named 'HEAD'jm/stash-diff-disambiguate | Jonathon Mah | 2012-01-01 | 3 | -28/+76 |
* | Merge branch 'rr/revert-cherry-pick' | Junio C Hamano | 2011-12-22 | 2 | -26/+65 |
|\ | |||||
| * | t3502, t3510: clarify cherry-pick -m failurerr/revert-cherry-pick | Ramkumar Ramachandra | 2011-12-15 | 2 | -2/+2 |
| * | t3510 (cherry-pick-sequencer): use exit status | Ramkumar Ramachandra | 2011-12-15 | 1 | -29/+29 |
| * | revert: tolerate extra spaces, tabs in insn sheet | Ramkumar Ramachandra | 2011-12-15 | 1 | -0/+11 |
| * | revert: make commit subjects in insn sheet optional | Ramkumar Ramachandra | 2011-12-15 | 1 | -0/+28 |
* | | Merge branch 'tr/pty-all' | Junio C Hamano | 2011-12-22 | 1 | -0/+4 |
|\ \ | |||||
| * | | test-terminal: set output terminals to raw modetr/pty-all | Thomas Rast | 2011-12-19 | 1 | -0/+4 |
* | | | Merge branch 'tr/grep-threading' | Junio C Hamano | 2011-12-22 | 1 | -0/+14 |
|\ \ \ | |||||
| * | | | grep: load funcname patterns for -W | Thomas Rast | 2011-12-12 | 1 | -0/+14 |
* | | | | Merge branch 'jk/pretty-reglog-ent' | Junio C Hamano | 2011-12-22 | 1 | -0/+6 |
|\ \ \ \ | |||||
| * | | | | pretty: give placeholders to reflog identityjk/pretty-reglog-ent | Jeff King | 2011-12-16 | 1 | -0/+6 |
* | | | | | Merge branch 'nd/war-on-nul-in-commit' | Junio C Hamano | 2011-12-22 | 1 | -0/+6 |
|\ \ \ \ \ | |||||
| * | | | | | commit_tree(): refuse commit messages that contain NULsnd/war-on-nul-in-commit | Nguyễn Thái Ngọc Duy | 2011-12-15 | 1 | -0/+6 |
| |/ / / / | |||||
* | | | | | Merge branch 'jk/maint-do-not-feed-stdin-to-tests' | Junio C Hamano | 2011-12-22 | 1 | -1/+2 |
|\ \ \ \ \ | |||||
| * | | | | | test-lib: redirect stdin of testsjk/maint-do-not-feed-stdin-to-tests | Jeff King | 2011-12-15 | 1 | -1/+2 |
* | | | | | | Merge branch 'jn/test-cleanup-7006' | Junio C Hamano | 2011-12-22 | 1 | -56/+17 |
|\ \ \ \ \ \ | |||||
| * | | | | | | test: errors preparing for a test are not specialjn/test-cleanup-7006 | Jonathan Nieder | 2011-12-14 | 1 | -56/+17 |
* | | | | | | | Merge branch 'jk/http-push-to-empty' | Junio C Hamano | 2011-12-22 | 1 | -0/+32 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | remote-curl: don't pass back fake refsjk/http-push-to-empty | Jeff King | 2011-12-19 | 1 | -0/+32 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'jc/request-pull-show-head-4' | Junio C Hamano | 2011-12-20 | 1 | -0/+3 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | request-pull: do not emit "tag" before the tagname | Junio C Hamano | 2011-12-19 | 1 | -1/+1 |
| * | | | | | | | request-pull: update the "pull" command generation logic | Junio C Hamano | 2011-12-16 | 1 | -0/+3 |
* | | | | | | | | Merge branch 'jc/checkout-m-twoway' | Junio C Hamano | 2011-12-20 | 1 | -1/+3 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | t/t2023-checkout-m.sh: fix use of test_must_failjc/checkout-m-twoway | Ævar Arnfjörð Bjarmason | 2011-12-20 | 1 | -1/+3 |
* | | | | | | | | | Merge branch 'tr/cache-tree' | Junio C Hamano | 2011-12-20 | 1 | -4/+2 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | t0090: be prepared that 'wc -l' writes leading blankstr/cache-tree | Johannes Sixt | 2011-12-20 | 1 | -4/+2 |
* | | | | | | | | | | Merge branch 'ab/enable-i18n' | Junio C Hamano | 2011-12-19 | 12 | -2/+512 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | i18n: add infrastructure for translating Git with gettextab/enable-i18n | Ævar Arnfjörð Bjarmason | 2011-12-05 | 12 | -2/+512 |
* | | | | | | | | | | | Merge branch 'jc/checkout-m-twoway' | Junio C Hamano | 2011-12-19 | 1 | -0/+47 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | Test 'checkout -m -- path' | Pete Harlan | 2011-12-11 | 1 | -0/+47 |
* | | | | | | | | | | | Merge branch 'jk/maint-push-over-dav' | Junio C Hamano | 2011-12-19 | 2 | -0/+37 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | http-push: enable "proactive auth"jk/maint-push-over-dav | Jeff King | 2011-12-13 | 1 | -1/+1 |
| * | | | | | | | | | | | t5540: test DAV push with authentication | Jeff King | 2011-12-13 | 2 | -0/+37 |
| | |_|_|_|/ / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'jk/fetch-no-tail-match-refs' | Junio C Hamano | 2011-12-19 | 2 | -3/+32 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | fetch-pack: match refs exactly | Jeff King | 2011-12-13 | 1 | -0/+29 |
| * | | | | | | | | | | | t5500: give fully-qualified refs to fetch-pack | Jeff King | 2011-12-13 | 1 | -3/+3 |
| |/ / / / / / / / / / | |||||
* | | | | | | | | | | | Merge branch 'jn/maint-sequencer-fixes' | Junio C Hamano | 2011-12-19 | 2 | -58/+156 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |||||
| * | | | | | | | | | | Revert "reset: Make reset remove the sequencer state" | Jonathan Nieder | 2011-12-12 | 2 | -53/+1 |
| * | | | | | | | | | | revert: do not remove state until sequence is finished | Jonathan Nieder | 2011-12-12 | 1 | -3/+3 |
| * | | | | | | | | | | revert: allow single-pick in the middle of cherry-pick sequence | Jonathan Nieder | 2011-12-12 | 1 | -0/+12 |
| * | | | | | | | | | | revert: pass around rev-list args in already-parsed form | Jonathan Nieder | 2011-12-12 | 1 | -0/+5 |
| * | | | | | | | | | | revert: allow cherry-pick --continue to commit before resuming | Jonathan Nieder | 2011-12-12 | 1 | -3/+136 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'rr/test-chaining' | Junio C Hamano | 2011-12-19 | 15 | -199/+123 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | t3401: use test_commit in setuprr/test-chaining | Martin von Zweigbergk | 2011-12-11 | 1 | -25/+10 |
| * | | | | | | | | | | t3401: modernize style | Martin von Zweigbergk | 2011-12-11 | 1 | -34/+33 |
| * | | | | | | | | | | t3040 (subprojects-basic): fix '&&' chaining, modernize style | Ramkumar Ramachandra | 2011-12-09 | 1 | -72/+72 |
| * | | | | | | | | | | t1510 (worktree): fix '&&' chaining | Ramkumar Ramachandra | 2011-12-09 | 1 | -3/+3 |
| * | | | | | | | | | | t3030 (merge-recursive): use test_expect_code | Ramkumar Ramachandra | 2011-12-09 | 1 | -66/+6 |
| * | | | | | | | | | | test: fix '&&' chaining | Ramkumar Ramachandra | 2011-12-08 | 10 | -17/+17 |