1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-07 17:53:12 +01:00
git/contrib/examples
Jonathan Nieder 67ac1e1d57 cherry-pick/revert: add support for -X/--strategy-option
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>
2010-12-28 11:27:56 -08:00
..
builtin-fetch--tool.c Change incorrect "remote branch" to "remote tracking branch" in C code 2010-11-03 09:20:47 -07:00
git-checkout.sh
git-clean.sh
git-clone.sh
git-commit.sh
git-fetch.sh
git-gc.sh
git-ls-remote.sh
git-merge-ours.sh
git-merge.sh merge script: learn --[no-]rerere-autoupdate 2010-08-18 14:02:05 -07:00
git-notes.sh
git-remote.perl
git-rerere.perl
git-reset.sh
git-resolve.sh
git-revert.sh cherry-pick/revert: add support for -X/--strategy-option 2010-12-28 11:27:56 -08:00
git-svnimport.perl Merge branch 'ab/require-perl-5.8' 2010-10-26 21:57:31 -07:00
git-svnimport.txt
git-tag.sh
git-verify-tag.sh
README

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.