mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-05 00:37:55 +01:00
Code Activity
git/contrib/examples
History
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 Merge branch 'db/checkout' 2008-02-27 12:53:26 -08:00
git-clean.sh Make git-clean a builtin 2007-11-18 19:11:42 -08:00
git-clone.sh Merge branch 'db/clone-in-c' 2008-05-25 13:41:37 -07:00
git-commit.sh examples/commit: use --abbrev for commit summary 2010-07-27 13:29:32 -07:00
git-fetch.sh Honor "tagopt = --tags" configuration option 2010-04-19 16:34:49 -07:00
git-gc.sh Supplant the "while case ... break ;; esac" idiom 2007-09-23 16:12:00 -07:00
git-ls-remote.sh Build in ls-remote 2007-11-05 12:25:42 -08:00
git-merge-ours.sh Merge branch 'maint' 2007-11-28 17:06:57 -08:00
git-merge.sh merge script: learn --[no-]rerere-autoupdate 2010-08-18 14:02:05 -07:00
git-notes.sh Builtin-ify git-notes 2010-02-13 19:36:13 -08:00
git-remote.perl Typo "does not exists" when git remote update remote. 2008-10-16 08:20:15 -07:00
git-rerere.perl Resurrect git-rerere to contrib/examples 2008-03-16 01:11:07 -07:00
git-reset.sh Merge branch 'maint' 2007-09-23 17:13:55 -07:00
git-resolve.sh Use 'fast-forward' all over the place 2009-10-24 23:50:28 -07:00
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 Fix typo in contrib/examples/git-svnimport.txt 2009-02-25 08:33:14 -08:00
git-tag.sh Replace uses of "git-var" with "git var" 2008-07-30 11:42:01 -07:00
git-verify-tag.sh Supplant the "while case ... break ;; esac" idiom 2007-09-23 16:12:00 -07:00
README contrib/examples/README: give an explanation of the status of these files 2009-01-12 17:47:36 -08:00

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.