Merge branch 'en/directory-renames-nothanks'

Junio C Hamano committed about 8 years ago

Merge branch 'pw/rebase-i-author-script-fix'

Junio C Hamano committed about 8 years ago

Documentation/git.txt: clarify that GIT_TRACE=/path appends

SZEDER Gábor committed about 8 years ago

bisect.c: make show_list() build again

Nguyễn Thái Ngọc Duy committed about 8 years ago

rebase -i: be careful to wrap up fixup/squash chains

Johannes Schindelin committed about 8 years ago

rebase -i --autosquash: demonstrate a problem skipping the last squash

Johannes Schindelin committed about 8 years ago

pack-bitmap: drop "loaded" flag

Jeff King committed about 8 years ago

traverse_bitmap_commit_list(): don't free result

Jeff King committed about 8 years ago

t5310: test delta reuse with bitmaps

Jeff King committed about 8 years ago

bitmap_has_sha1_in_uninteresting(): drop BUG check

Jeff King committed about 8 years ago

l10n: git.pot: v2.19.0 round 2 (3 new, 5 removed)

Jiang Xin committed about 8 years ago

Merge branch 'master' of git://github.com/git-l10n/git-po

Jiang Xin committed about 8 years ago

fetch: stop clobbering existing tags without --force

Ævar Arnfjörð Bjarmason committed about 8 years ago

fetch: document local ref updates with/without --force

Ævar Arnfjörð Bjarmason committed about 8 years ago

push doc: correct lies about how push refspecs work

Ævar Arnfjörð Bjarmason committed about 8 years ago

push doc: move mention of "tag <tag>" later in the prose

Ævar Arnfjörð Bjarmason committed about 8 years ago

push doc: remove confusing mention of remote merger

Ævar Arnfjörð Bjarmason committed about 8 years ago

fetch tests: add a test for clobbering tag behavior

Ævar Arnfjörð Bjarmason committed about 8 years ago

push tests: use spaces in interpolated string

Ævar Arnfjörð Bjarmason committed about 8 years ago

push tests: make use of unused $1 in test description

Ævar Arnfjörð Bjarmason committed about 8 years ago