Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'sg/gpg-sig' | Junio C Hamano | 2013-04-05 | 5 | -0/+61 |
|\ | |||||
| * | merge/pull Check for untrusted good GPG signatures | Sebastian Götte | 2013-03-31 | 5 | -0/+9 |
| * | merge/pull: verify GPG signatures of commits being merged | Sebastian Götte | 2013-03-31 | 1 | -0/+52 |
* | | Merge branch 'jl/submodule-deinit' | Junio C Hamano | 2013-04-05 | 1 | -5/+16 |
|\ \ | |||||
| * | | submodule deinit: clarify work tree removal message | Jens Lehmann | 2013-04-01 | 1 | -5/+16 |
* | | | Merge branch 'jc/merge-tag-object' | Junio C Hamano | 2013-04-05 | 1 | -32/+68 |
|\ \ \ | |||||
| * | | | t6200: test message for merging of an annotated tag | Junio C Hamano | 2013-04-01 | 1 | -0/+39 |
| * | | | t6200: use test_config/test_unconfig | Junio C Hamano | 2013-04-01 | 1 | -32/+29 |
* | | | | Merge branch 'jc/t5516-pushInsteadOf-vs-pushURL' | Junio C Hamano | 2013-04-03 | 1 | -3/+3 |
|\ \ \ \ | |||||
| * | | | | t5516: test interaction between pushURL and pushInsteadOf correctly | Junio C Hamano | 2013-03-28 | 1 | -3/+3 |
| * | | | | Merge branch 'we/submodule-update-prefix-output' into maint | Junio C Hamano | 2013-03-26 | 1 | -1/+2 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'rs/zip-compresssed-size-with-export-subst' into maint | Junio C Hamano | 2013-03-26 | 1 | -0/+6 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'nd/branch-error-cases' into maint | Junio C Hamano | 2013-03-26 | 1 | -0/+21 |
| |\ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ | Merge branch 'tr/valgrind' | Junio C Hamano | 2013-04-03 | 4 | -17/+44 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | tests: notice valgrind error in test_must_fail | Thomas Rast | 2013-04-01 | 1 | -0/+3 |
| * | | | | | | | | tests --valgrind: provide a mode without --track-origins | Thomas Rast | 2013-04-01 | 2 | -0/+7 |
| * | | | | | | | | tests: parameterize --valgrind option | Thomas Rast | 2013-04-01 | 3 | -16/+34 |
| * | | | | | | | | t/README: --valgrind already implies -v | Thomas Rast | 2013-04-01 | 1 | -2/+1 |
* | | | | | | | | | Merge branch 'jm/branch-rename-nothing-error' | Junio C Hamano | 2013-04-03 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | branch: give better message when no names specified for rename | Jonathon Mah | 2013-03-31 | 1 | -1/+1 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'jk/check-corrupt-objects-carefully' | Junio C Hamano | 2013-04-03 | 2 | -7/+105 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | clone: leave repo in place after checkout errors | Jeff King | 2013-03-29 | 1 | -0/+4 |
| * | | | | | | | | | clone: run check_everything_connected | Jeff King | 2013-03-27 | 2 | -8/+2 |
| * | | | | | | | | | clone: die on errors from unpack_trees | Jeff King | 2013-03-27 | 2 | -2/+2 |
| * | | | | | | | | | add tests for cloning corrupted repositories | Jeff King | 2013-03-27 | 1 | -0/+41 |
| * | | | | | | | | | streaming_write_entry: propagate streaming errors | Jeff King | 2013-03-27 | 1 | -0/+25 |
| * | | | | | | | | | add test for streaming corrupt blobs | Jeff King | 2013-03-27 | 1 | -0/+34 |
* | | | | | | | | | | Merge branch 'jc/apply-ws-fix-tab-in-indent' | Junio C Hamano | 2013-04-03 | 3 | -1/+31 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | test: resurrect q_to_tab | Junio C Hamano | 2013-03-29 | 1 | -0/+4 |
| * | | | | | | | | | | apply --whitespace=fix: avoid running over the postimage buffer | Junio C Hamano | 2013-03-22 | 3 | -3/+29 |
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'jk/difftool-no-overwrite-on-copyback' | Junio C Hamano | 2013-04-03 | 1 | -37/+68 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | t7800: run --dir-diff tests with and without symlinks | John Keeping | 2013-03-29 | 1 | -8/+19 |
| * | | | | | | | | | | t7800: fix tests when difftool uses --no-symlinks | John Keeping | 2013-03-29 | 1 | -1/+1 |
| * | | | | | | | | | | t7800: don't hide grep output | John Keeping | 2013-03-29 | 1 | -27/+17 |
| * | | | | | | | | | | difftool: don't overwrite modified files | John Keeping | 2013-03-29 | 1 | -0/+30 |
| * | | | | | | | | | | t7800: move '--symlinks' specific test to the end | John Keeping | 2013-03-29 | 1 | -15/+15 |
| | |_|/ / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'jc/directory-attrs-regression-fix' | Junio C Hamano | 2013-04-03 | 1 | -0/+27 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | t: check that a pattern without trailing slash matches a directory | Jeff King | 2013-03-28 | 1 | -0/+27 |
* | | | | | | | | | | | Merge branch 'nd/checkout-paths-reduce-match-pathspec-calls' | Junio C Hamano | 2013-04-03 | 1 | -0/+22 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | checkout: avoid unnecessary match_pathspec calls | Nguyễn Thái Ngọc Duy | 2013-03-27 | 1 | -0/+22 |
* | | | | | | | | | | | | Merge branch 'jk/config-with-empty-section' | Junio C Hamano | 2013-04-02 | 1 | -0/+35 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | t1300: document some aesthetic failures of the config editor | Jeff King | 2013-03-29 | 1 | -0/+35 |
| | |_|/ / / / / / / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'jn/push-tests' | Junio C Hamano | 2013-04-01 | 1 | -91/+65 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | push test: rely on &&-chaining instead of 'if bad; then echo Oops; fi' | Jonathan Nieder | 2013-03-19 | 1 | -11/+4 |
| * | | | | | | | | | | | | push test: simplify check of push result | Jonathan Nieder | 2013-03-19 | 1 | -63/+51 |
| * | | | | | | | | | | | | push test: use test_config when appropriate | Jonathan Nieder | 2013-03-19 | 1 | -17/+10 |
* | | | | | | | | | | | | | Merge branch 'nd/branch-show-rebase-bisect-state' | Junio C Hamano | 2013-04-01 | 4 | -26/+42 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | status, branch: fix the misleading "bisecting" message | Nguyễn Thái Ngọc Duy | 2013-03-23 | 2 | -2/+2 |
| * | | | | | | | | | | | | | branch: show more information when HEAD is detached | Nguyễn Thái Ngọc Duy | 2013-03-16 | 2 | -4/+4 |
| * | | | | | | | | | | | | | status: show more info than "currently not on any branch" | Nguyễn Thái Ngọc Duy | 2013-03-16 | 2 | -21/+37 |