summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* reset: add an example of how to split a commit into twojk/reset-to-break-a-commit-doc-updatedJacob Keller2017-02-161-0/+48
* Revert "reset: add an example of how to split a commit into two"jk/reset-to-break-a-commit-docJunio C Hamano2017-02-161-38/+0
* reset: add an example of how to split a commit into twoJacob Keller2017-02-031-0/+38
* Git 2.12-rc0v2.12.0-rc0Junio C Hamano2017-02-032-7/+30
* Merge branch 'cw/log-updates-for-all-refs-really'Junio C Hamano2017-02-0315-30/+133
|\
| * doc: add note about ignoring '--no-create-reflog'cw/log-updates-for-all-refs-reallyCornelius Weig2017-02-012-0/+6
| * update-ref: add test cases for bare repositoryCornelius Weig2017-01-311-7/+36
| * refs: add option core.logAllRefUpdates = alwaysCornelius Weig2017-01-3114-20/+88
| * config: add markup to core.logAllRefUpdates docCornelius Weig2017-01-301-3/+3
* | Merge branch 'pl/complete-diff-submodule-diff'Junio C Hamano2017-02-031-1/+1
|\ \
| * | Completion: Add support for --submodule=diffpl/complete-diff-submodule-diffPeter Law2017-01-301-1/+1
| |/
* | Merge branch 'rs/object-id'Junio C Hamano2017-02-037-10/+10
|\ \
| * | checkout: convert post_checkout_hook() to struct object_idRené Scharfe2017-01-301-2/+2
| * | use oidcpy() for copying hashes between instances of struct object_idRené Scharfe2017-01-302-3/+3
| * | use oid_to_hex_r() for converting struct object_id hashes to hex stringsRené Scharfe2017-01-304-5/+5
| |/
* | Merge branch 'js/re-running-failed-tests'Junio C Hamano2017-02-031-0/+6
|\ \
| * | t/Makefile: add a rule to re-run previously-failed testsjs/re-running-failed-testsJohannes Schindelin2017-01-271-0/+6
| |/
* | Merge branch 'sb/submodule-update-initial-runs-custom-script'Junio C Hamano2017-02-032-1/+16
|\ \
| * | submodule update: run custom update script for initial populating as wellStefan Beller2017-01-262-1/+16
* | | Merge branch 'sb/submodule-recursive-absorb'Junio C Hamano2017-02-034-41/+105
|\ \ \
| * | | 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
View Lorry Controller Status