projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git-apply: safety fixes
[git.git]
/
Documentation
/
git-rebase.txt
diff --git
a/Documentation/git-rebase.txt
b/Documentation/git-rebase.txt
index
f037d12
..
b36276c
100644
(file)
--- a/
Documentation/git-rebase.txt
+++ b/
Documentation/git-rebase.txt
@@
-3,7
+3,7
@@
git-rebase(1)
NAME
----
NAME
----
-git-rebase - Rebase local commits to new upstream head
.
+git-rebase - Rebase local commits to new upstream head
SYNOPSIS
--------
SYNOPSIS
--------
@@
-25,7
+25,7
@@
Assume the following history exists and the current branch is "topic":
/
D---E---F---G master
/
D---E---F---G master
-From this point, the result of the following commands:
+From this point, the result of
either of
the following commands:
git-rebase master
git-rebase master topic
git-rebase master
git-rebase master topic
@@
-36,7
+36,7
@@
would be:
/
D---E---F---G master
/
D---E---F---G master
-While, starting from the same point, the result of the following
+While, starting from the same point, the result of
either of
the following
commands:
git-rebase --onto master~1 master
commands:
git-rebase --onto master~1 master
@@
-58,7
+58,7
@@
OPTIONS
<upstream>::
Upstream branch to compare against.
<upstream>::
Upstream branch to compare against.
-<
head
>::
+<
branch
>::
Working branch; defaults to HEAD.
Author
Working branch; defaults to HEAD.
Author