merge script: notice @{-1} shorthand

Jonathan Nieder committed about 16 years ago

merge script: handle --no-ff --no-commit correctly

Jonathan Nieder committed about 16 years ago

merge script: --ff-only to disallow true merge

Jonathan Nieder committed about 16 years ago

merge script: handle many-way octopus

Jonathan Nieder committed about 16 years ago

merge script: handle -m --log correctly

Jonathan Nieder committed about 16 years ago

merge script: forbid merge -s index

Jonathan Nieder committed about 16 years ago

merge script: allow custom strategies

Jonathan Nieder committed about 16 years ago

merge script: merge -X<option>

Jonathan Nieder committed about 16 years ago

merge script: improve log message subject

Jonathan Nieder committed about 16 years ago

merge script: refuse to merge during merge

Jonathan Nieder committed about 16 years ago

merge script: tweak unmerged files message to match builtin

Jonathan Nieder committed about 16 years ago

merge script: --squash, --ff from unborn branch are errors

Jonathan Nieder committed about 16 years ago

fmt-merge-msg -m to override merge title

Jonathan Nieder committed about 16 years ago

merge-base --independent to print reduced parent list in a merge

Jonathan Nieder committed about 16 years ago

merge-base --octopus to mimic show-branch --merge-base

Jonathan Nieder committed about 16 years ago

Documentation: add a SEE ALSO section for merge-base

Jonathan Nieder committed about 16 years ago

t6200 (fmt-merge-msg): style nitpicks

Jonathan Nieder committed about 16 years ago

t6010 (merge-base): modernize style

Jonathan Nieder committed about 16 years ago

t7600 (merge): test merge from branch yet to be born

Jonathan Nieder committed about 16 years ago

t7600 (merge): check reflog entry

Jonathan Nieder committed about 16 years ago