Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jk/allow-fetch-onelevel-refname' into maint | Junio C Hamano | 2014-02-13 | 1 | -0/+11 |
|\ | |||||
| * | fetch-pack: do not filter out one-level refsjk/allow-fetch-onelevel-refname | Jeff King | 2014-01-15 | 1 | -0/+11 |
* | | Merge branch 'jk/interpret-branch-name-fix' into maint | Junio C Hamano | 2014-02-13 | 2 | -1/+51 |
|\ \ | |||||
| * | | interpret_branch_name: find all possible @-marksjk/interpret-branch-name-fix | Jeff King | 2014-01-15 | 1 | -0/+21 |
| * | | interpret_branch_name: avoid @{upstream} past colon | Jeff King | 2014-01-15 | 1 | -0/+16 |
| * | | interpret_branch_name: always respect "namelen" parameter | Jeff King | 2014-01-15 | 1 | -1/+14 |
* | | | Merge branch 'as/tree-walk-fix-aggressive-short-cut' into maint | Junio C Hamano | 2014-02-13 | 1 | -0/+13 |
|\ \ \ | |||||
| * | | | tree_entry_interesting: match against all pathspecsas/tree-walk-fix-aggressive-short-cut | Andy Spencer | 2014-01-27 | 1 | -0/+13 |
| | |/ | |/| | |||||
* | | | Merge branch 'ow/stash-with-ifs' into maint | Junio C Hamano | 2014-02-05 | 1 | -0/+12 |
|\ \ \ | |||||
| * | | | stash: handle specifying stashes with $IFSow/stash-with-ifs | Øystein Walle | 2014-01-07 | 1 | -0/+12 |
* | | | | Merge branch 'js/lift-parent-count-limit' into maint | Junio C Hamano | 2014-02-05 | 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 'nd/add-empty-fix' into maint | Junio C Hamano | 2014-02-05 | 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 'bc/log-decoration' into maint | Junio C Hamano | 2014-02-05 | 1 | -0/+15 |
|\ \ \ \ \ | |||||
| * | | | | | log: properly handle decorations with chained tagsbc/log-decoration | brian m. carlson | 2013-12-20 | 1 | -0/+15 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'jl/commit-v-strip-marker' into maint | Junio C Hamano | 2014-02-05 | 1 | -1/+27 |
|\ \ \ \ \ | |||||
| * | | | | | commit -v: strip diffs and submodule shortlogs from the commit messagejl/commit-v-strip-marker | Jens Lehmann | 2013-12-05 | 1 | -1/+27 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'tb/clone-ssh-with-colon-for-port' into maint | Junio C Hamano | 2014-02-05 | 2 | -21/+198 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | connect.c: refactor url parsing | Torsten Bögershausen | 2013-12-09 | 2 | -0/+15 |
| * | | | | git_connect(): refactor the port handling for ssh | Torsten Bögershausen | 2013-12-09 | 2 | -15/+4 |
| * | | | | git fetch: support host:/~repo | Torsten Bögershausen | 2013-12-09 | 2 | -10/+26 |
| * | | | | t5500: add test cases for diag-url | Torsten Bögershausen | 2013-12-09 | 1 | -0/+59 |
| * | | | | t5601: add tests for ssh | Torsten Bögershausen | 2013-12-04 | 1 | -1/+99 |
| * | | | | t5601: remove clear_ssh, refactor setup_ssh_wrapper | Torsten Bögershausen | 2013-12-04 | 1 | -20/+20 |
* | | | | | Merge branch 'mm/mv-file-to-no-such-dir-with-slash' into maint | Junio C Hamano | 2014-01-13 | 1 | -0/+29 |
|\ \ \ \ \ | |||||
| * | | | | | mv: let 'git mv file no-such-dir/' error out | Matthieu Moy | 2013-12-04 | 1 | -0/+29 |
* | | | | | | Merge branch 'jk/rev-parse-double-dashes' into maint | Junio C Hamano | 2014-01-13 | 1 | -0/+24 |
|\ \ \ \ \ \ | |||||
| * | | | | | | rev-parse: correctly diagnose revision errors before "--" | Jeff King | 2013-12-09 | 1 | -0/+24 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'jk/cat-file-regression-fix' into maint | Junio C Hamano | 2014-01-13 | 1 | -0/+22 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | cat-file: handle --batch format with missing type/sizejk/cat-file-regression-fix | Jeff King | 2013-12-12 | 1 | -0/+22 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'jk/two-way-merge-corner-case-fix' into maint | Junio C Hamano | 2013-12-17 | 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 'sb/sha1-loose-object-info-check-existence' into maint | Junio C Hamano | 2013-12-17 | 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 'nd/magic-pathspec' into maint | Junio C Hamano | 2013-12-17 | 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 |
* | | | | | | | 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 |
* | | | | | | | | | | | | Merge branch 'jx/branch-vv-always-compare-with-upstream' | Junio C Hamano | 2013-11-18 | 1 | -11/+13 |
|\ \ \ \ \ \ \ \ \ \ \ \ |