Re: How to switch kernel customizations from 2.6.15.6 to 2.6.16?
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:42:22
Subsystem:
kernel build + files below scripts/ (unless maintained elsewhere), the rest · Maintainers:
Nathan Chancellor, Nicolas Schier, Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-06-15 · How to switch kernel customizations from 2.6.15.6 to 2.6.16? · Matt McCutchen <hidden>
- 2016-06-15 · Re: How to switch kernel customizations from 2.6.15.6 to 2.6.16? · Linus Torvalds <torvalds@osdl.org>
- 2016-06-15 · Re: How to switch kernel customizations from 2.6.15.6 to 2.6.16? · Shawn Pearce <hidden>
- 2016-06-15 · Re: How to switch kernel customizations from 2.6.15.6 to 2.6.16? · Junio C Hamano <hidden>
- 2016-06-15 · Re: How to switch kernel customizations from 2.6.15.6 to 2.6.16? · Junio C Hamano <hidden>
Linus Torvalds [off-list ref] writes:
In contrast, here's an alternate workflow that is much easier to explain, and doesn't involve "rebase" at all: git checkout his git cherry-pick origin..mine
Yes, I think it would be good to deprecate/discard the current rebase and make cherry-pick the recommended workflow. Optionally. I've been thinking about not using git-cherry while cherrypicking, because falling back to three-way merge seems to work equally well in dealing with "patch already applied" case. Anyway, teaching the range notation to cherry-pick would be something like this, I suppose. ---
diff --git a/git-cherry-pick.sh b/git-cherry-pick.sh
new file mode 100755
index 0000000..72a3828
--- /dev/null
+++ b/git-cherry-pick.sh@@ -0,0 +1,6 @@ +#!/bin/sh + +. git-sh-setup + +git-format-patch --stdout --full-index -k "$@" | +git-am --binary -3 -k
diff --git a/Makefile b/Makefile
index d945546..e130d8c 100644
--- a/Makefile
+++ b/Makefile@@ -114,7 +114,7 @@ ### --- END CONFIGURATION SECTION --- SCRIPT_SH = \ git-add.sh git-bisect.sh git-branch.sh git-checkout.sh \ - git-cherry.sh git-clone.sh git-commit.sh \ + git-cherry.sh git-cherry-pick.sh git-clone.sh git-commit.sh \ git-count-objects.sh git-diff.sh git-fetch.sh \ git-format-patch.sh git-log.sh git-ls-remote.sh \ git-merge-one-file.sh git-parse-remote.sh \
@@ -139,7 +139,7 @@ SCRIPT_PYTHON = \ SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \ $(patsubst %.perl,%,$(SCRIPT_PERL)) \ $(patsubst %.py,%,$(SCRIPT_PYTHON)) \ - git-cherry-pick git-show git-status + git-show git-status # The ones that do not have to link with lcrypto nor lz. SIMPLE_PROGRAMS = \
@@ -484,9 +484,6 @@ common-cmds.h: Documentation/git-*.txt -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \ $@.py >$@ chmod +x $@ - -git-cherry-pick: git-revert - cp $< $@ git-show: git-whatchanged cp $< $@