2 Commits (4de066b6f12a17b2b4d3206ee66efb251e1cdd29)

Author SHA1 Message Date
Avery Pennarun ee2c79552a Teach git-pull to pass -X<option> to git-merge 15 years ago
Avery Pennarun 8cc5b29065 git merge -X<option> 15 years ago