Documentation: rebase-from-internal minor updates.
git-commit -v flag has been the default for quite some time, so do not mention it. Also a typofix. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano committed
Nov 19, 2005 at 19:21 UTC
22a06b3c474d256e945dbc0d2a830c3f467288b5
1 file changed
+2
-5
Documentation/howto/rebase-from-internal-branch.txt
+2
-5
@@ -40,10 +40,7 @@ So I started from master, made a bunch of edits, and committed:
40
$ git checkout master
41
$ cd Documentation; ed git.txt ...
42
$ cd ..; git add Documentation/*.txt
43
- $ git commit -s -v
44
-
45
-NOTE. The -v flag to commit is a handy way to make sure that
46
-your additions are not introducing bogusly formatted lines.
43
+ $ git commit -s
44
45
After the commit, the ancestry graph would look like this:
46
@@ -98,7 +95,7 @@ to do cherrypicking using only the core GIT tools.
95
Let's go back to the earlier picture, with different labels.
96
97
You, as an individual developer, cloned upstream repository and
101
-amde a couple of commits on top of it.
98
+made a couple of commits on top of it.
99
100
*your "master" head
101
upstream --> #1 --> #2 --> #3