Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| * | | diff: don't read index when --no-index is given | Thomas Gummerer | 2013-12-12 | 2 | -0/+37 |
* | | | Merge branch 'zk/difftool-counts' | Junio C Hamano | 2013-12-27 | 1 | -0/+13 |
|\ \ \ | |||||
| * | | | difftool: display the number of files in the diff queue in the prompt | Zoltan Klinger | 2013-12-06 | 1 | -0/+13 |
| |/ / | |||||
* | | | Merge branch 'jk/cat-file-regression-fix' | Junio C Hamano | 2013-12-27 | 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/pull-rebase-using-fork-point' | Junio C Hamano | 2013-12-27 | 1 | -2/+4 |
|\ \ \ | |||||
| * | | | rebase: use reflog to find common base with upstream | John Keeping | 2013-12-10 | 1 | -2/+4 |
* | | | | Merge branch 'jk/rev-parse-double-dashes' | Junio C Hamano | 2013-12-27 | 1 | -0/+24 |
|\ \ \ \ | |||||
| * | | | | rev-parse: correctly diagnose revision errors before "--" | Jeff King | 2013-12-09 | 1 | -0/+24 |
* | | | | | Merge branch 'jc/push-refmap' | Junio C Hamano | 2013-12-27 | 1 | -0/+75 |
|\ \ \ \ \ | |||||
| * | | | | | push: also use "upstream" mapping when pushing a single refjc/push-refmap | Junio C Hamano | 2013-12-04 | 1 | -0/+30 |
| * | | | | | push: use remote.$name.push as a refmap | Junio C Hamano | 2013-12-04 | 1 | -0/+45 |
| |/ / / / | |||||
* | | | | | Merge branch 'tb/clone-ssh-with-colon-for-port' | Junio C Hamano | 2013-12-17 | 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 'jl/commit-v-strip-marker' | Junio C Hamano | 2013-12-17 | 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 'mm/mv-file-to-no-such-dir-with-slash' | Junio C Hamano | 2013-12-17 | 1 | -0/+29 |
|\ \ \ \ \ \ | |||||
| * | | | | | | mv: let 'git mv file no-such-dir/' error out | Matthieu Moy | 2013-12-04 | 1 | -0/+29 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge branch 'fc/trivial' | Junio C Hamano | 2013-12-17 | 2 | -3/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | t: trivial whitespace cleanups | Felipe Contreras | 2013-12-09 | 2 | -3/+1 |
* | | | | | | | Merge branch 'jk/t5000-gzip-simplify' | Junio C Hamano | 2013-12-17 | 1 | -16/+4 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | t5000: simplify gzip prerequisite checksjk/t5000-gzip-simplify | Jeff King | 2013-12-04 | 1 | -16/+4 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'jn/scripts-updates' | Junio C Hamano | 2013-12-12 | 32 | -41/+70 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | remove #!interpreter line from shell librariesjn/scripts-updates | Jonathan Nieder | 2013-11-26 | 1 | -4/+2 |
| * | | | | | | | test: replace shebangs with descriptions in shell libraries | Jonathan Nieder | 2013-11-26 | 15 | -20/+64 |
| * | | | | | | | test: make FILEMODE a lazy prereq | Jonathan Nieder | 2013-11-26 | 8 | -17/+4 |
| * | | | | | | | mark perl test scripts executable | Jonathan Nieder | 2013-11-25 | 10 | -0/+0 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'jk/remove-deprecated' | Junio C Hamano | 2013-12-12 | 3 | -25/+5 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Sync with 1.8.5jk/remove-deprecated | Junio C Hamano | 2013-12-05 | 2 | -11/+20 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| * | | | | | | | tar-tree: remove deprecated command | John Keeping | 2013-11-12 | 3 | -25/+5 |
* | | | | | | | | 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 |
|\ \ \ \ \ \ \ \ |