diff options
| author | Junio C Hamano <junio@kernel.org> | 2010-06-02 23:32:31 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2010-06-02 23:32:31 +0000 |
| commit | e32ec8b89b623de73d1ccacb430b1c4ab16e4fcb (patch) | |
| tree | 27285614d896d302efe7f7740b87009fd0ae0c33 /git-rebase.txt | |
| parent | b671fb5c100813248be882136374ea6c6038d4e8 (diff) | |
| download | git-htmldocs-e32ec8b89b623de73d1ccacb430b1c4ab16e4fcb.tar.gz | |
Autogenerated HTML docs for v1.7.1-244-gbdc4
Diffstat (limited to 'git-rebase.txt')
| -rw-r--r-- | git-rebase.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/git-rebase.txt b/git-rebase.txt index 5863decdc..50ba2e469 100644 --- a/git-rebase.txt +++ b/git-rebase.txt @@ -206,6 +206,10 @@ OPTIONS --onto option is not specified, the starting point is <upstream>. May be any valid commit, and not just an existing branch name. ++ +As a special case, you may use "A...B" as a shortcut for the +merge base of A and B if there is exactly one merge base. You can +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, |