Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jc/show-sig' | Junio C Hamano | 2012-01-06 | 1 | -0/+80 |
|\ | |||||
| * | commit --amend -S: strip existing gpgsig headers | Junio C Hamano | 2012-01-05 | 1 | -1/+10 |
| * | test "commit -S" and "log --show-signature" | Junio C Hamano | 2011-11-12 | 1 | -0/+71 |
* | | Merge branch 'jm/stash-diff-disambiguate' | Junio C Hamano | 2012-01-06 | 3 | -28/+76 |
|\ \ | |||||
| * | | 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 'jh/fetch-head-update' | Junio C Hamano | 2012-01-06 | 23 | -27/+27 |
|\ \ \ | |||||
| * | | | write first for-merge ref to FETCH_HEAD firstjh/fetch-head-update | Joey Hess | 2012-01-03 | 23 | -27/+27 |
| |/ / | |||||
* | | | Merge branch 'pw/p4-view-updates' | Junio C Hamano | 2012-01-06 | 1 | -0/+290 |
|\ \ \ | |||||
| * | | | git-p4: rewrite view handling | Pete Wyckoff | 2012-01-03 | 1 | -12/+12 |
| * | | | git-p4: support single file p4 client view maps | Gary Gibbons | 2012-01-03 | 1 | -1/+1 |
| * | | | git-p4: sort client views by reverse View number | Gary Gibbons | 2012-01-03 | 1 | -1/+1 |
| * | | | git-p4: fix test for unsupported P4 Client Views | Gary Gibbons | 2012-01-03 | 1 | -2/+2 |
| * | | | git-p4: test client view handling | Pete Wyckoff | 2012-01-03 | 1 | -0/+290 |
* | | | | Merge branch 'maint' | Junio C Hamano | 2012-01-04 | 1 | -2/+1 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | t5550: repack everything into one file | Clemens Buchacher | 2012-01-04 | 1 | -2/+1 |
* | | | | Merge branch 'pw/p4-docs-and-tests' | Junio C Hamano | 2012-01-03 | 7 | -38/+322 |
|\ \ \ \ | |||||
| * | | | | git-p4: document and test submit optionspw/p4-docs-and-tests | Pete Wyckoff | 2011-12-27 | 1 | -0/+54 |
| * | | | | git-p4: test and document --use-client-spec | Pete Wyckoff | 2011-12-27 | 1 | -0/+46 |
| * | | | | git-p4: test --keep-path | Pete Wyckoff | 2011-12-27 | 1 | -0/+24 |
| * | | | | git-p4: test --max-changes | Pete Wyckoff | 2011-12-27 | 1 | -0/+10 |
| * | | | | git-p4: document and test --import-local | Pete Wyckoff | 2011-12-27 | 1 | -0/+22 |
| * | | | | git-p4: honor --changesfile option and test | Pete Wyckoff | 2011-12-27 | 1 | -0/+23 |
| * | | | | git-p4: document and test clone --branch | Pete Wyckoff | 2011-12-27 | 1 | -0/+11 |
| * | | | | git-p4: test cloning with two dirs, clarify doc | Pete Wyckoff | 2011-12-27 | 1 | -0/+60 |
| * | | | | git-p4: clone does not use --git-dir | Pete Wyckoff | 2011-12-27 | 1 | -0/+34 |
| * | | | | rename git-p4 tests | Pete Wyckoff | 2011-12-27 | 5 | -0/+0 |
* | | | | | Merge branch 'maint' | Junio C Hamano | 2012-01-03 | 1 | -0/+6 |
|\ \ \ \ \ | | |/ / / | |/| / / | |_|/ / |/| | | | |||||
| * | | | fix hang in git fetch if pointed at a 0 length bundle | Brian Harring | 2012-01-03 | 1 | -0/+6 |
| * | | | Merge branch 'jc/checkout-m-twoway' into maint | Junio C Hamano | 2011-12-28 | 1 | -0/+49 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'jk/http-push-to-empty' into maint | Junio C Hamano | 2011-12-28 | 1 | -0/+32 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'jn/maint-sequencer-fixes' into maint | Junio C Hamano | 2011-12-28 | 2 | -58/+156 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'jk/maint-push-over-dav' into maint | Junio C Hamano | 2011-12-28 | 2 | -0/+37 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'jk/fetch-no-tail-match-refs' into maint | Junio C Hamano | 2011-12-28 | 2 | -3/+32 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'jh/fast-import-notes' into maint | Junio C Hamano | 2011-12-28 | 1 | -5/+58 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'jn/branch-move-to-self' into maint | Junio C Hamano | 2011-12-28 | 2 | -4/+21 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'bc/maint-apply-check-no-patch' into maint | Junio C Hamano | 2011-12-21 | 2 | -1/+20 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/maint-upload-archive' into maint | Junio C Hamano | 2011-12-21 | 1 | -0/+8 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ | 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 |
| |/ / / / / / / / / / / / / / |