summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* clone: recursive and reference option triggers submodule alternatessb/submodule-clone-rrStefan Beller2016-08-174-0/+176
* clone: implement optional referencesStefan Beller2016-08-152-11/+29
* clone: clarify option_reference as requiredStefan Beller2016-08-151-4/+4
* clone: factor out checking for an alternate pathStefan Beller2016-08-153-34/+86
* submodule--helper update-clone: allow multiple referencesStefan Beller2016-08-122-6/+10
* submodule--helper module-clone: allow multiple referencesStefan Beller2016-08-121-8/+12
* t7408: merge short tests, factor out testing methodStefan Beller2016-08-121-23/+25
* t7408: modernize styleStefan Beller2016-08-121-69/+71
* Tenth batch for 2.10Junio C Hamano2016-08-041-0/+6
* Merge branch 'jc/grep-commandline-vs-configuration'Junio C Hamano2016-08-044-16/+29
|\
| * grep: further simplify setting the pattern typejc/grep-commandline-vs-configurationJunio C Hamano2016-07-254-16/+29
* | Merge branch 'sb/submodule-clone-retry'Junio C Hamano2016-08-042-12/+12
|\ \
| * | submodule-helper: fix indexing in clone retry error reporting pathJohannes Sixt2016-07-223-5/+5
| * | git-submodule: forward exit code of git-submodule--helper more faithfullyJohannes Sixt2016-07-223-15/+15
* | | Merge branch 'sb/pack-protocol-doc-nak'Junio C Hamano2016-08-041-1/+1
|\ \ \
| * | | Documentation: pack-protocol correct NAK responsesb/pack-protocol-doc-nakStefan Beller2016-07-221-1/+1
| | |/ | |/|
* | | Ninth batch of topics for 2.10Junio C Hamano2016-08-031-0/+61
* | | Merge branch 'jk/diff-do-not-reuse-wtf-needs-cleaning'Junio C Hamano2016-08-032-0/+18
|\ \ \
| * | | diff: do not reuse worktree files that need "clean" conversionjk/diff-do-not-reuse-wtf-needs-cleaningJeff King2016-07-222-0/+18
* | | | Merge branch 'rs/submodule-config-code-cleanup'Junio C Hamano2016-08-033-17/+28
|\ \ \ \
| * | | | submodule-config: fix test binary crashing when no arguments givenrs/submodule-config-code-cleanupHeiko Voigt2016-07-281-1/+1
| * | | | submodule-config: combine early return code into one gotoHeiko Voigt2016-07-281-19/+12
| * | | | submodule-config: passing name reference for .gitmodule blobsHeiko Voigt2016-07-282-9/+28
| * | | | submodule-config: use explicit empty string instead of strbuf in config_from()René Scharfe2016-07-191-2/+1
| |/ / /
* | | | Merge branch 'jk/push-progress'Junio C Hamano2016-08-039-64/+202
|\ \ \ \
| * | | | receive-pack: send keepalives during quiet periodsjk/push-progressJeff King2016-07-203-1/+81
| * | | | receive-pack: turn on connectivity progressJeff King2016-07-201-0/+1
| * | | | receive-pack: relay connectivity errors to sidebandJeff King2016-07-201-1/+17
| * | | | receive-pack: turn on index-pack resolving progressJeff King2016-07-201-0/+2
| * | | | index-pack: add flag for showing delta-resolution progressJeff King2016-07-201-1/+4
| * | | | clone: use a real progress meter for connectivity checkJeff King2016-07-201-4/+1
| * | | | check_connected: add progress flagJeff King2016-07-202-0/+6
| * | | | check_connected: relay errors to alternate descriptorJeff King2016-07-202-2/+16
| * | | | check_everything_connected: use a struct with named optionsJeff King2016-07-205-45/+47
| * | | | check_everything_connected: convert to argv_arrayJeff King2016-07-201-12/+9
| * | | | rev-list: add optional progress reportingJeff King2016-07-202-0/+21
| * | | | check_everything_connected: always pass --quiet to rev-listJeff King2016-07-201-2/+1
* | | | | Merge branch 'jt/fetch-large-handshake-window-on-http'Junio C Hamano2016-08-031-7/+12
|\ \ \ \ \
| * | | | | fetch-pack: grow stateless RPC windows exponentiallyjt/fetch-large-handshake-window-on-httpJonathan Tan2016-07-191-7/+12
* | | | | | Merge branch 'jk/git-jump'Junio C Hamano2016-08-032-3/+11
|\ \ \ \ \ \
| * | | | | | contrib/git-jump: fix typo in READMEjk/git-jumpJeff King2016-07-221-1/+1
| * | | | | | contrib/git-jump: add whitespace-checking modeJeff King2016-07-222-1/+9
| * | | | | | contrib/git-jump: fix greedy regex when matching hunksJeff King2016-07-221-1/+1
* | | | | | | Merge branch 'mm/status-suggest-merge-abort'Junio C Hamano2016-08-033-2/+10
|\ \ \ \ \ \ \
| * | | | | | | status: suggest 'git merge --abort' when appropriatemm/status-suggest-merge-abortMatthieu Moy2016-07-223-2/+10
* | | | | | | | Merge branch 'jk/parse-options-concat'Junio C Hamano2016-08-033-22/+22
|\ \ \ \ \ \ \ \
| * | | | | | | | parse_options: allocate a new array when concatenatingjk/parse-options-concatJeff King2016-07-063-22/+22
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'sb/push-options'Junio C Hamano2016-08-0313-23/+294
|\ \ \ \ \ \ \ \
| * | | | | | | | add a test for push optionssb/push-optionsStefan Beller2016-07-141-0/+103
| * | | | | | | | push: accept push optionsStefan Beller2016-07-146-4/+63