summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/add-2.0-ignore-removal' into HEADhold/hv/submodule-ignore-fix-premergeJunio C Hamano2013-12-122-64/+23
|\
| * git add <pathspec>... defaults to "-A"jc/add-2.0-ignore-removalJunio C Hamano2013-04-222-46/+15
* | Merge branch 'jn/add-2.0-u-A-sans-pathspec' into HEADJunio C Hamano2013-12-124-122/+19
|\ \
| * | git add: -u/-A now affects the entire working treejn/add-2.0-u-A-sans-pathspecJunio C Hamano2013-04-264-121/+19
* | | Merge branch 'hv/submodule-ignore-fix' into HEADJunio C Hamano2013-12-129-19/+90
|\ \ \
| * | | disable complete ignorance of submodules for index <-> HEAD diffhv/submodule-ignore-fixHeiko Voigt2013-12-067-7/+35
| * | | always show committed submodules in summary after commitHeiko Voigt2013-12-061-0/+1
| * | | teach add -f option for ignored submodulesHeiko Voigt2013-12-063-12/+48
| * | | fix 'git add' to skip submodules configured as ignoredHeiko Voigt2013-12-061-0/+6
* | | | Merge branch 'zk/difftool-counts' into jchJunio C Hamano2013-12-125-4/+43
|\ \ \ \
| * | | | difftool: display the number of files in the diff queue in the promptZoltan Klinger2013-12-065-4/+43
* | | | | Merge branch 'nd/transport-positive-depth-only' into jchJunio C Hamano2013-12-122-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 'nd/negative-pathspec' into jchJunio C Hamano2013-12-127-40/+354
|\ \ \ \ \ \
| * | | | | | pathspec.c: support adding prefix magic to a pathspec with mnemonic magicNguyễn Thái Ngọc Duy2013-12-061-10/+18
| * | | | | | Support pathspec magic :(exclude) and its short form :!Nguyễn Thái Ngọc Duy2013-12-067-13/+324
| * | | | | | glossary-content.txt: rephrase magic signature partNguyễn Thái Ngọc Duy2013-12-061-17/+12
* | | | | | | Merge branch 'cc/starts-n-ends-with' into jchJunio C Hamano2013-12-1291-480/+483
|\ \ \ \ \ \ \
| * | | | | | | 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 'tb/clone-ssh-with-colon-for-port' into jchJunio C Hamano2013-12-127-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 'kn/gitweb-extra-branch-refs' into jchJunio C Hamano2013-12-122-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 'jc/push-refmap' into jchJunio C Hamano2013-12-125-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
* | | | | | | | | | Merge branch 'tr/send-email-ssl' into jchJunio C Hamano2013-12-121-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 'jk/name-pack-after-byte-representation' into jchJunio C Hamano2013-12-125-14/+8
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | pack-objects: name pack files after trailer hashJeff King2013-12-053-10/+4
| * | | | | | | | | | sha1write: make buffer const-correctJeff King2013-10-242-4/+4
* | | | | | | | | | | Merge branch 'kb/doc-exclude-directory-semantics' into jchJunio C Hamano2013-12-121-2/+17
|\ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status