Merge branch 'ag/sequencer-reduce-rewriting-todo' into pw/rebase-i-internal

Junio C Hamano committed over 7 years ago

untracked-cache: simplify parsing by dropping "len"

Jeff King committed over 7 years ago

untracked-cache: simplify parsing by dropping "next"

Jeff King committed over 7 years ago

untracked-cache: be defensive about missing NULs in index

Jeff King committed over 7 years ago

t5304: add a test for pruning with bitmaps

Jeff King committed over 7 years ago

Turn `git serve` into a test helper

Johannes Schindelin committed over 7 years ago

test-tool: handle the `-C <directory>` option just like `git`

Johannes Schindelin committed over 7 years ago

check-docs: do not bother checking for legacy scripts' documentation

Johannes Schindelin committed over 7 years ago

docs: exclude documentation for commands that have been excluded

Johannes Schindelin committed over 7 years ago

check-docs: allow command-list.txt to contain excluded commands

Johannes Schindelin committed over 7 years ago

help -a: do not list commands that are excluded from the build

Johannes Schindelin committed over 7 years ago

Makefile: drop the NO_INSTALL variable

Johannes Schindelin committed over 7 years ago

autoconf: #include <libintl.h> when checking for gettext()

Vadim Kochan committed over 7 years ago

cherry-pick/revert: add scissors line on merge conflict

Denton Liu committed over 7 years ago

sequencer.c: save and restore cleanup mode

Phillip Wood committed over 7 years ago

merge: add scissors line on merge conflict

Denton Liu committed over 7 years ago

merge: cleanup messages like commit

Denton Liu committed over 7 years ago

parse-options.h: extract common --cleanup option

Denton Liu committed over 7 years ago

commit: extract cleanup_mode functions to sequencer

Denton Liu committed over 7 years ago

t7502: clean up style

Denton Liu committed over 7 years ago