From: Alex Chiang <achiang@hp.com>
Date: Mon, 24 Mar 2008 18:54:10 +0000 (+0000)
Subject: Better "stg rebase" help text
X-Git-Tag: v0.14.2~2
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/commitdiff_plain/8d9e6a6c93568de2c0525cd18ab13097740b89a2

Better "stg rebase" help text

Enhance rebase help string by providing guidance on merge conflict
resolution during a rebase.

Based on text suggested by Catalin Marinas.

Signed-off-by: Alex Chiang <achiang@hp.com>
Signed-off-by: Karl Hasselström <kha@treskal.com>
---

diff --git a/stgit/commands/rebase.py b/stgit/commands/rebase.py
index 12faaf8..ec2e04c 100644
--- a/stgit/commands/rebase.py
+++ b/stgit/commands/rebase.py
@@ -27,7 +27,19 @@ help = 'move the stack base to another point in history'
 usage = """%prog [options] <new-base-id>
 
 Pop all patches from current stack, move the stack base to the given
-<new-base-id> and push the patches back."""
+<new-base-id> and push the patches back.
+
+If you experience merge conflicts, resolve the problem and continue
+the rebase by executing the following sequence:
+
+        $ stg resolved -a [-i]
+        $ stg refresh
+        $ stg goto top-patch
+
+Or if you want to skip that patch:
+
+        $ stg push --undo
+        $ stg push next-patch..top-patch"""
 
 directory = DirectoryGotoToplevel()
 options = [make_option('-n', '--nopush',