Linus Torvalds 3ba513c32e Make "git resolve" take the merge message in $3 ...

It used to do "Merge $3" as the message, but that ends up being
inconvenient, and much more easily done inside git-pull-script instead.

This makes the third argument to "git resolve" much easier to explain.

2005-07-08 17:38:44 -07:00

1.6 KiB

Executable File

Raw Blame History

View Raw