Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jc/t1512-fix' | Junio C Hamano | 2013-07-11 | 1 | -10/+22 |
|\ | |||||
| * | t1512: correct leftover constants from earlier edition | Junio C Hamano | 2013-07-01 | 1 | -10/+22 |
* | | Merge branch 'tr/test-v-and-v-subtest-only' | Junio C Hamano | 2013-07-11 | 1 | -1/+2 |
|\ \ | |||||
| * | | t0000: do not use export X=Ytr/test-v-and-v-subtest-only | Torsten Bögershausen | 2013-07-08 | 1 | -1/+2 |
* | | | Merge branch 'af/rebase-i-merge-options' | Junio C Hamano | 2013-07-11 | 1 | -0/+11 |
|\ \ \ | |||||
| * | | | Do not ignore merge options in interactive rebaseaf/rebase-i-merge-options | Arnaud Fontaine | 2013-07-02 | 1 | -0/+11 |
* | | | | Merge branch 'pb/stash-refuse-to-kill' | Junio C Hamano | 2013-07-11 | 2 | -3/+38 |
|\ \ \ \ | |||||
| * | | | | git stash: avoid data loss when "git stash save" kills a directory | Petr Baudis | 2013-07-01 | 1 | -0/+18 |
| * | | | | treat_directory(): do not declare submodules to be untracked | Junio C Hamano | 2013-07-01 | 1 | -3/+20 |
* | | | | | Merge branch 'jc/maint-diff-core-safecrlf' | Junio C Hamano | 2013-07-11 | 1 | -0/+8 |
|\ \ \ \ \ | |||||
| * | | | | | diff: demote core.safecrlf=true to core.safecrlf=warn | Junio C Hamano | 2013-06-25 | 1 | -0/+8 |
* | | | | | | Merge branch 'jg/status-config' | Junio C Hamano | 2013-07-11 | 1 | -0/+62 |
|\ \ \ \ \ \ | |||||
| * | | | | | | status/commit: make sure --porcelain is not affected by user-facing config | Junio C Hamano | 2013-06-24 | 1 | -0/+5 |
| * | | | | | | status: introduce status.branch to enable --branch by default | Jorge Juan Garcia Garcia | 2013-06-24 | 1 | -0/+27 |
| * | | | | | | status: introduce status.short to enable --short by default | Jorge Juan Garcia Garcia | 2013-06-24 | 1 | -0/+30 |
* | | | | | | | Merge branch 'jk/bash-completion' | Junio C Hamano | 2013-07-11 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | completion: learn about --man-path | John Keeping | 2013-06-30 | 1 | -0/+1 |
* | | | | | | | | Merge branch 'rr/rebase-checkout-reflog' | Junio C Hamano | 2013-07-11 | 2 | -21/+60 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | checkout: respect GIT_REFLOG_ACTION | Ramkumar Ramachandra | 2013-06-17 | 1 | -4/+4 |
| * | | | | | | | | status: do not depend on rebase reflog messages | Ramkumar Ramachandra | 2013-06-17 | 1 | -20/+17 |
| * | | | | | | | | t/t2021-checkout-last: "checkout -" should work after a rebase finishes | Ramkumar Ramachandra | 2013-06-17 | 1 | -0/+34 |
| * | | | | | | | | t7512: test "detached from" as well | Junio C Hamano | 2013-06-17 | 1 | -1/+9 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'jc/triangle-push-fixup' | Junio C Hamano | 2013-07-11 | 1 | -4/+61 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | t/t5528-push-default: test pushdefault workflows | Ramkumar Ramachandra | 2013-06-24 | 1 | -0/+57 |
| * | | | | | | | | t/t5528-push-default: generalize test_push_* | Ramkumar Ramachandra | 2013-06-24 | 1 | -2/+4 |
| * | | | | | | | | t/t5528-push-default: remove redundant test_config lines | Ramkumar Ramachandra | 2013-06-19 | 1 | -2/+0 |
* | | | | | | | | | Merge branch 'tr/test-v-and-v-subtest-only' | Junio C Hamano | 2013-07-05 | 6 | -53/+276 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
| * | | | | | | | | perf-lib: fix start/stop of perf tests | Thomas Gummerer | 2013-06-29 | 1 | -1/+2 |
| * | | | | | | | | test-lib: support running tests under valgrind in parallel | Thomas Rast | 2013-06-23 | 1 | -22/+84 |
| * | | | | | | | | test-lib: allow prefixing a custom string before "ok N" etc. | Thomas Rast | 2013-06-23 | 1 | -12/+15 |
| * | | | | | | | | test-lib: valgrind for only tests matching a pattern | Thomas Rast | 2013-06-23 | 3 | -1/+43 |
| * | | | | | | | | test-lib: verbose mode for only tests matching a pattern | Thomas Rast | 2013-06-23 | 3 | -0/+60 |
| * | | | | | | | | test-lib: self-test that --verbose works | Thomas Rast | 2013-06-23 | 2 | -1/+38 |
| * | | | | | | | | test-lib: rearrange start/end of test_expect_* and test_skip | Thomas Rast | 2013-06-18 | 2 | -3/+12 |
| * | | | | | | | | test-lib: refactor $GIT_SKIP_TESTS matching | Thomas Rast | 2013-06-18 | 1 | -17/+24 |
| * | | | | | | | | test-lib: enable MALLOC_* for the actual tests | Thomas Rast | 2013-06-17 | 1 | -0/+2 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2013-07-01 | 2 | -3/+5 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | t7500: fix flipped actual/expect | Andrew Pimlott | 2013-07-01 | 1 | -3/+3 |
| * | | | | | | | | lib-rebase: document exec_ in FAKE_LINES | Andrew Pimlott | 2013-07-01 | 1 | -0/+2 |
* | | | | | | | | | Merge branch 'rr/remote-branch-config-refresh' | Junio C Hamano | 2013-07-01 | 1 | -377/+471 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | t/t5505-remote: test multiple push/pull in remotes-file | Ramkumar Ramachandra | 2013-06-23 | 1 | -2/+14 |
| * | | | | | | | | | t/t5505-remote: test url-with-# in branches-file | Ramkumar Ramachandra | 2013-06-23 | 1 | -4/+18 |
| * | | | | | | | | | t/t5505-remote: use test_path_is_missing | Ramkumar Ramachandra | 2013-06-23 | 1 | -2/+2 |
| * | | | | | | | | | t/t5505-remote: test push-refspec in branches-file | Ramkumar Ramachandra | 2013-06-23 | 1 | -1/+2 |
| * | | | | | | | | | t/t5505-remote: modernize style | Ramkumar Ramachandra | 2013-06-23 | 1 | -373/+440 |
* | | | | | | | | | | Merge branch 'ed/color-prompt' | Junio C Hamano | 2013-07-01 | 1 | -0/+141 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | git-prompt.sh: do not print duplicate clean color code | Eduardo R. D'Avila | 2013-06-26 | 1 | -4/+4 |
| * | | | | | | | | | | t9903: remove redundant tests | Eduardo R. D'Avila | 2013-06-26 | 1 | -114/+1 |
| * | | | | | | | | | | t9903: add tests for git-prompt pcmode | Eduardo R. D'Avila | 2013-06-26 | 1 | -0/+254 |
* | | | | | | | | | | | Merge branch 'ap/rebase-multiple-fixups' | Junio C Hamano | 2013-07-01 | 2 | -38/+107 |
|\ \ \ \ \ \ \ \ \ \ \ |