Merge branch 'maint'

[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 b2c021d91723de411163a8379a017c594362beda..3b3a5c2e69e59d4708171ba745d7d4009788102b 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

-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
 
                               *your "master" head
    upstream --> #1 --> #2 --> #3


@@ -109,7 +106,7 @@ prepare #2 and #3 for e-mail submission.
 
     $ git format-patch master^^ master
 
 
     $ git format-patch master^^ master
 

-This creates two files, 0001-XXXX.txt and 0002-XXXX.txt.  Send
+This creates two files, 0001-XXXX.patch and 0002-XXXX.patch.  Send

 them out "To: " your project maintainer and "Cc: " your mailing
 list.  You could use contributed script git-send-email if
 your host has necessary perl modules for this, but your usual
 them out "To: " your project maintainer and "Cc: " your mailing
 list.  You could use contributed script git-send-email if
 your host has necessary perl modules for this, but your usual


@@ -127,7 +124,7 @@ up your changes, along with other changes.
 
 The two commits #2' and #3' in the above picture record the same
 changes your e-mail submission for #2 and #3 contained, but
 
 The two commits #2' and #3' in the above picture record the same
 changes your e-mail submission for #2 and #3 contained, but

-probably with the new sign-off line added by the upsteam
+probably with the new sign-off line added by the upstream

 maintainer and definitely with different committer and ancestry
 information, they are different objects from #2 and #3 commits.
 
 maintainer and definitely with different committer and ancestry
 information, they are different objects from #2 and #3 commits.