Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | pull: warn on --verify-signatures with --rebaseah/no-verify-signature-with-pull-rebase | Alexander Hirsch | 2016-05-20 | 2 | -0/+19 |
* | Sync with 2.8.3 | Junio C Hamano | 2016-05-18 | 2 | -3/+35 |
|\ | |||||
| * | Git 2.8.3v2.8.3 | Junio C Hamano | 2016-05-18 | 4 | -5/+37 |
| * | Merge branch 'sb/misc-cleanups' into HEAD | Junio C Hamano | 2016-05-18 | 6 | -21/+29 |
| |\ | |||||
| * \ | Merge branch 'ew/doc-split-pack-disables-bitmap' into HEAD | Junio C Hamano | 2016-05-18 | 4 | -9/+23 |
| |\ \ | |||||
| * \ \ | Merge branch 'sb/clean-test-fix' into HEAD | Junio C Hamano | 2016-05-18 | 1 | -1/+1 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'rn/glossary-typofix' into HEAD | Junio C Hamano | 2016-05-18 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'ew/normal-to-e' into HEAD | Junio C Hamano | 2016-05-18 | 1 | -0/+1 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'sb/config-exit-status-list' into HEAD | Junio C Hamano | 2016-05-18 | 1 | -3/+3 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'rt/string-list-lookup-cleanup' into HEAD | Junio C Hamano | 2016-05-18 | 1 | -4/+4 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'jk/fix-attribute-macro-in-2.5' into HEAD | Junio C Hamano | 2016-05-18 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'sg/test-lib-simplify-expr-away' into HEAD | Junio C Hamano | 2016-05-18 | 1 | -5/+5 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'nd/remove-unused' into HEAD | Junio C Hamano | 2016-05-18 | 4 | -27/+0 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'sk/gitweb-highlight-encoding' into HEAD | Junio C Hamano | 2016-05-18 | 1 | -0/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ls/travis-submitting-patches' into HEAD | Junio C Hamano | 2016-05-18 | 1 | -17/+63 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/close-packs-before-gc' into HEAD | Junio C Hamano | 2016-05-18 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ls/p4-lfs' into HEAD | Junio C Hamano | 2016-05-18 | 3 | -10/+24 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ls/p4-lfs-test-fix-2.7.0' into HEAD | Junio C Hamano | 2016-05-18 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nf/mergetool-prompt' into HEAD | Junio C Hamano | 2016-05-18 | 4 | -5/+5 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jd/send-email-to-whom' into HEAD | Junio C Hamano | 2016-05-18 | 1 | -2/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/win32-mmap' into HEAD | Junio C Hamano | 2016-05-18 | 1 | -13/+18 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/push-client-deadlock-fix' into HEAD | Junio C Hamano | 2016-05-18 | 7 | -11/+29 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sb/mv-submodule-fix' into HEAD | Junio C Hamano | 2016-05-18 | 2 | -9/+28 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'da/user-useconfigonly' into HEAD | Junio C Hamano | 2016-05-18 | 1 | -6/+10 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ld/p4-test-py3' into HEAD | Junio C Hamano | 2016-05-18 | 2 | -6/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/push-client-deadlock-fix' | Junio C Hamano | 2016-05-18 | 2 | -0/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | Windows: only add a no-op pthread_sigmask() when neededjk/push-client-deadlock-fix | Johannes Schindelin | 2016-05-11 | 1 | -0/+2 |
| * | | | | | | | | | | | | | | | | | | | | | | | Windows: add pthread_sigmask() that does nothing | Johannes Sixt | 2016-05-02 | 2 | -0/+6 |
* | | | | | | | | | | | | | | | | | | | | | | | | Thirteenth batch for 2.9 | Junio C Hamano | 2016-05-17 | 1 | -6/+78 |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'kf/gpg-sig-verification-doc' | Junio C Hamano | 2016-05-17 | 2 | -4/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | Documentation: clarify signature verificationkf/gpg-sig-verification-doc | Keller Fuchs | 2016-05-13 | 2 | -4/+7 |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/windows-dotgit' | Junio C Hamano | 2016-05-17 | 8 | -3/+147 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | mingw: remove unnecessary definitionjs/windows-dotgit | Johannes Schindelin | 2016-05-11 | 1 | -3/+0 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | mingw: introduce the 'core.hideDotFiles' setting | Johannes Schindelin | 2016-05-11 | 7 | -0/+147 |
| |/ / / / / / / / / / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'va/mailinfo-doc-typofix' | Junio C Hamano | 2016-05-17 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | Documentation/git-mailinfo: fix typova/mailinfo-doc-typofix | Vasco Almeida | 2016-05-11 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/test-send-sh-x-trace-elsewhere' | Junio C Hamano | 2016-05-17 | 2 | -3/+16 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | test-lib: set BASH_XTRACEFD automaticallyjk/test-send-sh-x-trace-elsewhere | Jeff King | 2016-05-11 | 2 | -3/+16 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/http-custom-headers' | Junio C Hamano | 2016-05-17 | 2 | -6/+24 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | submodule: ensure that -c http.extraheader is heededjs/http-custom-headers | Johannes Schindelin | 2016-05-10 | 1 | -1/+10 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/submodule-c-credential' into js/http-custom-headers | Junio C Hamano | 2016-05-10 | 9 | -27/+140 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | t5551: make the test for extra HTTP headers more robust | Johannes Schindelin | 2016-05-10 | 1 | -1/+2 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | tests: adjust the configuration for Apache 2.2 | Johannes Schindelin | 2016-05-10 | 1 | -4/+12 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/rebase-interative-eval-fix' | Junio C Hamano | 2016-05-17 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rebase--interactive: avoid empty list in shell for-loopjk/rebase-interative-eval-fixjk/rebase-interactive-eval-fix | Jeff King | 2016-05-10 | 1 | -0/+1 |
| | |_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/fsck-nul-in-commit' | Junio C Hamano | 2016-05-17 | 2 | -3/+31 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fsck: detect and warn a commit with embedded NULjc/fsck-nul-in-commit | Junio C Hamano | 2016-05-10 | 2 | -0/+26 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fsck_commit_buffer(): do not special case the last validation | Junio C Hamano | 2016-04-14 | 1 | -3/+5 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/test-helpers' | Junio C Hamano | 2016-05-17 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wrap-for-bin.sh: regenerate bin-wrappers when switching branches | Duy Nguyen | 2016-05-10 | 1 | -0/+1 |