summaryrefslogtreecommitdiff
path: root/mergetools/emerge
diff options
context:
space:
mode:
authorLibravatar Sergey Organov <sorganov@gmail.com>2014-08-29 17:51:46 +0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-09-16 11:27:12 -0700
commit95c68267ff84c02a97d0f2c18b4b4fbfee7a7fca (patch)
treedc6df0113d12ae96eb97b864571dbce0ba36e261 /mergetools/emerge
parentDocumentation/git-rebase.txt: -f forces a rebase that would otherwise be a no-op (diff)
downloadtgif-95c68267ff84c02a97d0f2c18b4b4fbfee7a7fca.tar.xz
Documentation/git-rebase.txt: <upstream> must be given to specify <branch>
Current syntax description makes one wonder if there is any syntactic way to distinguish between <branch> and <upstream> so that one can specify <branch> but not <upstream>, 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 <sorganov@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools/emerge')
0 files changed, 0 insertions, 0 deletions