Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | | | git stash: avoid data loss when "git stash save" kills a directory | Petr Baudis | 2013-07-01 | 3 | -2/+40 | |
| * | | | | | | | | | | | | | treat_directory(): do not declare submodules to be untracked | Junio C Hamano | 2013-07-01 | 2 | -6/+21 | |
* | | | | | | | | | | | | | | Merge branch 'jc/maint-diff-core-safecrlf' | Junio C Hamano | 2013-07-11 | 2 | -1/+17 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | diff: demote core.safecrlf=true to core.safecrlf=warn | Junio C Hamano | 2013-06-25 | 2 | -1/+17 | |
* | | | | | | | | | | | | | | | Merge branch 'jg/status-config' | Junio C Hamano | 2013-07-11 | 4 | -19/+135 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | status/commit: make sure --porcelain is not affected by user-facing config | Junio C Hamano | 2013-06-24 | 3 | -22/+61 | |
| * | | | | | | | | | | | | | | | commit: make it work with status.short | Ramkumar Ramachandra | 2013-06-24 | 1 | -0/+1 | |
| * | | | | | | | | | | | | | | | status: introduce status.branch to enable --branch by default | Jorge Juan Garcia Garcia | 2013-06-24 | 3 | -0/+35 | |
| * | | | | | | | | | | | | | | | status: introduce status.short to enable --short by default | Jorge Juan Garcia Garcia | 2013-06-24 | 3 | -0/+41 | |
| | |_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge branch 'jk/bash-completion' | Junio C Hamano | 2013-07-11 | 2 | -1/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | completion: learn about --man-path | John Keeping | 2013-06-30 | 2 | -0/+2 | |
| * | | | | | | | | | | | | | | | completion: handle unstuck form of base git options | John Keeping | 2013-06-30 | 1 | -1/+2 | |
* | | | | | | | | | | | | | | | | Merge branch 'rr/rebase-checkout-reflog' | Junio C Hamano | 2013-07-11 | 4 | -27/+72 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | checkout: respect GIT_REFLOG_ACTION | Ramkumar Ramachandra | 2013-06-17 | 2 | -7/+12 | |
| * | | | | | | | | | | | | | | | | status: do not depend on rebase reflog messages | Ramkumar Ramachandra | 2013-06-17 | 2 | -21/+21 | |
| * | | | | | | | | | | | | | | | | t/t2021-checkout-last: "checkout -" should work after a rebase finishes | Ramkumar Ramachandra | 2013-06-17 | 1 | -0/+34 | |
| * | | | | | | | | | | | | | | | | wt-status: remove unused field in grab_1st_switch_cbdata | Ramkumar Ramachandra | 2013-06-17 | 1 | -2/+0 | |
| * | | | | | | | | | | | | | | | | 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 | 3 | -46/+142 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | 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 | |
| * | | | | | | | | | | | | | | | | push: change `simple` to accommodate triangular workflows | Ramkumar Ramachandra | 2013-06-24 | 2 | -15/+38 | |
| * | | | | | | | | | | | | | | | | config doc: rewrite push.default section | Ramkumar Ramachandra | 2013-06-23 | 1 | -28/+44 | |
| * | | | | | | | | | | | | | | | | t/t5528-push-default: remove redundant test_config lines | Ramkumar Ramachandra | 2013-06-19 | 1 | -2/+0 | |
* | | | | | | | | | | | | | | | | | Merge branch 'mh/maint-lockfile-overflow' | Junio C Hamano | 2013-07-11 | 1 | -4/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | lockfile: fix buffer overflow in path handling | Michael Haggerty | 2013-07-07 | 1 | -4/+6 | |
* | | | | | | | | | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2013-07-05 | 2 | -19/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | fixup-builtins: retire an old transition helper script | Ramkumar Ramachandra | 2013-07-03 | 2 | -19/+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-03 | 2 | -1/+16 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Update draft release notes to 1.8.3.3 | Junio C Hamano | 2013-07-03 | 1 | -0/+15 | |
| * | | | | | | | | | | | | | | | Merge branch 'rr/diffcore-pickaxe-doc' into maint | Junio C Hamano | 2013-07-03 | 3 | -28/+59 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'cr/git-work-tree-sans-git-dir' into maint | Junio C Hamano | 2013-07-03 | 1 | -3/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'fc/do-not-use-the-index-in-add-to-index' into maint | Junio C Hamano | 2013-07-03 | 1 | -3/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dm/unbash-subtree' into maint | Junio C Hamano | 2013-07-03 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/core-checkstat' into maint | Junio C Hamano | 2013-07-03 | 1 | -1/+14 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/t5551-posix-sed-bre' into maint | Junio C Hamano | 2013-07-03 | 1 | -2/+6 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'vv/help-unknown-ref' into maint | Junio C Hamano | 2013-07-03 | 3 | -1/+57 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'rs/empty-archive' into maint | Junio C Hamano | 2013-07-03 | 2 | -0/+15 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'rh/merge-options-doc-fix' into maint | Junio C Hamano | 2013-07-03 | 1 | -1/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'an/diff-index-doc' into maint | Junio C Hamano | 2013-07-03 | 1 | -6/+6 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |