Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| * | | | | | | | 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 |
| | |_|_|_|_|/ / / | |/| | | | | | | |