aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
* | | | | | | | | Merge branch 'sg/mailmap-self'Junio C Hamano2017-02-02
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | .mailmap: update Gábor Szeder's email addressSZEDER Gábor2017-01-31
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'js/mingw-hooks-with-exe-suffix'Junio C Hamano2017-02-02
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | mingw: allow hooks to be .exe filesJohannes Schindelin2017-01-30
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'rs/receive-pack-cleanup'Junio C Hamano2017-02-02
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | receive-pack: call string_list_clear() unconditionallyRené Scharfe2017-01-30
| |/ / / / / / / /
* | | | | | | | | Merge branch 'mm/reset-facl-before-umask-test'Junio C Hamano2017-02-02
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t0001: don't let a default ACL interfere with the umask testMatt McCutchen2017-01-30
* | | | | | | | | | Merge branch 'hv/mingw-help-is-executable'Junio C Hamano2017-02-02
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | help: improve is_executable() on WindowsHeiko Voigt2017-01-30
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'gv/mingw-p4-mapuser'Junio C Hamano2017-02-02
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git-p4: fix git-p4.mapUser on WindowsGeorge Vanburgh2017-01-30
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'rs/absolute-pathdup'Junio C Hamano2017-02-02
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | use absolute_pathdup()René Scharfe2017-01-27
| * | | | | | | | | | abspath: add absolute_pathdup()René Scharfe2017-01-26
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge branch 'js/unzip-in-usr-bin-workaround'Junio C Hamano2017-02-02
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | test-lib: on FreeBSD, look for unzip(1) in /usr/local/bin/Johannes Schindelin2017-01-27
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'cw/doc-sign-off'Junio C Hamano2017-02-02
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | doc: clarify distinction between sign-off and pgp-signingCornelius Weig2017-01-27
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'js/status-pre-rebase-i'Junio C Hamano2017-02-02
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | status: be prepared for not-yet-started interactive rebaseJohannes Schindelin2017-01-26
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'js/retire-relink'Junio C Hamano2017-02-02
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | relink: really remove the commandJunio C Hamano2017-01-25
| * | | | | | | | | | relink: retire the commandJohannes Schindelin2017-01-25
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'sb/submodule-add-force'Junio C Hamano2017-02-02
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | submodule add: extend force flag to add existing reposStefan Beller2016-11-29
* | | | | | | | | | | Sync with maintJunio C Hamano2017-01-31
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Ready for 2.11.1Junio C Hamano2017-01-31
| * | | | | | | | | | Merge branch 'sb/in-core-index-doc' into maintJunio C Hamano2017-01-31
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'js/mingw-isatty' into maintJunio C Hamano2017-01-31
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/coding-guidelines-update' into maintJunio C Hamano2017-01-31
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/exec-path-coverity-workaround' into maintJunio C Hamano2017-01-31
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ad/bisect-terms' into maintJunio C Hamano2017-01-31
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/grep-e-could-be-extended-beyond-posix' into maintJunio C Hamano2017-01-31
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'km/branch-get-push-while-detached' into maintJunio C Hamano2017-01-31
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/rebase-i-squash-count-fix' into maintJunio C Hamano2017-01-31
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/blame-fixes' into maintJunio C Hamano2017-01-31
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/archive-zip-userdiff-config' into maintJunio C Hamano2017-01-31
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dt/disable-bitmap-in-auto-gc' into maintJunio C Hamano2017-01-31
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/config-misc-fixes' into maintJunio C Hamano2017-01-31
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/abbrev-autoscale-config' into maintJunio C Hamano2017-01-31
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mh/fast-import-notes-fix-new' into maintJunio C Hamano2017-01-31
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/compression-config' into maintJunio C Hamano2017-01-31
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ew/svn-fixes' into maintJunio C Hamano2017-01-31
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ls/travis-p4-on-macos' into maintJunio C Hamano2017-01-31
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/make-tags-find-sources-tweak' into maintJunio C Hamano2017-01-31
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/latin-1' into maintJunio C Hamano2017-01-31
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Eighth batch for 2.12Junio C Hamano2017-01-31
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/fsck-connectivity-check-fix'Junio C Hamano2017-01-31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | fsck: lazily load types under --connectivity-onlyJeff King2017-01-26