summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* rebase -i: we allow extra spaces after fixup!/squash!js/rebase-i-testsJohannes Schindelin2016-07-071-0/+9
* rebase -i: demonstrate a bug with --autosquashJohannes Schindelin2016-07-071-0/+24
* t3404: add a test for the --gpg-sign optionJohannes Schindelin2016-07-071-0/+8
* Third batch of topics for 2.10Junio C Hamano2016-07-061-16/+111
* Sync with maintJunio C Hamano2016-07-062-0/+35
|\
| * More fixes for 2.9.1Junio C Hamano2016-07-061-0/+34
| * Merge branch 'jc/deref-tag' into maintJunio C Hamano2016-07-062-6/+3
| |\
| * \ Merge branch 'pb/strbuf-read-file-doc' into maintJunio C Hamano2016-07-061-0/+2
| |\ \
| * \ \ Merge branch 'jk/fetch-prune-doc' into maintJunio C Hamano2016-07-061-1/+1
| |\ \ \
| * \ \ \ Merge branch 'pc/occurred' into maintJunio C Hamano2016-07-062-2/+2
| |\ \ \ \
| * \ \ \ \ Merge branch 'mg/cherry-pick-multi-on-unborn' into maintJunio C Hamano2016-07-061-5/+6
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'em/newer-freebsd-shells-are-fine-with-returns' into maintJunio C Hamano2016-07-063-6/+6
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'lv/status-say-working-tree-not-directory' into maintJunio C Hamano2016-07-061-1/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'nb/gnome-keyring-build' into maintJunio C Hamano2016-07-061-2/+3
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'et/add-chmod-x' into maintJunio C Hamano2016-07-066-20/+68
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jk/avoid-unbounded-alloca' into maintJunio C Hamano2016-07-061-6/+16
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'rj/compat-regex-size-max-fix' into maintJunio C Hamano2016-07-062-2/+1
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'vs/prompt-avoid-unset-variable' into maintJunio C Hamano2016-07-061-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sg/reflog-past-root' into maintJunio C Hamano2016-07-063-1/+29
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dn/gpg-doc' into maintJunio C Hamano2016-07-062-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ap/git-svn-propset-doc' into maintJunio C Hamano2016-07-061-0/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tr/doc-tt' into maintJunio C Hamano2016-07-0636-217/+224
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | mailmap: use main email address for dturnerDavid Turner2016-07-061-0/+1
* | | | | | | | | | | | | | | | | | Merge branch 'jc/t2300-setup'Junio C Hamano2016-07-061-1/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | t2300: "git --exec-path" is not usable in $PATH on Windows as-isjc/t2300-setupJohannes Schindelin2016-06-221-1/+9
* | | | | | | | | | | | | | | | | | | Merge branch 'ao/p4-has-branch-prefix-fix'Junio C Hamano2016-07-061-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | git-p4: correct hasBranchPrefix verbose outputao/p4-has-branch-prefix-fixAndrew Oakley2016-06-221-1/+1
* | | | | | | | | | | | | | | | | | | | Merge branch 'cb/t7810-test-label-fix'Junio C Hamano2016-07-061-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | t7810: fix duplicated test titlecb/t7810-test-label-fixCharles Bailey2016-06-211-1/+1
* | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/t5614-modernize'Junio C Hamano2016-07-061-50/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | t5614: don't use subshellssb/t5614-modernizeStefan Beller2016-06-211-50/+20
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/perf-on-apple'Junio C Hamano2016-07-062-1/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | perf: accommodate for MacOSXjs/perf-on-appleJohannes Schindelin2016-06-212-1/+7
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ak/t7800-wo-readlink'Junio C Hamano2016-07-061-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | t7800: readlink may not be availableak/t7800-wo-readlinkArmin Kunaschik2016-06-211-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/tzoffset-fix'Junio C Hamano2016-07-063-17/+71
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | local_tzoffset: detect errors from tm_to_time_tJeff King2016-06-202-0/+7
| * | | | | | | | | | | | | | | | | | | | | | | | t0006: test various date formatsJeff King2016-06-202-0/+47
| * | | | | | | | | | | | | | | | | | | | | | | | t0006: rename test-date's "show" to "relative"Jeff King2016-06-202-17/+17
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/mingw-parameter-less-c-functions'Junio C Hamano2016-07-063-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | mingw: let the build succeed with DEVELOPER=1js/mingw-parameter-less-c-functionsJohannes Schindelin2016-06-203-6/+6
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'lc/shell-default-value-noexpand'Junio C Hamano2016-07-061-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | sh-setup: enclose setting of ${VAR=default} in double-quoteslc/shell-default-value-noexpandLE Manh Cuong2016-06-191-3/+3
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/clone-shallow-passthru'Junio C Hamano2016-07-063-8/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | clone: do not let --depth imply --shallow-submodulessb/clone-shallow-passthruJunio C Hamano2016-06-203-8/+21
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/gpg-interface-cleanup'Junio C Hamano2016-07-064-71/+214
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | gpg-interface: check gpg signature creation statusjk/gpg-interface-cleanupMichael J Gruber2016-06-172-3/+14
| * | | | | | | | | | | | | | | | | | | | | | | | | | | sign_buffer: use pipe_commandJeff King2016-06-171-19/+5
| * | | | | | | | | | | | | | | | | | | | | | | | | | | verify_signed_buffer: use pipe_commandJeff King2016-06-171-19/+3
| * | | | | | | | | | | | | | | | | | | | | | | | | | | run-command: add pipe_command helperJeff King2016-06-172-12/+171