summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* do not pretend sha1write returns errorsjk/sha1write-voidJeff King2013-12-264-7/+3
* 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | clone,fetch: catch non positive --depth option valuend/transport-positive-depth-onlyNguyễn Thái Ngọc Duy2013-12-062-0/+8
* | | | | | | | | | | | | | | | | Merge branch 'cc/starts-n-ends-with'Junio C Hamano2013-12-1791-481/+484
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | replace {pre,suf}fixcmp() with {starts,ends}_with()cc/starts-n-ends-withChristian Couder2013-12-0588-459/+459
| * | | | | | | | | | | | | | | | | strbuf: introduce starts_with() and ends_with()Christian Couder2013-12-053-10/+21
| * | | | | | | | | | | | | | | | | builtin/remote: remove postfixcmp() and use suffixcmp() insteadChristian Couder2013-12-051-11/+3
| * | | | | | | | | | | | | | | | | environment: normalize use of prefixcmp() by removing " != 0"Christian Couder2013-12-051-1/+1
* | | | | | | | | | | | | | | | | | Merge branch 'jl/commit-v-strip-marker'Junio C Hamano2013-12-174-9/+58
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | commit -v: strip diffs and submodule shortlogs from the commit messagejl/commit-v-strip-markerJens Lehmann2013-12-054-9/+58
* | | | | | | | | | | | | | | | | | | Merge branch 'tr/send-email-ssl'Junio C Hamano2013-12-171-2/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | send-email: set SSL options through IO::Socket::SSL::set_client_defaultstr/send-email-sslThomas Rast2013-12-041-2/+5
| * | | | | | | | | | | | | | | | | | | send-email: --smtp-ssl-cert-path takes an argumentThomas Rast2013-12-041-1/+1
| * | | | | | | | | | | | | | | | | | | send-email: pass Debug to Net::SMTP::SSL::newThomas Rast2013-12-041-0/+1
| | |_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'nd/gettext-vsnprintf'Junio C Hamano2013-12-171-4/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | gettext.c: detect the vsnprintf bug at runtimend/gettext-vsnprintfNguyễn Thái Ngọc Duy2013-12-041-4/+15
| | |_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'mm/mv-file-to-no-such-dir-with-slash'Junio C Hamano2013-12-172-7/+45
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \