summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/reflog-date'Junio C Hamano2016-08-086-10/+57
|\
| * date: clarify --date=raw descriptionjk/reflog-dateJunio C Hamano2016-07-271-1/+5
| * date: add "unix" formatJeff King2016-07-275-1/+19
| * date: document and test "raw-local" modeJeff King2016-07-272-2/+6
| * doc/pretty-formats: explain shortening of %gdJeff King2016-07-221-3/+6
| * doc/pretty-formats: describe index/time formats for %gdJeff King2016-07-221-2/+5
| * doc/rev-list-options: explain "-g" output formatsJeff King2016-07-221-4/+19
| * doc/rev-list-options: clarify "commit@{Nth}" for "-g" optionJeff King2016-07-221-2/+2
* | Merge branch 'cp/completion-clone-recurse-submodules'Junio C Hamano2016-08-081-0/+1
|\ \
| * | completion: add option '--recurse-submodules' to 'git clone'cp/completion-clone-recurse-submodulesChris Packham2016-07-271-0/+1
* | | Merge branch 'jk/t4205-cleanup'Junio C Hamano2016-08-081-198/+200
|\ \ \
| * | | t4205: indent here documentsjk/t4205-cleanupJeff King2016-07-271-196/+196
| * | | t4205: drop top-level &&-chainingJeff King2016-07-271-2/+4
| | |/ | |/|
* | | Merge branch 'da/subtree-modernize'Junio C Hamano2016-08-081-286/+391
|\ \ \
| * | | subtree: adjust function definitions to match CodingGuidelinesda/subtree-modernizeDavid Aguilar2016-07-271-68/+34
| * | | subtree: adjust style to match CodingGuidelinesDavid Aguilar2016-07-271-218/+357
* | | | Merge branch 'nd/fetch-ref-summary'Junio C Hamano2016-08-081-2/+2
|\ \ \ \
| * | | | t5510: skip tests under GETTEXT_POISON buildnd/fetch-ref-summaryVasco Almeida2016-07-261-2/+2
* | | | | Merge branch 'ew/git-svn-http-tests'Junio C Hamano2016-08-0810-91/+30
|\ \ \ \ \
| * | | | | git svn: migrate tests to use lib-httpdew/git-svn-http-testsEric Wong2016-07-257-86/+30
| * | | | | t/t91*: do not say how to avoid the testsMichael J Gruber2016-07-253-5/+0
* | | | | | Merge branch 'js/t4130-rename-without-ino'Junio C Hamano2016-08-081-3/+7
|\ \ \ \ \ \
| * | | | | | t4130: work around Windows limitationjs/t4130-rename-without-inoJohannes Sixt2016-08-031-3/+7
| | |_|_|_|/ | |/| | | |
* | | | | | 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