chiark / gitweb /
~mdw / stgit / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 0a03ab4) | patch
Better "stg rebase" help text
authorAlex Chiang <achiang@hp.com>
Thu, 20 Mar 2008 23:12:10 +0000 (23:12 +0000)
committerCatalin Marinas <catalin.marinas@gmail.com>
Thu, 20 Mar 2008 23:12:10 +0000 (23:12 +0000)
commit467a0a0ec6081b61f1aae814685a2fc0ec7cf315
tree261face02511b479f8bc2e84c33a699ebf696633tree | snapshot
parent0a03ab4518fca921a8f427d283f29c0fe3625cb2commit | diff
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>
stgit/commands/rebase.py diff | blob | blame | history
GIT patch-maintenance porcelain (local modifications)