Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
* | | | | | | | | Merge branch 'kb/name-hash' | Junio C Hamano | 2013-04-01 | 1 | -0/+20 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | name-hash.c: fix endless loop with core.ignorecase=true | Karsten Blees | 2013-02-27 | 1 | -0/+20 |
| | |_|_|_|_|/ / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'jk/pkt-line-cleanup' | Junio C Hamano | 2013-04-01 | 2 | -42/+40 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | do not use GIT_TRACE_PACKET=3 in tests | Jeff King | 2013-03-21 | 2 | -25/+27 |
| * | | | | | | | | upload-pack: remove packet debugging harness | Jeff King | 2013-02-20 | 2 | -26/+22 |
* | | | | | | | | | Merge branch 'bc/append-signed-off-by' | Junio C Hamano | 2013-04-01 | 4 | -4/+497 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | git-commit: populate the edit buffer with 2 blank lines before s-o-b | Brandon Casey | 2013-02-23 | 1 | -0/+12 |
| * | | | | | | | | | Unify appending signoff in format-patch, commit and sequencer | Brandon Casey | 2013-02-12 | 1 | -5/+26 |
| * | | | | | | | | | t4014: more tests about appending s-o-b lines | Nguyễn Thái Ngọc Duy | 2013-02-12 | 1 | -0/+241 |
| * | | | | | | | | | sequencer.c: teach append_signoff how to detect duplicate s-o-b | Brandon Casey | 2013-02-12 | 1 | -1/+1 |
| * | | | | | | | | | sequencer.c: always separate "(cherry picked from" from commit body | Brandon Casey | 2013-02-12 | 1 | -0/+53 |
| * | | | | | | | | | sequencer.c: recognize "(cherry picked from ..." as part of s-o-b footer | Brandon Casey | 2013-02-12 | 1 | -0/+55 |
| * | | | | | | | | | t/t3511: add some tests of 'cherry-pick -s' functionality | Brandon Casey | 2013-02-12 | 1 | -0/+111 |
| * | | | | | | | | | t/test-lib-functions.sh: allow to specify the tag name to test_commit | Brandon Casey | 2013-02-12 | 1 | -4/+4 |
* | | | | | | | | | | Merge branch 'rr/test-3200-style' | Junio C Hamano | 2013-04-01 | 1 | -253/+267 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | t3200 (branch): modernize style | Ramkumar Ramachandra | 2013-03-20 | 1 | -233/+244 |
* | | | | | | | | | | Merge branch 'yd/use-test-config-unconfig' | Junio C Hamano | 2013-03-28 | 11 | -142/+75 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | t5520: use test_config to set/unset git config variables (leftover bits) | Ramkumar Ramachandra | 2013-03-28 | 1 | -3/+3 |
| * | | | | | | | | | | t7600: use test_config to set/unset git config variables | Yann Droneaud | 2013-03-25 | 1 | -34/+26 |
| * | | | | | | | | | | t7502: remove clear_config | Yann Droneaud | 2013-03-25 | 1 | -26/+6 |