tag doc: split up the --[no-]merged documentation

Ævar Arnfjörð Bjarmason committed over 9 years ago

tag doc: move the description of --[no-]merged earlier

Ævar Arnfjörð Bjarmason committed over 9 years ago

bundle: use prefix_filename with bundle path

Jeff King committed over 9 years ago

prefix_filename: simplify windows #ifdef

Jeff King committed over 9 years ago

prefix_filename: return newly allocated string

Jeff King committed over 9 years ago

prefix_filename: drop length parameter

Jeff King committed over 9 years ago

prefix_filename: move docstring to header file

Jeff King committed over 9 years ago

hash-object: fix buffer reuse with --path in a subdirectory

Jeff King committed over 9 years ago

t1400: use test_when_finished for cleanup

Kyle Meyer committed over 9 years ago

t1400: remove a set of unused output files

Kyle Meyer committed over 9 years ago

t1400: use test_path_is_* helpers

Kyle Meyer committed over 9 years ago

t1400: set core.logAllRefUpdates in "logged by touch" tests

Kyle Meyer committed over 9 years ago

t1400: rename test descriptions to be unique

Kyle Meyer committed over 9 years ago

Sync with 2.12.1

Junio C Hamano committed over 9 years ago

Merge branch 'js/difftool-builtin'

Junio C Hamano committed over 9 years ago

Git 2.12.1

Junio C Hamano committed over 9 years ago

push: mention "push.default=tracking" in the documentation

Ævar Arnfjörð Bjarmason committed over 9 years ago

git-commit.txt: list post-rewrite in HOOKS section

Nguyễn Thái Ngọc Duy committed over 9 years ago

doc: change erroneous --[no]-whatever into --[no-]whatever

Ævar Arnfjörð Bjarmason committed over 9 years ago

pickaxe: fix segfault with '-S<...> --pickaxe-regex'

SZEDER Gábor committed over 9 years ago