Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | submodule--helper: use parallel processor correctlysb/submodule-clone-retry | Stefan Beller | 2016-08-09 | 1 | -2/+6 |
* | submodule-helper: fix indexing in clone retry error reporting path | Johannes Sixt | 2016-07-22 | 3 | -5/+5 |
* | git-submodule: forward exit code of git-submodule--helper more faithfully | Johannes Sixt | 2016-07-22 | 3 | -15/+15 |
* | Merge branch 'sb/submodule-clone-retry' | Junio C Hamano | 2016-07-11 | 2 | -8/+60 |
|\ | |||||
| * | submodule update: continue when a clone fails | Stefan Beller | 2016-06-13 | 1 | -1/+1 |
| * | submodule--helper: initial clone learns retry logic | Stefan Beller | 2016-06-13 | 1 | -7/+59 |
* | | Merge branch 'jc/send-email-skip-backup' | Junio C Hamano | 2016-07-11 | 1 | -0/+40 |
|\ \ | |||||
| * | | send-email: detect and offer to skip backup filesjc/send-email-skip-backup | Junio C Hamano | 2016-04-12 | 1 | -0/+40 |
* | | | Third batch of topics for 2.10 | Junio C Hamano | 2016-07-06 | 1 | -16/+111 |
* | | | Sync with maint | Junio C Hamano | 2016-07-06 | 2 | -0/+35 |
|\ \ \ | |||||
| * | | | More fixes for 2.9.1 | Junio C Hamano | 2016-07-06 | 1 | -0/+34 |
| * | | | Merge branch 'jc/deref-tag' into maint | Junio C Hamano | 2016-07-06 | 2 | -6/+3 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'pb/strbuf-read-file-doc' into maint | Junio C Hamano | 2016-07-06 | 1 | -0/+2 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'jk/fetch-prune-doc' into maint | Junio C Hamano | 2016-07-06 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'pc/occurred' into maint | Junio C Hamano | 2016-07-06 | 2 | -2/+2 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'mg/cherry-pick-multi-on-unborn' into maint | Junio C Hamano | 2016-07-06 | 1 | -5/+6 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'em/newer-freebsd-shells-are-fine-with-returns' into maint | Junio C Hamano | 2016-07-06 | 3 | -6/+6 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'lv/status-say-working-tree-not-directory' into maint | Junio C Hamano | 2016-07-06 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'nb/gnome-keyring-build' into maint | Junio C Hamano | 2016-07-06 | 1 | -2/+3 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'et/add-chmod-x' into maint | Junio C Hamano | 2016-07-06 | 6 | -20/+68 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/avoid-unbounded-alloca' into maint | Junio C Hamano | 2016-07-06 | 1 | -6/+16 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'rj/compat-regex-size-max-fix' into maint | Junio C Hamano | 2016-07-06 | 2 | -2/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'vs/prompt-avoid-unset-variable' into maint | Junio C Hamano | 2016-07-06 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sg/reflog-past-root' into maint | Junio C Hamano | 2016-07-06 | 3 | -1/+29 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dn/gpg-doc' into maint | Junio C Hamano | 2016-07-06 | 2 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ap/git-svn-propset-doc' into maint | Junio C Hamano | 2016-07-06 | 1 | -0/+14 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'tr/doc-tt' into maint | Junio C Hamano | 2016-07-06 | 36 | -217/+224 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | mailmap: use main email address for dturner | David Turner | 2016-07-06 | 1 | -0/+1 |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/t2300-setup' | Junio C Hamano | 2016-07-06 | 1 | -1/+9 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | t2300: "git --exec-path" is not usable in $PATH on Windows as-isjc/t2300-setup | Johannes Schindelin | 2016-06-22 | 1 | -1/+9 |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'ao/p4-has-branch-prefix-fix' | Junio C Hamano | 2016-07-06 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | git-p4: correct hasBranchPrefix verbose outputao/p4-has-branch-prefix-fix | Andrew Oakley | 2016-06-22 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'cb/t7810-test-label-fix' | Junio C Hamano | 2016-07-06 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | t7810: fix duplicated test titlecb/t7810-test-label-fix | Charles Bailey | 2016-06-21 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/t5614-modernize' | Junio C Hamano | 2016-07-06 | 1 | -50/+20 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | t5614: don't use subshellssb/t5614-modernize | Stefan Beller | 2016-06-21 | 1 | -50/+20 |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/perf-on-apple' | Junio C Hamano | 2016-07-06 | 2 | -1/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | perf: accommodate for MacOSXjs/perf-on-apple | Johannes Schindelin | 2016-06-21 | 2 | -1/+7 |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ak/t7800-wo-readlink' | Junio C Hamano | 2016-07-06 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | t7800: readlink may not be availableak/t7800-wo-readlink | Armin Kunaschik | 2016-06-21 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/tzoffset-fix' | Junio C Hamano | 2016-07-06 | 3 | -17/+71 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | local_tzoffset: detect errors from tm_to_time_t | Jeff King | 2016-06-20 | 2 | -0/+7 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | t0006: test various date formats | Jeff King | 2016-06-20 | 2 | -0/+47 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | t0006: rename test-date's "show" to "relative" | Jeff King | 2016-06-20 | 2 | -17/+17 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/mingw-parameter-less-c-functions' | Junio C Hamano | 2016-07-06 | 3 | -6/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | mingw: let the build succeed with DEVELOPER=1js/mingw-parameter-less-c-functions | Johannes Schindelin | 2016-06-20 | 3 | -6/+6 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'lc/shell-default-value-noexpand' | Junio C Hamano | 2016-07-06 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | sh-setup: enclose setting of ${VAR=default} in double-quoteslc/shell-default-value-noexpand | LE Manh Cuong | 2016-06-19 | 1 | -3/+3 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/clone-shallow-passthru' | Junio C Hamano | 2016-07-06 | 3 | -8/+21 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | clone: do not let --depth imply --shallow-submodulessb/clone-shallow-passthru | Junio C Hamano | 2016-06-20 | 3 | -8/+21 |