projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
[PATCH] Possible cleanups for local-pull.c
[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
f627e42
..
4523b69
100644
(file)
--- a/
Documentation/howto/rebase-from-internal-branch.txt
+++ b/
Documentation/howto/rebase-from-internal-branch.txt
@@
-38,7
+38,7
@@
ancestry graph looked like this:
So I started from master, made a bunch of edits, and committed:
$ git checkout master
- $ cd Documentation; ed git.txt
git-apply-patch-script.txt
...
+ $ cd Documentation; ed git.txt ...
$ cd ..; git add Documentation/*.txt
$ git commit -s -v