Documentation/gitdiffcore: Remove misleading date in heading

Michael J Gruber committed over 16 years ago

Documentation/git-reflog: Fix formatting of command lists

Michael J Gruber committed over 16 years ago

rev-list: fix --pretty=oneline with empty message

Erik Faye-Lund committed over 16 years ago

merge-recursive: add a label for ancestor

Jonathan Nieder committed over 16 years ago

cherry-pick, revert: add a label for ancestor

Jonathan Nieder committed over 16 years ago

revert: clarify label on conflict hunks

Jonathan Nieder committed over 16 years ago

compat: add mempcpy()

Jonathan Nieder committed over 16 years ago

checkout -m --conflict=diff3: add a label for ancestor

Jonathan Nieder committed over 16 years ago

merge_trees(): add ancestor label parameter for diff3-style output

Jonathan Nieder committed over 16 years ago

merge_file(): add comment explaining behavior wrt conflict style

Jonathan Nieder committed over 16 years ago

checkout --conflict=diff3: add a label for ancestor

Jonathan Nieder committed over 16 years ago

ll_merge(): add ancestor label parameter for diff3-style output

Jonathan Nieder committed over 16 years ago

merge-file --diff3: add a label for ancestor

Jonathan Nieder committed over 16 years ago

xdl_merge(): move file1 and file2 labels to xmparam structure

Jonathan Nieder committed over 16 years ago

xdl_merge(): add optional ancestor label to diff3-style output

Jonathan Nieder committed over 16 years ago

tests: document cherry-pick behavior in face of conflicts

Jonathan Nieder committed over 16 years ago

tests: document format of conflicts from checkout -m

Jonathan Nieder committed over 16 years ago

.mailmap: Entries for Alex Bennée, Deskin Miller, Vitaly "_Vi" Shukela

Michael J Gruber committed over 16 years ago

revert: fix tiny memory leak in cherry-pick --ff

Jonathan Nieder committed over 16 years ago

Update draft release notes to 1.7.1

Junio C Hamano committed over 16 years ago