mirror of
https://github.com/git/git.git
synced 2025-03-29 16:34:25 +00:00
67ac1e1d57
For example, this would allow cherry-picking or reverting patches from a piece of history with a different end-of-line style, like so: $ git revert -Xrenormalize old-problematic-commit Currently that is possible with manual use of merge-recursive but the cherry-pick/revert porcelain does not expose the functionality. While at it, document the existing support for --strategy. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
These are original scripted implementations, kept primarily for their reference value to any aspiring plumbing users who want to learn how pieces can be fit together.