Merge git://ozlabs.org/~paulus/gitk

Junio C Hamano committed over 7 years ago

merge: tweak --rerere-autoupdate documentation

Phillip Wood committed over 7 years ago

am/cherry-pick/rebase/revert: document --rerere-autoupdate

Phillip Wood committed over 7 years ago

gitk: Update Bulgarian translation (317t)

Alexander Shopov committed over 7 years ago

gc: remove redundant check for gc_auto_threshold

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

get_oid(): when an object was not found, try harder

Johannes Schindelin committed over 7 years ago

sequencer: move stale comment into correct location

Johannes Schindelin committed over 7 years ago

sequencer: improve error message when an OID could not be parsed

Johannes Schindelin committed over 7 years ago

rebase -i: demonstrate obscure loose object cache bug

Johannes Schindelin committed over 7 years ago

t9811-git-p4-label-import: fix pipeline negation

SZEDER Gábor committed over 7 years ago

git p4 test: disable '-x' tracing in the p4d watchdog loop

SZEDER Gábor committed over 7 years ago

git p4 test: simplify timeout handling

SZEDER Gábor committed over 7 years ago

git p4 test: clean up the p4d cleanup functions

SZEDER Gábor committed over 7 years ago

git p4 test: use 'test_atexit' to kill p4d and the watchdog process

Johannes Schindelin committed over 7 years ago

t0301-credential-cache: use 'test_atexit' to stop the credentials helper

SZEDER Gábor committed over 7 years ago

tests: use 'test_atexit' to stop httpd

SZEDER Gábor committed over 7 years ago

git-daemon: use 'test_atexit` to stop 'git-daemon'

Johannes Schindelin committed over 7 years ago

test-lib: introduce 'test_atexit'

Johannes Schindelin committed over 7 years ago

t/lib-git-daemon: make sure to kill the 'git-daemon' process

SZEDER Gábor committed over 7 years ago

test-lib: fix interrupt handling with 'dash' and '--verbose-log -x'

SZEDER Gábor committed over 7 years ago