summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'nd/log-graph-configurable-colors'Junio C Hamano2017-02-026-5/+97
|\
| * document behavior of empty color nameJeff King2017-02-021-0/+3
| * color_parse_mem: allow empty color specJeff King2017-02-014-4/+25
| * log --graph: customize the graph lines with config log.graphColorsNguyễn Thái Ngọc Duy2017-01-243-3/+63
| * color.c: trim leading spaces in color_parse_mem()Nguyễn Thái Ngọc Duy2017-01-191-1/+6
| * color.c: fix color_parse_mem() with value_len == 0Nguyễn Thái Ngọc Duy2017-01-191-0/+3
* | Merge branch 'ep/commit-static-buf-cleanup'Junio C Hamano2017-02-021-17/+14
|\ \
| * | builtin/commit.c: switch to strbuf, instead of snprintf()Elia Pinto2017-01-311-6/+4
| * | builtin/commit.c: remove the PATH_MAX limitation via dynamic allocationElia Pinto2017-01-131-11/+10
* | | Merge branch 'bc/use-asciidoctor-opt'Junio C Hamano2017-02-025-13/+88
|\ \ \
| * | | Documentation: implement linkgit macro for Asciidoctorbrian m. carlson2017-01-312-3/+29
| * | | Makefile: add a knob to enable the use of Asciidoctorbrian m. carlson2017-01-232-0/+18
| * | | Documentation: move dblatex arguments into variablebrian m. carlson2017-01-231-1/+2
| * | | 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 addressSZEDER Gábor2017-02-011-0/+1
* | | | | Merge branch 'js/mingw-hooks-with-exe-suffix'Junio C Hamano2017-02-021-1/+7
|\ \ \ \ \
| * | | | | mingw: allow hooks to be .exe filesJohannes Schindelin2017-01-301-1/+7
| | |/ / / | |/| | |
* | | | | Merge branch 'rs/receive-pack-cleanup'Junio C Hamano2017-02-021-2/+1
|\ \ \ \ \
| * | | | | receive-pack: call string_list_clear() unconditionallyRené Scharfe2017-01-311-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 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 WindowsHeiko 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 WindowsGeorge Vanburgh2017-01-301-1/+1
| |/ / / / /
* | | | | | Merge branch 'rs/absolute-pathdup'Junio C Hamano2017-02-026-4/+18
|\ \ \ \ \ \
| * | | | | | use absolute_pathdup()René 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/Johannes 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-signingCornelius 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 rebaseJohannes Schindelin2017-01-262-4/+29
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'js/retire-relink'Junio C Hamano2017-02-025-206/+0
|\ \ \ \ \ \ \
| * | | | | | | relink: really remove the commandJunio 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 reposStefan 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
| |\ \ \ \ \ \ \ \ \ \