Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'tr/config-multivalue-lift-max' | Junio C Hamano | 2013-12-12 | 1 | -0/+64 |
|\ | |||||
| * | config: arbitrary number of matches for --unset and --replace-alltr/config-multivalue-lift-max | Thomas Rast | 2013-12-06 | 1 | -0/+64 |
* | | Merge branch 'mh/fetch-tags-in-addition-to-normal-refs' | Junio C Hamano | 2013-12-12 | 5 | -13/+148 |
|\ \ | |||||
| * | | fetch: improve the error messages emitted for conflicting refspecsmh/fetch-tags-in-addition-to-normal-refs | Michael Haggerty | 2013-10-30 | 1 | -5/+9 |
| * | | t5536: new test of refspec conflicts when fetching | Michael Haggerty | 2013-10-30 | 1 | -0/+96 |
| * | | fetch --prune: prune only based on explicit refspecs | Michael Haggerty | 2013-10-30 | 1 | -5/+5 |
| * | | fetch --tags: fetch tags *in addition to* other stuff | Michael Haggerty | 2013-10-30 | 4 | -8/+39 |
| * | | t5510: check that "git fetch --prune --tags" does not prune branches | Michael Haggerty | 2013-10-24 | 1 | -0/+4 |
| * | | t5510: prepare test refs more straightforwardly | Michael Haggerty | 2013-10-24 | 1 | -4/+4 |
| * | | t5510: use the correct tag name in test | Michael Haggerty | 2013-10-24 | 1 | -1/+1 |
* | | | Merge branch 'jk/remove-experimental-loose-object-support' | Junio C Hamano | 2013-12-06 | 18 | -69/+0 |
|\ \ \ | |||||
| * | | | drop support for "experimental" loose objectsjk/remove-experimental-loose-object-support | Jeff King | 2013-11-21 | 18 | -69/+0 |
| | |/ | |/| | |||||
* | | | Merge branch 'nd/magic-pathspec' | Junio C Hamano | 2013-12-06 | 1 | -0/+6 |
|\ \ \ | |||||
| * | | | diff: restrict pathspec limitations to diff b/f case onlynd/magic-pathspec | Nguyễn Thái Ngọc Duy | 2013-11-20 | 1 | -0/+6 |
* | | | | Merge branch 'rr/for-each-ref-decoration' | Junio C Hamano | 2013-12-06 | 1 | -13/+56 |
|\ \ \ \ | |||||
| * | | | | for-each-ref: avoid color leakagerr/for-each-ref-decoration | Ramkumar Ramachandra | 2013-11-19 | 1 | -1/+1 |
| * | | | | for-each-ref: introduce %(color:...) for color | Ramkumar Ramachandra | 2013-11-19 | 1 | -0/+17 |
| * | | | | for-each-ref: introduce %(upstream:track[short]) | Ramkumar Ramachandra | 2013-11-19 | 1 | -0/+27 |
| * | | | | for-each-ref: introduce %(HEAD) asterisk marker | Ramkumar Ramachandra | 2013-11-18 | 1 | -0/+2 |
| * | | | | t6300 (for-each-ref): don't hardcode SHA-1 hexes | Ramkumar Ramachandra | 2013-11-18 | 1 | -8/+8 |
| * | | | | t6300 (for-each-ref): clearly demarcate setup | Ramkumar Ramachandra | 2013-11-18 | 1 | -5/+2 |
* | | | | | Merge branch 'rh/remote-hg-bzr-updates' | Junio C Hamano | 2013-12-06 | 1 | -0/+4 |
|\ \ \ \ \ | |||||
| * | | | | | test-lib.sh: convert $TEST_DIRECTORY to an absolute path | Felipe Contreras | 2013-11-18 | 1 | -0/+4 |
* | | | | | | Merge branch 'jl/submodule-update-retire-orig-flags' | Junio C Hamano | 2013-12-05 | 1 | -0/+11 |
|\ \ \ \ \ \ | |||||
| * | | | | | | submodule update: remove unnecessary orig_flags variablejl/submodule-update-retire-orig-flags | Jens Lehmann | 2013-11-11 | 1 | -0/+11 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'sb/sha1-loose-object-info-check-existence' | Junio C Hamano | 2013-12-05 | 1 | -0/+6 |
|\ \ \ \ \ \ | |||||
| * | | | | | | sha1_loose_object_info(): do not return success on missing objectsb/sha1-loose-object-info-check-existence | Junio C Hamano | 2013-11-06 | 1 | -0/+6 |
* | | | | | | | Merge branch 'jk/two-way-merge-corner-case-fix' | Junio C Hamano | 2013-12-05 | 2 | -89/+104 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | t1005: add test for "read-tree --reset -u A B"jk/two-way-merge-corner-case-fix | Junio C Hamano | 2013-11-04 | 1 | -0/+15 |
| * | | | | | | | t1005: reindent | Junio C Hamano | 2013-11-04 | 2 | -89/+89 |
* | | | | | | | | Merge branch 'jc/ref-excludes' | Junio C Hamano | 2013-12-05 | 1 | -0/+54 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | rev-parse: introduce --exclude=<glob> to tame wildcardsjc/ref-excludes | Junio C Hamano | 2013-11-01 | 1 | -0/+12 |
| * | | | | | | | | rev-list --exclude: tests | Junio C Hamano | 2013-11-01 | 1 | -0/+42 |
* | | | | | | | | | Merge branch 'nv/parseopt-opt-arg' | Junio C Hamano | 2013-12-05 | 1 | -3/+39 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | rev-parse --parseopt: add the --stuck-long modenv/parseopt-opt-arg | Nicolas Vigier | 2013-10-31 | 1 | -3/+39 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'jc/merge-base-reflog' | Junio C Hamano | 2013-12-05 | 1 | -0/+28 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | merge-base: teach "--fork-point" modejc/merge-base-reflog | Junio C Hamano | 2013-10-29 | 1 | -0/+28 |
* | | | | | | | | | | Merge branch 'ak/submodule-foreach-quoting' | Junio C Hamano | 2013-12-05 | 1 | -0/+9 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | submodule foreach: skip eval for more than one argumentak/submodule-foreach-quoting | Anders Kaseorg | 2013-09-27 | 1 | -0/+9 |
* | | | | | | | | | | | Sync with 1.8.4.5 | Junio C Hamano | 2013-12-02 | 1 | -0/+15 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | submodule: do not copy unknown update mode from .gitmodules | Junio C Hamano | 2013-12-02 | 1 | -0/+15 |
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'jn/test-prereq-perl-doc' into maint | Junio C Hamano | 2013-11-08 | 1 | -4/+11 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/upload-pack-send-symref' into maint | Junio C Hamano | 2013-11-08 | 3 | -12/+17 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/http-auth-redirects' into maint | Junio C Hamano | 2013-11-08 | 3 | -1/+15 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mm/checkout-auto-track-fix' into maint | Junio C Hamano | 2013-11-07 | 2 | -0/+27 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/split-broken-ident' into maint | Junio C Hamano | 2013-11-07 | 1 | -2/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/revision-range-unpeel' into maint | Junio C Hamano | 2013-11-07 | 1 | -0/+8 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | t5570: Update for clone-progress-to-stderr branch | Brian Gernhardt | 2013-10-30 | 1 | -2/+1 |
* | | | | | | | | | | | | | | | | Merge branch 'nd/literal-pathspecs' | Junio C Hamano | 2013-11-18 | 1 | -0/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | pathspec: stop --*-pathspecs impact on internal parse_pathspec() usesnd/literal-pathspecsnd/liteal-pathspecs | Nguyễn Thái Ngọc Duy | 2013-10-28 | 1 | -0/+7 |
| | |_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | |