projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "git-push: avoid falling back on pushing "matching" refs."
[git.git]
/
Documentation
/
howto
/
rebase-from-internal-branch.txt
diff --git
a/Documentation/howto/rebase-from-internal-branch.txt
b/Documentation/howto/rebase-from-internal-branch.txt
index
4523b69
..
c2d4a91
100644
(file)
--- a/
Documentation/howto/rebase-from-internal-branch.txt
+++ b/
Documentation/howto/rebase-from-internal-branch.txt
@@
-40,10
+40,7
@@
So I started from master, made a bunch of edits, and committed:
$ git checkout master
$ cd Documentation; ed git.txt ...
$ cd ..; git add Documentation/*.txt
$ git checkout master
$ cd Documentation; ed git.txt ...
$ cd ..; git add Documentation/*.txt
- $ git commit -s -v
-
-NOTE. The -v flag to commit is a handy way to make sure that
-your additions are not introducing bogusly formatted lines.
+ $ git commit -s
After the commit, the ancestry graph would look like this:
After the commit, the ancestry graph would look like this:
@@
-98,7
+95,7
@@
to do cherrypicking using only the core GIT tools.
Let's go back to the earlier picture, with different labels.
You, as an individual developer, cloned upstream repository and
Let's go back to the earlier picture, with different labels.
You, as an individual developer, cloned upstream repository and
-
am
de a couple of commits on top of it.
+
ma
de a couple of commits on top of it.
*your "master" head
upstream --> #1 --> #2 --> #3
*your "master" head
upstream --> #1 --> #2 --> #3
@@
-111,7
+108,7
@@
prepare #2 and #3 for e-mail submission.
This creates two files, 0001-XXXX.txt and 0002-XXXX.txt. Send
them out "To: " your project maintainer and "Cc: " your mailing
This creates two files, 0001-XXXX.txt and 0002-XXXX.txt. Send
them out "To: " your project maintainer and "Cc: " your mailing
-list. You could use contributed script git-send-email
-script
if
+list. You could use contributed script git-send-email if
your host has necessary perl modules for this, but your usual
MUA would do as long as it does not corrupt whitespaces in the
patch.
your host has necessary perl modules for this, but your usual
MUA would do as long as it does not corrupt whitespaces in the
patch.