From 2d26d533a012f7475e13657d7fc829a6ba01db73 Mon Sep 17 00:00:00 2001 From: Sergey Organov Date: Tue, 12 Aug 2014 00:22:48 +0400 Subject: Documentation/git-rebase.txt: -f forces a rebase that would otherwise be a no-op "Current branch is a descendant of the commit you are rebasing onto" does not necessarily mean "rebase" requires "--force". For a plain vanilla "history flattening" rebase, the rebase can be done without forcing if there is a merge between the tip of the branch being rebased and the commit you are rebasing onto, even if the tip is descendant of the other. [jc: reworded both the text and the log description] Signed-off-by: Sergey Organov Signed-off-by: Junio C Hamano --- Documentation/git-rebase.txt | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'Documentation') diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 2a93c645b..f14100a16 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -316,11 +316,8 @@ which makes little sense. -f:: --force-rebase:: - Force the rebase even if the current branch is a descendant - of the commit you are rebasing onto. Normally non-interactive rebase will - exit with the message "Current branch is up to date" in such a - situation. - Incompatible with the --interactive option. + Force a rebase even if the current branch is up-to-date and + the command without `--force` would return without doing anything. + You may find this (or --no-ff with an interactive rebase) helpful after reverting a topic branch merge, as this option recreates the topic branch with -- cgit v1.2.1 From 95c68267ff84c02a97d0f2c18b4b4fbfee7a7fca Mon Sep 17 00:00:00 2001 From: Sergey Organov Date: Fri, 29 Aug 2014 17:51:46 +0400 Subject: Documentation/git-rebase.txt: must be given to specify Current syntax description makes one wonder if there is any syntactic way to distinguish between and so that one can specify but not , but that is not the case. Make it explicit that these arguments are positional, i.e. the earlier ones cannot be omitted if you want to give later ones. Signed-off-by: Sergey Organov Signed-off-by: Junio C Hamano --- Documentation/git-rebase.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Documentation') diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index f14100a16..413855491 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -9,7 +9,7 @@ SYNOPSIS -------- [verse] 'git rebase' [-i | --interactive] [options] [--exec ] [--onto ] - [] [] + [ []] 'git rebase' [-i | --interactive] [options] [--exec ] [--onto ] --root [] 'git rebase' --continue | --skip | --abort | --edit-todo -- cgit v1.2.1