summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* pull: warn on --verify-signatures with --rebaseah/no-verify-signature-with-pull-rebaseAlexander Hirsch2016-05-202-0/+19
* Sync with 2.8.3Junio C Hamano2016-05-182-3/+35
|\
| * Git 2.8.3v2.8.3Junio C Hamano2016-05-184-5/+37
| * Merge branch 'sb/misc-cleanups' into HEADJunio C Hamano2016-05-186-21/+29
| |\
| * \ Merge branch 'ew/doc-split-pack-disables-bitmap' into HEADJunio C Hamano2016-05-184-9/+23
| |\ \
| * \ \ Merge branch 'sb/clean-test-fix' into HEADJunio C Hamano2016-05-181-1/+1
| |\ \ \
| * \ \ \ Merge branch 'rn/glossary-typofix' into HEADJunio C Hamano2016-05-181-1/+1
| |\ \ \ \
| * \ \ \ \ Merge branch 'ew/normal-to-e' into HEADJunio C Hamano2016-05-181-0/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'sb/config-exit-status-list' into HEADJunio C Hamano2016-05-181-3/+3
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'rt/string-list-lookup-cleanup' into HEADJunio C Hamano2016-05-181-4/+4
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jk/fix-attribute-macro-in-2.5' into HEADJunio C Hamano2016-05-181-1/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'sg/test-lib-simplify-expr-away' into HEADJunio C Hamano2016-05-181-5/+5
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'nd/remove-unused' into HEADJunio C Hamano2016-05-184-27/+0
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'sk/gitweb-highlight-encoding' into HEADJunio C Hamano2016-05-181-0/+3
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ls/travis-submitting-patches' into HEADJunio C Hamano2016-05-181-17/+63
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/close-packs-before-gc' into HEADJunio C Hamano2016-05-181-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ls/p4-lfs' into HEADJunio C Hamano2016-05-183-10/+24
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ls/p4-lfs-test-fix-2.7.0' into HEADJunio C Hamano2016-05-181-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nf/mergetool-prompt' into HEADJunio C Hamano2016-05-184-5/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jd/send-email-to-whom' into HEADJunio C Hamano2016-05-181-2/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/win32-mmap' into HEADJunio C Hamano2016-05-181-13/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/push-client-deadlock-fix' into HEADJunio C Hamano2016-05-187-11/+29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sb/mv-submodule-fix' into HEADJunio C Hamano2016-05-182-9/+28
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'da/user-useconfigonly' into HEADJunio C Hamano2016-05-181-6/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ld/p4-test-py3' into HEADJunio C Hamano2016-05-182-6/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/push-client-deadlock-fix'Junio C Hamano2016-05-182-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Windows: only add a no-op pthread_sigmask() when neededjk/push-client-deadlock-fixJohannes Schindelin2016-05-111-0/+2
| * | | | | | | | | | | | | | | | | | | | | | | Windows: add pthread_sigmask() that does nothingJohannes Sixt2016-05-022-0/+6
* | | | | | | | | | | | | | | | | | | | | | | | Thirteenth batch for 2.9Junio C Hamano2016-05-171-6/+78
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'kf/gpg-sig-verification-doc'Junio C Hamano2016-05-172-4/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | Documentation: clarify signature verificationkf/gpg-sig-verification-docKeller Fuchs2016-05-132-4/+7
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/windows-dotgit'Junio C Hamano2016-05-178-3/+147
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | mingw: remove unnecessary definitionjs/windows-dotgitJohannes Schindelin2016-05-111-3/+0
| * | | | | | | | | | | | | | | | | | | | | | | | | mingw: introduce the 'core.hideDotFiles' settingJohannes Schindelin2016-05-117-0/+147
| |/ / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'va/mailinfo-doc-typofix'Junio C Hamano2016-05-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | Documentation/git-mailinfo: fix typova/mailinfo-doc-typofixVasco Almeida2016-05-111-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/test-send-sh-x-trace-elsewhere'Junio C Hamano2016-05-172-3/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | test-lib: set BASH_XTRACEFD automaticallyjk/test-send-sh-x-trace-elsewhereJeff King2016-05-112-3/+16
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/http-custom-headers'Junio C Hamano2016-05-172-6/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | submodule: ensure that -c http.extraheader is heededjs/http-custom-headersJohannes Schindelin2016-05-101-1/+10
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/submodule-c-credential' into js/http-custom-headersJunio C Hamano2016-05-109-27/+140
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | t5551: make the test for extra HTTP headers more robustJohannes Schindelin2016-05-101-1/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | tests: adjust the configuration for Apache 2.2Johannes Schindelin2016-05-101-4/+12
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/rebase-interative-eval-fix'Junio C Hamano2016-05-171-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | rebase--interactive: avoid empty list in shell for-loopjk/rebase-interative-eval-fixjk/rebase-interactive-eval-fixJeff King2016-05-101-0/+1
| | |_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/fsck-nul-in-commit'Junio C Hamano2016-05-172-3/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | fsck: detect and warn a commit with embedded NULjc/fsck-nul-in-commitJunio C Hamano2016-05-102-0/+26
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | fsck_commit_buffer(): do not special case the last validationJunio C Hamano2016-04-141-3/+5
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/test-helpers'Junio C Hamano2016-05-171-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wrap-for-bin.sh: regenerate bin-wrappers when switching branchesDuy Nguyen2016-05-101-0/+1