diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-09-19 18:38:42 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-09-19 18:38:42 (GMT) |
| commit | 9c9fbee8f514046c5d1c79f70c507f82c77dbad2 (patch) | |
| tree | f516f923c4cefae73aa73582f2cc03d00451186b /Documentation | |
| parent | 05fcf66b74309ab15617dbcf59be9a436f92c5ad (diff) | |
| parent | 95c68267ff84c02a97d0f2c18b4b4fbfee7a7fca (diff) | |
| download | git-9c9fbee8f514046c5d1c79f70c507f82c77dbad2.zip git-9c9fbee8f514046c5d1c79f70c507f82c77dbad2.tar.gz git-9c9fbee8f514046c5d1c79f70c507f82c77dbad2.tar.bz2 | |
Merge branch 'so/rebase-doc'
* so/rebase-doc:
Documentation/git-rebase.txt: <upstream> must be given to specify <branch>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-rebase.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index f14100a..4138554 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -9,7 +9,7 @@ SYNOPSIS -------- [verse] 'git rebase' [-i | --interactive] [options] [--exec <cmd>] [--onto <newbase>] - [<upstream>] [<branch>] + [<upstream> [<branch>]] 'git rebase' [-i | --interactive] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>] 'git rebase' --continue | --skip | --abort | --edit-todo |