summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2019-04-22Merge branch 'da/smerge'Junio C Hamano3-1/+15
2019-04-22Merge branch 'dl/flex-str-cocci'Junio C Hamano2-1/+14
2019-04-22Merge branch 'js/spell-out-options-in-tests'Junio C Hamano12-43/+75
2019-04-22Merge branch 'nd/read-tree-reset-doc'Junio C Hamano1-2/+3
2019-04-22Merge branch 'nd/interpret-trailers-docfix'Junio C Hamano1-1/+1
2019-04-22Merge branch 'sg/asciidoctor-in-ci'Junio C Hamano5-36/+46
2019-04-22Merge branch 'tz/asciidoctor-fixes'Junio C Hamano2-15/+19
2019-04-22Merge branch 'js/check-docs-exe'Junio C Hamano8-41/+10
2019-04-22Merge branch 'nd/include-if-wildmatch'Junio C Hamano2-1/+14
2019-04-22Merge branch 'cb/doco-mono'Junio C Hamano18-67/+70
2019-04-22Merge branch 'tg/stash-in-c-show-default-to-p-fix'Junio C Hamano2-0/+22
2019-04-22Merge branch 'js/stash-in-c-pathspec-fix'Junio C Hamano3-35/+50
2019-04-22Merge branch 'tb/stash-in-c-unused-param-fix'Junio C Hamano1-4/+4
2019-04-22Merge branch 'ps/stash-in-c'Junio C Hamano16-72/+2017
2019-04-21clone: do faster object check for partial clonesJosh Steadmon3-2/+29
2019-04-21worktree: update is_bare heuristicsJonathan Tan2-4/+34
2019-04-19rebase -i: run without forking rebase--interactivePhillip Wood1-135/+86
2019-04-19rebase: use a common action enumPhillip Wood1-43/+48
2019-04-19rebase -i: use struct rebase_options in do_interactive_rebase()Phillip Wood1-33/+36
2019-04-19rebase -i: use struct rebase_options to parse argsPhillip Wood1-91/+112
2019-04-19rebase -i: use struct object_id for squash_ontoPhillip Wood3-8/+33
2019-04-19rebase -i: use struct commit when parsing optionsPhillip Wood5-30/+55
2019-04-19rebase -i: remove duplicationPhillip Wood1-3/+2
2019-04-19rebase -i: combine rebase--interactive.c with rebase.cPhillip Wood3-378/+367
2019-04-19rebase: use OPT_RERERE_AUTOUPDATE()Phillip Wood1-17/+13
2019-04-19rebase: rename write_basic_state()Phillip Wood1-2/+2
2019-04-19rebase: don't translate trace stringsPhillip Wood1-8/+7
2019-04-19sequencer: always discard index after checkoutPhillip Wood3-12/+20
2019-04-19Merge branch 'ag/sequencer-reduce-rewriting-todo' into pw/rebase-i-internalJunio C Hamano5-480/+551
2019-04-19untracked-cache: simplify parsing by dropping "len"Jeff King1-8/+5
2019-04-19untracked-cache: simplify parsing by dropping "next"Jeff King1-13/+7
2019-04-19untracked-cache: be defensive about missing NULs in indexJeff King1-7/+11
2019-04-19t5304: add a test for pruning with bitmapsJeff King1-0/+8
2019-04-19Turn `git serve` into a test helperJohannes Schindelin9-30/+36
2019-04-19test-tool: handle the `-C <directory>` option just like `git`Johannes Schindelin1-0/+19
2019-04-19check-docs: do not bother checking for legacy scripts' documentationJohannes Schindelin1-1/+1
2019-04-19docs: exclude documentation for commands that have been excludedJohannes Schindelin3-0/+13
2019-04-19check-docs: allow command-list.txt to contain excluded commandsJohannes Schindelin1-1/+1
2019-04-19help -a: do not list commands that are excluded from the buildJohannes Schindelin2-3/+21
2019-04-19Makefile: drop the NO_INSTALL variableJohannes Schindelin1-13/+8
2019-04-19autoconf: #include <libintl.h> when checking for gettext()Vadim Kochan1-3/+13
2019-04-19cherry-pick/revert: add scissors line on merge conflictDenton Liu7-14/+122
2019-04-19sequencer.c: save and restore cleanup modePhillip Wood1-1/+27
2019-04-18merge: add scissors line on merge conflictDenton Liu4-7/+82
2019-04-18merge: cleanup messages like commitDenton Liu7-13/+128
2019-04-18parse-options.h: extract common --cleanup optionDenton Liu3-3/+3
2019-04-18commit: extract cleanup_mode functions to sequencerDenton Liu3-23/+37
2019-04-18t7502: clean up styleDenton Liu1-40/+53
2019-04-18t7604: clean up styleDenton Liu1-5/+7
2019-04-18t3507: clean up styleDenton Liu1-21/+21