Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'zk/difftool-counts' | Junio C Hamano | 2013-12-27 | 5 | -4/+43 |
|\ | |||||
| * | diff.c: fix some recent whitespace style violationszk/difftool-counts | Jeff King | 2013-12-16 | 1 | -2/+2 |
| * | difftool: display the number of files in the diff queue in the prompt | Zoltan Klinger | 2013-12-06 | 5 | -4/+43 |
* | | Merge branch 'jk/cat-file-regression-fix' | Junio C Hamano | 2013-12-27 | 2 | -10/+42 |
|\ \ | |||||
| * | | cat-file: handle --batch format with missing type/sizejk/cat-file-regression-fix | Jeff King | 2013-12-12 | 2 | -1/+32 |
| * | | cat-file: pass expand_data to print_object_or_die | Jeff King | 2013-12-12 | 1 | -10/+11 |
| |/ | |||||
* | | Merge branch 'jk/pull-rebase-using-fork-point' | Junio C Hamano | 2013-12-27 | 4 | -11/+34 |
|\ \ | |||||
| * | | rebase: use reflog to find common base with upstream | John Keeping | 2013-12-10 | 3 | -2/+33 |
| * | | pull: use merge-base --fork-point when appropriate | John Keeping | 2013-12-09 | 1 | -9/+1 |
* | | | Merge branch 'jk/rev-parse-double-dashes' | Junio C Hamano | 2013-12-27 | 2 | -1/+39 |
|\ \ \ | |||||
| * | | | rev-parse: be more careful with munging argumentsjk/rev-parse-double-dashes | Jeff King | 2013-12-09 | 1 | -1/+5 |
| * | | | rev-parse: correctly diagnose revision errors before "--" | Jeff King | 2013-12-09 | 2 | -0/+34 |
* | | | | Merge branch 'jc/push-refmap' | Junio C Hamano | 2013-12-27 | 5 | -28/+150 |
|\ \ \ \ | |||||
| * | | | | push: also use "upstream" mapping when pushing a single refjc/push-refmap | Junio C Hamano | 2013-12-04 | 2 | -0/+41 |
| * | | | | push: use remote.$name.push as a refmap | Junio C Hamano | 2013-12-04 | 5 | -8/+96 |
| * | | | | builtin/push.c: use strbuf instead of manual allocation | Junio C Hamano | 2013-12-03 | 1 | -21/+14 |
* | | | | | Sync with 1.8.5.2 | Junio C Hamano | 2013-12-17 | 3 | -5/+24 |
|\ \ \ \ \ | |||||
| * | | | | | Git 1.8.5.2v1.8.5.2 | Junio C Hamano | 2013-12-17 | 4 | -3/+24 |
| * | | | | | Merge branch 'rs/doc-submitting-patches' into maint | Junio C Hamano | 2013-12-17 | 1 | -2/+9 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'tr/doc-git-cherry' into maint | Junio C Hamano | 2013-12-17 | 1 | -33/+110 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'nd/glossary-content-pathspec-markup' into maint | Junio C Hamano | 2013-12-17 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'jj/doc-markup-gitcli' into maint | Junio C Hamano | 2013-12-17 | 1 | -5/+5 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'jj/doc-markup-hints-in-coding-guidelines' into maint | Junio C Hamano | 2013-12-17 | 1 | -3/+31 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'jj/log-doc' into maint | Junio C Hamano | 2013-12-17 | 1 | -26/+25 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'jj/rev-list-options-doc' into maint | Junio C Hamano | 2013-12-17 | 1 | -156/+87 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'tb/doc-fetch-pack-url' into maint | Junio C Hamano | 2013-12-17 | 1 | -8/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mi/typofixes' into maint | Junio C Hamano | 2013-12-17 | 8 | -10/+10 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jh/loose-object-dirs-creation-race' into maint | Junio C Hamano | 2013-12-17 | 1 | -1/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/two-way-merge-corner-case-fix' into maint | Junio C Hamano | 2013-12-17 | 3 | -97/+121 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sb/sha1-loose-object-info-check-existence' into maint | Junio C Hamano | 2013-12-17 | 2 | -6/+15 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/magic-pathspec' into maint | Junio C Hamano | 2013-12-17 | 2 | -10/+13 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | cmd_repack(): remove redundant local variable "nr_packs" | Michael Haggerty | 2013-12-17 | 1 | -4/+2 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | Update draft release notes to 1.9 | Junio C Hamano | 2013-12-17 | 1 | -0/+37 |
* | | | | | | | | | | | | | | | | | | Merge branch 'kn/gitweb-extra-branch-refs' | Junio C Hamano | 2013-12-17 | 2 | -46/+175 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | gitweb: Denote non-heads, non-remotes brancheskn/gitweb-extra-branch-refs | Krzesimir Nowak | 2013-12-12 | 1 | -5/+29 |
| * | | | | | | | | | | | | | | | | | | gitweb: Add a feature for adding more branch refs | Krzesimir Nowak | 2013-12-12 | 2 | -12/+105 |
| * | | | | | | | | | | | | | | | | | | gitweb: Return 1 on validation success instead of passed input | Krzesimir Nowak | 2013-12-12 | 1 | -29/+32 |
| * | | | | | | | | | | | | | | | | | | gitweb: Move check-ref-format code into separate function | Krzesimir Nowak | 2013-12-12 | 1 | -4/+13 |
| |/ / / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | | Merge branch 'tb/clone-ssh-with-colon-for-port' | Junio C Hamano | 2013-12-17 | 7 | -147/+350 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | git_connect(): use common return pointtb/clone-ssh-with-colon-for-port | Torsten Bögershausen | 2013-12-09 | 1 | -58/+50 |
| * | | | | | | | | | | | | | | | | | | connect.c: refactor url parsing | Torsten Bögershausen | 2013-12-09 | 5 | -37/+48 |
| * | | | | | | | | | | | | | | | | | | git_connect(): refactor the port handling for ssh | Torsten Bögershausen | 2013-12-09 | 3 | -49/+17 |
| * | | | | | | | | | | | | | | | | | | git fetch: support host:/~repo | Torsten Bögershausen | 2013-12-09 | 3 | -17/+33 |
| * | | | | | | | | | | | | | | | | | | t5500: add test cases for diag-url | Torsten Bögershausen | 2013-12-09 | 1 | -0/+59 |
| * | | | | | | | | | | | | | | | | | | git fetch-pack: add --diag-url | Torsten Bögershausen | 2013-12-09 | 4 | -3/+41 |
| * | | | | | | | | | | | | | | | | | | git_connect: factor out discovery of the protocol and its parts | Johannes Sixt | 2013-12-09 | 1 | -27/+53 |
| * | | | | | | | | | | | | | | | | | | git_connect: remove artificial limit of a remote command | Johannes Sixt | 2013-12-09 | 1 | -6/+1 |
| * | | | | | | | | | | | | | | | | | | 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 'nd/transport-positive-depth-only' | Junio C Hamano | 2013-12-17 | 2 | -0/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |