summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | Documentation: add XSLT to fix DocBook for Texinfobrian m. carlson2017-01-232-3/+30
| * | | | | | | | Documentation: sort sources for gitman.texibrian m. carlson2017-01-231-1/+1
| * | | | | | | | Documentation: remove unneeded argument in cat-texi.perlbrian m. carlson2017-01-231-2/+2
| * | | | | | | | Documentation: modernize cat-texi.perlbrian m. carlson2017-01-231-6/+9
| * | | | | | | | Documentation: fix warning in cat-texi.perlbrian m. carlson2017-01-231-1/+1
* | | | | | | | | Merge branch 'sg/mailmap-self'Junio C Hamano2017-02-021-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | .mailmap: update Gábor Szeder's email addresssg/mailmap-selfSZEDER Gábor2017-01-311-0/+1
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'js/mingw-hooks-with-exe-suffix'Junio C Hamano2017-02-021-1/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | mingw: allow hooks to be .exe filesjs/mingw-hooks-with-exe-suffixJohannes Schindelin2017-01-301-1/+7
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'rs/receive-pack-cleanup'Junio C Hamano2017-02-021-2/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | receive-pack: call string_list_clear() unconditionallyrs/receive-pack-cleanupRené Scharfe2017-01-301-2/+1
| |/ / / / / / / /
* | | | | | | | | Merge branch 'mm/reset-facl-before-umask-test'Junio C Hamano2017-02-021-0/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t0001: don't let a default ACL interfere with the umask testmm/reset-facl-before-umask-testMatt McCutchen2017-01-301-0/+3
* | | | | | | | | | Merge branch 'hv/mingw-help-is-executable'Junio C Hamano2017-02-021-3/+18
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | help: improve is_executable() on Windowshv/mingw-help-is-executableHeiko Voigt2017-01-301-3/+18
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'gv/mingw-p4-mapuser'Junio C Hamano2017-02-021-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git-p4: fix git-p4.mapUser on Windowsgv/mingw-p4-mapuserGeorge Vanburgh2017-01-301-1/+1
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'rs/absolute-pathdup'Junio C Hamano2017-02-026-4/+18
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | use absolute_pathdup()rs/absolute-pathdupRené Scharfe2017-01-273-4/+4
| * | | | | | | | | | abspath: add absolute_pathdup()René Scharfe2017-01-263-0/+14
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge branch 'js/unzip-in-usr-bin-workaround'Junio C Hamano2017-02-021-1/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | test-lib: on FreeBSD, look for unzip(1) in /usr/local/bin/js/unzip-in-usr-bin-workaroundJohannes Schindelin2017-01-271-1/+3
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'cw/doc-sign-off'Junio C Hamano2017-02-021-7/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | doc: clarify distinction between sign-off and pgp-signingcw/doc-sign-offCornelius Weig2017-01-271-7/+6
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'js/status-pre-rebase-i'Junio C Hamano2017-02-022-4/+29
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | status: be prepared for not-yet-started interactive rebasejs/status-pre-rebase-iJohannes Schindelin2017-01-262-4/+29
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'js/retire-relink'Junio C Hamano2017-02-025-206/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | relink: really remove the commandjs/retire-relinkJunio C Hamano2017-01-252-203/+0
| * | | | | | | | | | relink: retire the commandJohannes Schindelin2017-01-255-3/+0
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'sb/submodule-add-force'Junio C Hamano2017-02-022-2/+22
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | submodule add: extend force flag to add existing repossb/submodule-add-forceStefan Beller2016-11-292-2/+22
* | | | | | | | | | | Sync with maintJunio C Hamano2017-01-311-0/+45
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Ready for 2.11.1Junio C Hamano2017-01-311-0/+45
| * | | | | | | | | | Merge branch 'sb/in-core-index-doc' into maintJunio C Hamano2017-01-313-22/+32
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'js/mingw-isatty' into maintJunio C Hamano2017-01-311-7/+4
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/coding-guidelines-update' into maintJunio C Hamano2017-01-311-5/+32
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/exec-path-coverity-workaround' into maintJunio C Hamano2017-01-311-6/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ad/bisect-terms' into maintJunio C Hamano2017-01-311-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/grep-e-could-be-extended-beyond-posix' into maintJunio C Hamano2017-01-311-11/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'km/branch-get-push-while-detached' into maintJunio C Hamano2017-01-312-3/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/rebase-i-squash-count-fix' into maintJunio C Hamano2017-01-311-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/blame-fixes' into maintJunio C Hamano2017-01-313-10/+166
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/archive-zip-userdiff-config' into maintJunio C Hamano2017-01-312-4/+25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dt/disable-bitmap-in-auto-gc' into maintJunio C Hamano2017-01-314-6/+45
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/config-misc-fixes' into maintJunio C Hamano2017-01-311-5/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/abbrev-autoscale-config' into maintJunio C Hamano2017-01-312-8/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mh/fast-import-notes-fix-new' into maintJunio C Hamano2017-01-312-3/+47
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/compression-config' into maintJunio C Hamano2017-01-319-31/+158
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ew/svn-fixes' into maintJunio C Hamano2017-01-312-2/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ls/travis-p4-on-macos' into maintJunio C Hamano2017-01-311-10/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \