X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Fhowto%2Frebase-from-internal-branch.txt;h=c2d4a91c7cf0a631ffd3caadea8a6aa25aa4a24c;hb=e23d0b4a4a55cc07e133905f0e9526b3550dd61b;hp=4523b69d4fc018a67835e0751f08c9be17635d65;hpb=51017101c7a308745ba3c04944457f1dc6a55780;p=git.git diff --git a/Documentation/howto/rebase-from-internal-branch.txt b/Documentation/howto/rebase-from-internal-branch.txt index 4523b69d..c2d4a91c 100644 --- 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 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: @@ -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 -amde a couple of commits on top of it. +made a couple of commits on top of it. *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 -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.