summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \ \ \
| * | | | | | mv: let 'git mv file no-such-dir/' error outMatthieu Moy2013-12-042-7/+45
| |/ / / / /
* | | | | | Merge branch 'nd/remove-opt-boolean'Junio C Hamano2013-12-171-7/+4
|\ \ \ \ \ \
| * | | | | | parse-options: remove OPT_BOOLEANnd/remove-opt-booleanNguyễn Thái Ngọc Duy2013-12-091-7/+4
* | | | | | | Merge branch 'bc/doc-merge-no-op-revert'Junio C Hamano2013-12-171-0/+8
|\ \ \ \ \ \ \
| * | | | | | | Documentation: document pitfalls with 3-way mergebc/doc-merge-no-op-revertbrian m. carlson2013-12-091-0/+8
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'fc/trivial'Junio C Hamano2013-12-175-6/+12
|\ \ \ \ \ \ \
| * | | | | | | remote: fix status with branch...rebase=preservefc/trivialFelipe Contreras2013-12-091-2/+7
| * | | | | | | fetch: add missing documentationFelipe Contreras2013-12-091-0/+3
| * | | | | | | t: trivial whitespace cleanupsFelipe Contreras2013-12-092-3/+1
| * | | | | | | abspath: trivial style fixFelipe Contreras2013-12-091-1/+1
* | | | | | | | Merge branch 'jk/t5000-gzip-simplify'Junio C Hamano2013-12-171-16/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | t5000: simplify gzip prerequisite checksjk/t5000-gzip-simplifyJeff King2013-12-041-16/+4
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'kb/doc-exclude-directory-semantics'Junio C Hamano2013-12-171-2/+17
|\ \ \ \ \ \ \ \
| * | | | | | | | gitignore.txt: clarify recursive nature of excluded directorieskb/doc-exclude-directory-semanticsKarsten Blees2013-12-091-2/+17
* | | | | | | | | Update draft release notes to 1.9Junio C Hamano2013-12-121-1/+17
* | | | | | | | | Merge branch 'jn/scripts-updates'Junio C Hamano2013-12-1253-600/+87
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | remove #!interpreter line from shell librariesjn/scripts-updatesJonathan Nieder2013-11-2610-28/+19
| * | | | | | | | | test: replace shebangs with descriptions in shell librariesJonathan Nieder2013-11-2615-20/+64
| * | | | | | | | | test: make FILEMODE a lazy prereqJonathan Nieder2013-11-268-17/+4
| * | | | | | | | | contrib: remove git-p4importJonathan Nieder2013-11-263-533/+0
| * | | | | | | | | mark contributed hooks executableJonathan Nieder2013-11-254-2/+0
| * | | | | | | | | mark perl test scripts executableJonathan Nieder2013-11-2510-0/+0
| * | | | | | | | | mark Windows build scripts executableJonathan Nieder2013-11-255-0/+0