Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | t5531: further "matching" fixupsjk/t5531-prepare-to-default-to-non-matching | Jeff King | 2014-01-13 | 1 | -0/+1 | |
* | | | | | | | | | | | | Merge branch 'sb/diff-orderfile-config' | Junio C Hamano | 2014-01-13 | 1 | -4/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | diff test: reading a directory as a file need not error outsb/diff-orderfile-config | Jonathan Nieder | 2014-01-10 | 1 | -4/+0 | |
* | | | | | | | | | | | | | Merge branch 'jl/submodule-mv-checkout-caveat' | Junio C Hamano | 2014-01-13 | 2 | -0/+37 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | rm: better document side effects when removing a submodulejl/submodule-mv-checkout-caveat | Jens Lehmann | 2014-01-07 | 1 | -0/+16 | |
| * | | | | | | | | | | | | | mv: better document side effects when moving a submodule | Jens Lehmann | 2014-01-07 | 1 | -0/+21 | |
* | | | | | | | | | | | | | | Merge branch 'jk/pull-rebase-using-fork-point' | Junio C Hamano | 2014-01-13 | 1 | -2/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | rebase: fix fork-point with zero arguments | John Keeping | 2014-01-09 | 1 | -2/+10 | |
* | | | | | | | | | | | | | | | Merge branch 'ow/stash-with-ifs' | Junio C Hamano | 2014-01-13 | 1 | -0/+12 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | stash: handle specifying stashes with $IFSow/stash-with-ifs | Øystein Walle | 2014-01-07 | 1 | -0/+12 | |
| | |_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge branch 'jn/pager-lv-default-env' | Junio C Hamano | 2014-01-13 | 1 | -0/+12 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | pager: set LV=-c alongside LESS=FRSX | Jonathan Nieder | 2014-01-07 | 1 | -0/+12 | |
| |/ / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | Merge branch 'js/lift-parent-count-limit' | Junio C Hamano | 2014-01-10 | 2 | -1/+36 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Remove the line length limit for graft filesjs/lift-parent-count-limit | Johannes Schindelin | 2013-12-27 | 2 | -1/+36 | |
| |/ / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | Merge branch 'jk/test-framework-updates' | Junio C Hamano | 2014-01-10 | 2 | -14/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | t0000: drop "known breakage" testjk/test-framework-updates | Jeff King | 2014-01-02 | 1 | -3/+0 | |
| * | | | | | | | | | | | | | | t0000: simplify HARNESS_ACTIVE hack | Jeff King | 2014-01-02 | 2 | -11/+5 | |
| * | | | | | | | | | | | | | | t0000: set TEST_OUTPUT_DIRECTORY for sub-tests | Jeff King | 2014-01-02 | 1 | -0/+2 | |
| |/ / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | Merge branch 'jk/two-way-merge-corner-case-fix' into maint | Junio C Hamano | 2013-12-17 | 2 | -89/+104 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sb/sha1-loose-object-info-check-existence' into maint | Junio C Hamano | 2013-12-17 | 1 | -0/+6 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/magic-pathspec' into maint | Junio C Hamano | 2013-12-17 | 1 | -0/+6 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'bm/merge-base-octopus-dedup' | Junio C Hamano | 2014-01-10 | 1 | -0/+39 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | merge-base --octopus: reduce the result from get_octopus_merge_bases()bm/merge-base-octopus-dedup | Junio C Hamano | 2013-12-30 | 1 | -0/+39 | |
| | |_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | Merge branch 'jk/http-auth-tests-robustify' | Junio C Hamano | 2014-01-10 | 6 | -17/+26 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | use distinct username/password for http auth testsjk/http-auth-tests-robustify | Jeff King | 2014-01-02 | 6 | -17/+26 | |
| | |_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | Merge branch 'jk/oi-delta-base' | Junio C Hamano | 2014-01-10 | 1 | -0/+34 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | cat-file: provide %(deltabase) batch formatjk/oi-delta-base | Jeff King | 2013-12-26 | 1 | -0/+34 | |
* | | | | | | | | | | | | | | | | | | Merge branch 'nd/add-empty-fix' | Junio C Hamano | 2014-01-10 | 1 | -0/+19 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | add: don't complain when adding empty project rootnd/add-empty-fix | Nguyễn Thái Ngọc Duy | 2013-12-26 | 1 | -0/+19 | |
| | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | Merge branch 'tm/fetch-prune' | Junio C Hamano | 2014-01-10 | 1 | -0/+26 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | fetch --prune: Run prune before fetchingtm/fetch-prune | Tom Miller | 2014-01-03 | 1 | -0/+14 | |
| * | | | | | | | | | | | | | | | | | | fetch --prune: always print header url | Tom Miller | 2014-01-03 | 1 | -0/+12 | |
| | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | Merge branch 'sb/diff-orderfile-config' | Junio C Hamano | 2014-01-10 | 1 | -0/+104 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | diff: add diff.orderfile configuration variable | Samuel Bronson | 2013-12-18 | 1 | -0/+10 | |
| * | | | | | | | | | | | | | | | | | diff: let "git diff -O" read orderfile from any file and fail properly | Samuel Bronson | 2013-12-18 | 1 | -0/+26 | |
| * | | | | | | | | | | | | | | | | | t4056: add new tests for "git diff -O" | Samuel Bronson | 2013-12-18 | 1 | -0/+68 | |
* | | | | | | | | | | | | | | | | | | Merge branch 'bc/log-decoration' | Junio C Hamano | 2014-01-10 | 1 | -0/+15 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | log: properly handle decorations with chained tagsbc/log-decoration | brian m. carlson | 2013-12-20 | 1 | -0/+15 | |
| | |_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | Merge branch 'cc/replace-object-info' | Junio C Hamano | 2014-01-10 | 1 | -0/+42 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | replace info: rename 'full' to 'long' and clarify in-code symbolscc/replace-object-info | Christian Couder | 2013-12-30 | 1 | -2/+2 | |
| * | | | | | | | | | | | | | | | | | | builtin/replace: unset read_replace_refs | Christian Couder | 2013-12-12 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | t6050: add tests for listing with --format | Christian Couder | 2013-12-12 | 1 | -0/+37 | |
| * | | | | | | | | | | | | | | | | | | sha1_file: perform object replacement in sha1_object_info_extended() | Christian Couder | 2013-12-12 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | t6050: show that git cat-file --batch fails with replace objects | Christian Couder | 2013-12-12 | 1 | -0/+5 | |
| | |_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | Merge branch 'nd/negative-pathspec' | Junio C Hamano | 2014-01-10 | 1 | -0/+184 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | Support pathspec magic :(exclude) and its short form :! | Nguyễn Thái Ngọc Duy | 2013-12-06 | 1 | -0/+184 | |
* | | | | | | | | | | | | | | | | | Merge branch 'jk/name-pack-after-byte-representation' | Junio C Hamano | 2013-12-27 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | pack-objects: name pack files after trailer hash | Jeff King | 2013-12-05 | 1 | -2/+2 | |
* | | | | | | | | | | | | | | | | | | Merge branch 'tg/diff-no-index-refactor' | Junio C Hamano | 2013-12-27 | 2 | -0/+48 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | diff: add test for --no-index executed outside repo | Thomas Gummerer | 2013-12-16 | 1 | -0/+11 |