summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | Merge branch 'jg/status-config'Junio C Hamano2013-07-114-19/+135
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | status/commit: make sure --porcelain is not affected by user-facing configJunio C Hamano2013-06-243-22/+61
| * | | | | | | | | | | | | | | commit: make it work with status.shortRamkumar Ramachandra2013-06-241-0/+1
| * | | | | | | | | | | | | | | status: introduce status.branch to enable --branch by defaultJorge Juan Garcia Garcia2013-06-243-0/+35
| * | | | | | | | | | | | | | | status: introduce status.short to enable --short by defaultJorge Juan Garcia Garcia2013-06-243-0/+41
| | |_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'jk/bash-completion'Junio C Hamano2013-07-112-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | completion: learn about --man-pathJohn Keeping2013-06-302-0/+2
| * | | | | | | | | | | | | | | completion: handle unstuck form of base git optionsJohn Keeping2013-06-301-1/+2
* | | | | | | | | | | | | | | | Merge branch 'rr/rebase-checkout-reflog'Junio C Hamano2013-07-114-27/+72
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | checkout: respect GIT_REFLOG_ACTIONRamkumar Ramachandra2013-06-172-7/+12
| * | | | | | | | | | | | | | | | status: do not depend on rebase reflog messagesRamkumar Ramachandra2013-06-172-21/+21
| * | | | | | | | | | | | | | | | t/t2021-checkout-last: "checkout -" should work after a rebase finishesRamkumar Ramachandra2013-06-171-0/+34
| * | | | | | | | | | | | | | | | wt-status: remove unused field in grab_1st_switch_cbdataRamkumar Ramachandra2013-06-171-2/+0
| * | | | | | | | | | | | | | | | t7512: test "detached from" as wellJunio C Hamano2013-06-171-1/+9
| | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'jc/triangle-push-fixup'Junio C Hamano2013-07-113-46/+142
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | t/t5528-push-default: test pushdefault workflowsRamkumar Ramachandra2013-06-241-0/+57
| * | | | | | | | | | | | | | | | t/t5528-push-default: generalize test_push_*Ramkumar Ramachandra2013-06-241-2/+4
| * | | | | | | | | | | | | | | | push: change `simple` to accommodate triangular workflowsRamkumar Ramachandra2013-06-242-15/+38
| * | | | | | | | | | | | | | | | config doc: rewrite push.default sectionRamkumar Ramachandra2013-06-231-28/+44
| * | | | | | | | | | | | | | | | t/t5528-push-default: remove redundant test_config linesRamkumar Ramachandra2013-06-191-2/+0
* | | | | | | | | | | | | | | | | Merge branch 'mh/maint-lockfile-overflow'Junio C Hamano2013-07-111-4/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | lockfile: fix buffer overflow in path handlingMichael Haggerty2013-07-071-4/+6
* | | | | | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2013-07-052-19/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | fixup-builtins: retire an old transition helper scriptRamkumar Ramachandra2013-07-032-19/+0
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'tr/test-v-and-v-subtest-only'Junio C Hamano2013-07-056-53/+276
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | perf-lib: fix start/stop of perf testsThomas Gummerer2013-06-291-1/+2
| * | | | | | | | | | | | | | | | test-lib: support running tests under valgrind in parallelThomas Rast2013-06-231-22/+84
| * | | | | | | | | | | | | | | | test-lib: allow prefixing a custom string before "ok N" etc.Thomas Rast2013-06-231-12/+15
| * | | | | | | | | | | | | | | | test-lib: valgrind for only tests matching a patternThomas Rast2013-06-233-1/+43
| * | | | | | | | | | | | | | | | test-lib: verbose mode for only tests matching a patternThomas Rast2013-06-233-0/+60
| * | | | | | | | | | | | | | | | test-lib: self-test that --verbose worksThomas Rast2013-06-232-1/+38
| * | | | | | | | | | | | | | | | test-lib: rearrange start/end of test_expect_* and test_skipThomas Rast2013-06-182-3/+12
| * | | | | | | | | | | | | | | | test-lib: refactor $GIT_SKIP_TESTS matchingThomas Rast2013-06-181-17/+24
| * | | | | | | | | | | | | | | | test-lib: enable MALLOC_* for the actual testsThomas Rast2013-06-171-0/+2
| | |_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2013-07-032-1/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Update draft release notes to 1.8.3.3Junio C Hamano2013-07-031-0/+15
| * | | | | | | | | | | | | | | Merge branch 'rr/diffcore-pickaxe-doc' into maintJunio C Hamano2013-07-033-28/+59
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'cr/git-work-tree-sans-git-dir' into maintJunio C Hamano2013-07-031-3/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'fc/do-not-use-the-index-in-add-to-index' into maintJunio C Hamano2013-07-031-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dm/unbash-subtree' into maintJunio C Hamano2013-07-031-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/core-checkstat' into maintJunio C Hamano2013-07-031-1/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/t5551-posix-sed-bre' into maintJunio C Hamano2013-07-031-2/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'vv/help-unknown-ref' into maintJunio C Hamano2013-07-033-1/+57
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/empty-archive' into maintJunio C Hamano2013-07-032-0/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rh/merge-options-doc-fix' into maintJunio C Hamano2013-07-031-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'an/diff-index-doc' into maintJunio C Hamano2013-07-031-6/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'cm/gitweb-project-list-persistent-cgi-fix' into maintJunio C Hamano2013-07-031-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ar/wildmatch-foldcase' into maintJunio C Hamano2013-07-032-6/+56
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'cb/log-follow-with-combined' into maintJunio C Hamano2013-07-032-0/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rr/die-on-missing-upstream' into maintJunio C Hamano2013-07-032-17/+22
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status