diff options
| author | Junio C Hamano <junio@kernel.org> | 2011-04-28 22:26:02 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2011-04-28 22:26:02 +0000 |
| commit | b02377c2d2646d596e15bef1d0cc522023d26906 (patch) | |
| tree | e841672b063a0bf7dc7f2d15e7751c0633a645be /git-rebase.html | |
| parent | 209ebe834d6f29ff83e295db508f981713c9f0a7 (diff) | |
| download | git-htmldocs-b02377c2d2646d596e15bef1d0cc522023d26906.tar.gz | |
Autogenerated HTML docs for v1.7.5-128-g50d30
Diffstat (limited to 'git-rebase.html')
| -rw-r--r-- | git-rebase.html | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/git-rebase.html b/git-rebase.html index dca7c88cd..a846835d0 100644 --- a/git-rebase.html +++ b/git-rebase.html @@ -416,7 +416,7 @@ git-rebase(1) Manual Page <div class="sectionbody">
<div class="verseblock">
<div class="verseblock-content"><em>git rebase</em> [-i | --interactive] [options] [--onto <newbase>]
- <upstream> [<branch>]
+ [<upstream>] [<branch>]
<em>git rebase</em> [-i | --interactive] [options] --onto <newbase>
--root [<branch>]</div>
<div class="verseblock-attribution">
@@ -428,6 +428,11 @@ git-rebase(1) Manual Page <div class="paragraph"><p>If <branch> is specified, <em>git rebase</em> will perform an automatic
<tt>git checkout <branch></tt> before doing anything else. Otherwise
it remains on the current branch.</p></div>
+<div class="paragraph"><p>If <upstream> is not specified, the upstream configured in
+branch.<name>.remote and branch.<name>.merge options will be used; see
+<a href="git-config.html">git-config(1)</a> for details. If you are currently not on any
+branch or if the current branch does not have a configured upstream,
+the rebase will abort.</p></div>
<div class="paragraph"><p>All changes made by commits in the current branch but that are not
in <upstream> are saved to a temporary area. This is the same set
of commits that would be shown by <tt>git log <upstream>..HEAD</tt> (or
@@ -628,7 +633,8 @@ leave out at most one of A and B, in which case it defaults to HEAD.</p></div> <dd>
<p>
Upstream branch to compare against. May be any valid commit,
- not just an existing branch name.
+ not just an existing branch name. Defaults to the configured
+ upstream for the current branch.
</p>
</dd>
<dt class="hdlist1">
@@ -1478,7 +1484,7 @@ reorder commits tend to produce counterintuitive results.</p></div> </div>
<div id="footer">
<div id="footer-text">
-Last updated 2011-03-15 23:30:14 UTC
+Last updated 2011-04-28 22:25:18 UTC
</div>
</div>
</body>
|