Revert "contrib: subtree: adjust test to change in fmt-merge-msg"

Emily Shaffer committed about 6 years ago

docs: improve the example that illustrates git-notes path names

Noam Yorav-Raphael committed about 6 years ago

checkout: support renormalization with checkout -m <paths>

Elijah Newren committed about 6 years ago

merge: make merge.renormalize work for all uses of merge machinery

Elijah Newren committed about 6 years ago

t6038: remove problematic test

Elijah Newren committed about 6 years ago

t6038: make tests fail for the right reason

Elijah Newren committed about 6 years ago

bisect: use oid_to_hex_r() instead of memcpy()+oid_to_hex()

René Scharfe committed about 6 years ago

merge-recursive: fix unclear and outright wrong comments

Elijah Newren committed about 6 years ago

t1450: fix quoting of NUL byte when corrupting pack

Martin Ågren committed about 6 years ago

Third batch

Junio C Hamano committed about 6 years ago

Merge branch 'cc/pretty-contents-size' into master

Junio C Hamano committed about 6 years ago

Merge branch 'hn/reftable' into master

Junio C Hamano committed about 6 years ago

Merge branch 'jc/fmt-merge-msg-suppress-destination' into master

Junio C Hamano committed about 6 years ago

worktree: retire special-case normalization of main worktree path

Eric Sunshine committed about 6 years ago

worktree: drop bogus and unnecessary path munging

Eric Sunshine committed about 6 years ago

worktree: drop unused code from get_linked_worktree()

Eric Sunshine committed about 6 years ago

worktree: drop pointless strbuf_release()

Eric Sunshine committed about 6 years ago

t6300: fix issues related to %(contents:size)

Alban Gruin committed about 6 years ago

refs: move the logic to add \t to reflog to the files backend

Han-Wen Nienhuys committed about 6 years ago

The second batch -- mostly minor typofixes

Junio C Hamano committed about 6 years ago