summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | submodule absorbing: fix worktree/gitdir pointers recursively for non-movessb/submodule-recursive-absorbStefan Beller2017-01-262-16/+73
| * | | | | | | | | | cache.h: expose the dying procedure for reading gitlinksStefan Beller2017-01-262-22/+27
| * | | | | | | | | | setup: add gentle version of resolve_git_dirStefan Beller2017-01-262-3/+5
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'sb/unpack-trees-super-prefix'Junio C Hamano2017-02-035-676/+702
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | unpack-trees: support super-prefix optionsb/unpack-trees-super-prefixStefan Beller2017-01-253-4/+49
| * | | | | | | | | | t1001: modernize styleStefan Beller2017-01-111-321/+320
| * | | | | | | | | | t1000: modernize styleStefan Beller2017-01-111-333/+315
| * | | | | | | | | | read-tree: use OPT_BOOL instead of OPT_SET_INTStefan Beller2017-01-111-18/+18
* | | | | | | | | | | Sync with v2.11.1Junio C Hamano2017-02-021-0/+3
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Git 2.11.1v2.11.1Junio C Hamano2017-02-021-0/+3
| * | | | | | | | | | Merge branch 'ws/request-pull-code-cleanup' into maintJunio C Hamano2017-02-021-3/+0
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/execv-dashed-external' into maintJunio C Hamano2017-02-023-21/+35
| |\ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | Ninth batch for 2.12; almost ready for -rc0Junio C Hamano2017-02-021-21/+50
* | | | | | | | | | | | | Merge branch 'nd/log-graph-configurable-colors'Junio C Hamano2017-02-026-5/+97
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | document behavior of empty color namend/log-graph-configurable-colorsJeff King2017-02-021-0/+3
| * | | | | | | | | | | | | color_parse_mem: allow empty color specJeff King2017-01-314-4/+25
| * | | | | | | | | | | | | log --graph: customize the graph lines with config log.graphColorsNguyễn Thái Ngọc Duy2017-01-233-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()ep/commit-static-buf-cleanupElia 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 Asciidoctorbc/use-asciidoctor-optbrian 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 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
| |/ / / / / / / / / / / / / / /