summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'zk/difftool-counts'Junio C Hamano2013-12-275-4/+43
|\
| * diff.c: fix some recent whitespace style violationszk/difftool-countsJeff King2013-12-161-2/+2
| * difftool: display the number of files in the diff queue in the promptZoltan Klinger2013-12-065-4/+43
* | Merge branch 'jk/cat-file-regression-fix'Junio C Hamano2013-12-272-10/+42
|\ \
| * | cat-file: handle --batch format with missing type/sizejk/cat-file-regression-fixJeff King2013-12-122-1/+32
| * | cat-file: pass expand_data to print_object_or_dieJeff King2013-12-121-10/+11
| |/
* | Merge branch 'jk/pull-rebase-using-fork-point'Junio C Hamano2013-12-274-11/+34
|\ \
| * | rebase: use reflog to find common base with upstreamJohn Keeping2013-12-103-2/+33
| * | pull: use merge-base --fork-point when appropriateJohn Keeping2013-12-091-9/+1
* | | Merge branch 'jk/rev-parse-double-dashes'Junio C Hamano2013-12-272-1/+39
|\ \ \
| * | | rev-parse: be more careful with munging argumentsjk/rev-parse-double-dashesJeff King2013-12-091-1/+5
| * | | rev-parse: correctly diagnose revision errors before "--"Jeff King2013-12-092-0/+34
* | | | Merge branch 'jc/push-refmap'Junio C Hamano2013-12-275-28/+150
|\ \ \ \
| * | | | push: also use "upstream" mapping when pushing a single refjc/push-refmapJunio C Hamano2013-12-042-0/+41
| * | | | push: use remote.$name.push as a refmapJunio C Hamano2013-12-045-8/+96
| * | | | builtin/push.c: use strbuf instead of manual allocationJunio C Hamano2013-12-031-21/+14
* | | | | Sync with 1.8.5.2Junio C Hamano2013-12-173-5/+24
|\ \ \ \ \
| * | | | | Git 1.8.5.2v1.8.5.2Junio C Hamano2013-12-174-3/+24
| * | | | | Merge branch 'rs/doc-submitting-patches' into maintJunio C Hamano2013-12-171-2/+9
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'tr/doc-git-cherry' into maintJunio C Hamano2013-12-171-33/+110
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'nd/glossary-content-pathspec-markup' into maintJunio C Hamano2013-12-171-3/+3
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jj/doc-markup-gitcli' into maintJunio C Hamano2013-12-171-5/+5
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jj/doc-markup-hints-in-coding-guidelines' into maintJunio C Hamano2013-12-171-3/+31
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jj/log-doc' into maintJunio C Hamano2013-12-171-26/+25
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jj/rev-list-options-doc' into maintJunio C Hamano2013-12-171-156/+87
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tb/doc-fetch-pack-url' into maintJunio C Hamano2013-12-171-8/+7
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mi/typofixes' into maintJunio C Hamano2013-12-178-10/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jh/loose-object-dirs-creation-race' into maintJunio C Hamano2013-12-171-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/two-way-merge-corner-case-fix' into maintJunio C Hamano2013-12-173-97/+121
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sb/sha1-loose-object-info-check-existence' into maintJunio C Hamano2013-12-172-6/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/magic-pathspec' into maintJunio C Hamano2013-12-172-10/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | cmd_repack(): remove redundant local variable "nr_packs"Michael Haggerty2013-12-171-4/+2
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Update draft release notes to 1.9Junio C Hamano2013-12-171-0/+37
* | | | | | | | | | | | | | | | | | Merge branch 'kn/gitweb-extra-branch-refs'Junio C Hamano2013-12-172-46/+175
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | gitweb: Denote non-heads, non-remotes brancheskn/gitweb-extra-branch-refsKrzesimir Nowak2013-12-121-5/+29
| * | | | | | | | | | | | | | | | | | gitweb: Add a feature for adding more branch refsKrzesimir Nowak2013-12-122-12/+105
| * | | | | | | | | | | | | | | | | | gitweb: Return 1 on validation success instead of passed inputKrzesimir Nowak2013-12-121-29/+32
| * | | | | | | | | | | | | | | | | | gitweb: Move check-ref-format code into separate functionKrzesimir Nowak2013-12-121-4/+13
| |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge branch 'tb/clone-ssh-with-colon-for-port'Junio C Hamano2013-12-177-147/+350
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | git_connect(): use common return pointtb/clone-ssh-with-colon-for-portTorsten Bögershausen2013-12-091-58/+50
| * | | | | | | | | | | | | | | | | | connect.c: refactor url parsingTorsten Bögershausen2013-12-095-37/+48
| * | | | | | | | | | | | | | | | | | git_connect(): refactor the port handling for sshTorsten Bögershausen2013-12-093-49/+17
| * | | | | | | | | | | | | | | | | | git fetch: support host:/~repoTorsten Bögershausen2013-12-093-17/+33
| * | | | | | | | | | | | | | | | | | t5500: add test cases for diag-urlTorsten Bögershausen2013-12-091-0/+59
| * | | | | | | | | | | | | | | | | | git fetch-pack: add --diag-urlTorsten Bögershausen2013-12-094-3/+41
| * | | | | | | | | | | | | | | | | | git_connect: factor out discovery of the protocol and its partsJohannes Sixt2013-12-091-27/+53
| * | | | | | | | | | | | | | | | | | git_connect: remove artificial limit of a remote commandJohannes Sixt2013-12-091-6/+1
| * | | | | | | | | | | | | | | | | | t5601: add tests for sshTorsten Bögershausen2013-12-041-1/+99
| * | | | | | | | | | | | | | | | | | t5601: remove clear_ssh, refactor setup_ssh_wrapperTorsten Bögershausen2013-12-041-20/+20
* | | | | | | | | | | | | | | | | | | Merge branch 'nd/transport-positive-depth-only'Junio C Hamano2013-12-172-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \