summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* log: fix regression to "--source" when "--decorate" was updatedlt/oneline-decoration-at-endLinus Torvalds2017-02-214-8/+16
* show decorations at the end of the lineLinus Torvalds2017-02-143-14/+19
* Git 2.12-rc1v2.12.0-rc1Junio C Hamano2017-02-102-1/+16
* Merge branch 'nd/rev-list-all-includes-HEAD-doc'Junio C Hamano2017-02-101-2/+2
|\
| * rev-list-options.txt: update --all about HEADnd/rev-list-all-includes-HEAD-docNguyễn Thái Ngọc Duy2017-02-081-2/+2
* | Merge branch 'rs/fill-directory-optim'Junio C Hamano2017-02-101-4/+3
|\ \
| * | dir: avoid allocation in fill_directory()rs/fill-directory-optimRené Scharfe2017-02-081-4/+3
* | | Merge branch 'jk/log-graph-name-only'Junio C Hamano2017-02-102-0/+49
|\ \ \
| * | | diff: print line prefix for --name-only outputjk/log-graph-name-onlyJeff King2017-02-082-0/+49
* | | | Merge branch 'da/t7800-cleanup'Junio C Hamano2017-02-101-12/+19
|\ \ \ \
| * | | | t7800: replace "wc -l" with test_line_countda/t7800-cleanupDavid Aguilar2017-02-081-12/+19
| * | | | Merge branch 'da/difftool-dir-diff-fix' into da/t7800-cleanupJunio C Hamano2017-02-082-3/+45
| |\ \ \ \
* | \ \ \ \ Merge branch 'dl/difftool-doc-no-gui-option'Junio C Hamano2017-02-101-2/+3
|\ \ \ \ \ \
| * | | | | | Document the --no-gui option in difftooldl/difftool-doc-no-gui-optionDenton Liu2017-02-081-2/+3
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'js/difftool-builtin'Junio C Hamano2017-02-102-4/+16
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | t7800: simplify basic usage testDavid Aguilar2017-02-081-8/+7
| * | | | | difftool: fix bug when printing usageDavid Aguilar2017-02-062-4/+17
* | | | | | Merge branch 'rs/p5302-create-repositories-before-tests'Junio C Hamano2017-02-101-0/+7
|\ \ \ \ \ \
| * | | | | | p5302: create repositories for index-pack results explicitlyrs/p5302-create-repositories-before-testsRené Scharfe2017-02-061-0/+7
* | | | | | | Merge branch 'ps/worktree-prune-help-fix'Junio C Hamano2017-02-101-2/+2
|\ \ \ \ \ \ \
| * | | | | | | worktree: fix option descriptions for `prune`ps/worktree-prune-help-fixPatrick Steinhardt2017-02-061-2/+2
* | | | | | | | Merge branch 'ew/complete-svn-authorship-options'Junio C Hamano2017-02-101-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | completion: fix git svn authorship switchesew/complete-svn-authorship-optionsEric Wong2017-02-061-2/+2
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'jk/reset-to-break-a-commit-doc'Junio C Hamano2017-02-101-0/+38
|\ \ \ \ \ \ \ \
| * | | | | | | | reset: add an example of how to split a commit into twoJacob Keller2017-02-031-0/+38
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'bw/push-submodule-only'Junio C Hamano2017-02-102-7/+8
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | completion: add completion for --recurse-submodules=onlybw/push-submodule-onlyCornelius Weig2017-02-011-1/+1
| * | | | | | | doc: add doc for git-push --recurse-submodules=onlyCornelius Weig2017-02-011-6/+7
* | | | | | | | 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