Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'cc/replace-object-info' | Junio C Hamano | 2014-01-10 |
|\ | |||
| * | replace info: rename 'full' to 'long' and clarify in-code symbols | Christian Couder | 2013-12-30 |
| * | builtin/replace: unset read_replace_refs | Christian Couder | 2013-12-12 |
| * | t6050: add tests for listing with --format | Christian Couder | 2013-12-12 |
| * | sha1_file: perform object replacement in sha1_object_info_extended() | Christian Couder | 2013-12-12 |
| * | t6050: show that git cat-file --batch fails with replace objects | Christian Couder | 2013-12-12 |
* | | Merge branch 'nd/negative-pathspec' | Junio C Hamano | 2014-01-10 |
|\ \ | |||
| * | | Support pathspec magic :(exclude) and its short form :! | Nguyễn Thái Ngọc Duy | 2013-12-06 |
* | | | Merge branch 'jk/name-pack-after-byte-representation' | Junio C Hamano | 2013-12-27 |
|\ \ \ | |||
| * | | | pack-objects: name pack files after trailer hash | Jeff King | 2013-12-05 |
* | | | | Merge branch 'tg/diff-no-index-refactor' | Junio C Hamano | 2013-12-27 |
|\ \ \ \ | |||
| * | | | | diff: add test for --no-index executed outside repo | Thomas Gummerer | 2013-12-16 |
| * | | | | diff: don't read index when --no-index is given | Thomas Gummerer | 2013-12-12 |
| | |_|/ | |/| | | |||
* | | | | Merge branch 'zk/difftool-counts' | Junio C Hamano | 2013-12-27 |
|\ \ \ \ | |||
| * | | | | difftool: display the number of files in the diff queue in the prompt | Zoltan Klinger | 2013-12-06 |
| |/ / / | |||
* | | | | Merge branch 'jk/cat-file-regression-fix' | Junio C Hamano | 2013-12-27 |
|\ \ \ \ | |||
| * | | | | cat-file: handle --batch format with missing type/size | Jeff King | 2013-12-12 |
| |/ / / | |||
* | | | | Merge branch 'jk/pull-rebase-using-fork-point' | Junio C Hamano | 2013-12-27 |
|\ \ \ \ | |||
| * | | | | rebase: use reflog to find common base with upstream | John Keeping | 2013-12-10 |
* | | | | | Merge branch 'jk/rev-parse-double-dashes' | Junio C Hamano | 2013-12-27 |
|\ \ \ \ \ | |||
| * | | | | | rev-parse: correctly diagnose revision errors before "--" | Jeff King | 2013-12-09 |
* | | | | | | Merge branch 'jc/push-refmap' | Junio C Hamano | 2013-12-27 |
|\ \ \ \ \ \ | |||
| * | | | | | | push: also use "upstream" mapping when pushing a single ref | Junio C Hamano | 2013-12-04 |
| * | | | | | | push: use remote.$name.push as a refmap | Junio C Hamano | 2013-12-04 |
| |/ / / / / | |||
* | | | | | | Merge branch 'tb/clone-ssh-with-colon-for-port' | Junio C Hamano | 2013-12-17 |
|\ \ \ \ \ \ | |||
| * | | | | | | connect.c: refactor url parsing | Torsten Bögershausen | 2013-12-09 |
| * | | | | | | git_connect(): refactor the port handling for ssh | Torsten Bögershausen | 2013-12-09 |
| * | | | | | | git fetch: support host:/~repo | Torsten Bögershausen | 2013-12-09 |
| * | | | | | | t5500: add test cases for diag-url | Torsten Bögershausen | 2013-12-09 |
| * | | | | | | t5601: add tests for ssh | Torsten Bögershausen | 2013-12-04 |
| * | | | | | | t5601: remove clear_ssh, refactor setup_ssh_wrapper | Torsten Bögershausen | 2013-12-04 |
* | | | | | | | Merge branch 'jl/commit-v-strip-marker' | Junio C Hamano | 2013-12-17 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | commit -v: strip diffs and submodule shortlogs from the commit message | Jens Lehmann | 2013-12-05 |
| | |_|_|/ / / | |/| | | | | | |||
* | | | | | | | Merge branch 'mm/mv-file-to-no-such-dir-with-slash' | Junio C Hamano | 2013-12-17 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | mv: let 'git mv file no-such-dir/' error out | Matthieu Moy | 2013-12-04 |
| | |_|/ / / / | |/| | | | | | |||
* | | | | | | | Merge branch 'fc/trivial' | Junio C Hamano | 2013-12-17 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | t: trivial whitespace cleanups | Felipe Contreras | 2013-12-09 |
| | |_|_|_|_|/ | |/| | | | | | |||
* | | | | | | | Merge branch 'jk/t5000-gzip-simplify' | Junio C Hamano | 2013-12-17 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | t5000: simplify gzip prerequisite checks | Jeff King | 2013-12-04 |
| | |/ / / / / | |/| | | | | | |||
* | | | | | | | Merge branch 'jn/scripts-updates' | Junio C Hamano | 2013-12-12 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | remove #!interpreter line from shell libraries | Jonathan Nieder | 2013-11-26 |
| * | | | | | | | test: replace shebangs with descriptions in shell libraries | Jonathan Nieder | 2013-11-26 |
| * | | | | | | | test: make FILEMODE a lazy prereq | Jonathan Nieder | 2013-11-26 |
| * | | | | | | | mark perl test scripts executable | Jonathan Nieder | 2013-11-25 |
| | |_|/ / / / | |/| | | | | | |||
* | | | | | | | Merge branch 'jk/remove-deprecated' | Junio C Hamano | 2013-12-12 |
|\ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ | Sync with 1.8.5 | Junio C Hamano | 2013-12-05 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||
| * | | | | | | | tar-tree: remove deprecated command | John Keeping | 2013-11-12 |
* | | | | | | | | Merge branch 'tr/config-multivalue-lift-max' | Junio C Hamano | 2013-12-12 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | config: arbitrary number of matches for --unset and --replace-all | Thomas Rast | 2013-12-06 |
* | | | | | | | | | Merge branch 'mh/fetch-tags-in-addition-to-normal-refs' | Junio C Hamano | 2013-12-12 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | |