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.txt | |
parent | 209ebe834d6f29ff83e295db508f981713c9f0a7 (diff) | |
download | git-htmldocs-b02377c2d2646d596e15bef1d0cc522023d26906.tar.gz |
Autogenerated HTML docs for v1.7.5-128-g50d30
Diffstat (limited to 'git-rebase.txt')
-rw-r--r-- | git-rebase.txt | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/git-rebase.txt b/git-rebase.txt index 620d50e71..9a075bc4d 100644 --- a/git-rebase.txt +++ b/git-rebase.txt @@ -9,7 +9,7 @@ SYNOPSIS -------- [verse] 'git rebase' [-i | --interactive] [options] [--onto <newbase>] - <upstream> [<branch>] + [<upstream>] [<branch>] 'git rebase' [-i | --interactive] [options] --onto <newbase> --root [<branch>] @@ -21,6 +21,12 @@ If <branch> is specified, 'git rebase' will perform an automatic `git checkout <branch>` before doing anything else. Otherwise it remains on the current branch. +If <upstream> is not specified, the upstream configured in +branch.<name>.remote and branch.<name>.merge options will be used; see +linkgit:git-config[1] 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. + 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 `git log <upstream>..HEAD` (or @@ -217,7 +223,8 @@ leave out at most one of A and B, in which case it defaults to HEAD. <upstream>:: 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. <branch>:: Working branch; defaults to HEAD. |