From 2b693260e2b5d6aedd994e934e5a5c07b72fd655 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Tue, 4 Feb 2020 10:42:37 +0000 Subject: [PATCH] git-debrebase(1): Fix new-upstream -i docs Firstly, the -i must come at the end. (After -i come more git-rebase options.) Secondly, this wasn't mentioned at all in the main section for new-upstream - only in the synopsis. Signed-off-by: Ian Jackson --- git-debrebase.1.pod | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod index bc1fdd64..639b07d2 100644 --- a/git-debrebase.1.pod +++ b/git-debrebase.1.pod @@ -14,7 +14,7 @@ These are most of the commands you will regularly need: git debrebase -i # edit the patch queue git debrebase conclude && git push # push to eg salsa git debrebase conclude && dgit push-source # source-only upload - git debrebase [-i] new-upstream 1.2.3-1 # uses tag, eg "v1.2.3" + git debrebase new-upstream 1.2.3-1 [-i] # uses tag, eg "v1.2.3" dpkg-buildpackage -uc -b # get test debs, at any time To add patches, or edit the packaging, just make git commits. @@ -134,7 +134,7 @@ and discarding all working tree changes. If you are in the middle of a git-rebase, will abort that too. -=item git-debrebase new-upstream [...] +=item git-debrebase new-upstream [...] [--|-i ] Rebases the delta queue onto a new upstream version. In detail: -- 2.30.2