chiark / gitweb /
~mdw / stgit / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 65de4cc) | patch
Better "stg rebase" help text
authorAlex Chiang <achiang@hp.com>
Mon, 24 Mar 2008 18:54:10 +0000 (18:54 +0000)
committerCatalin Marinas <catalin.marinas@gmail.com>
Mon, 24 Mar 2008 18:54:10 +0000 (18:54 +0000)
commit8d9e6a6c93568de2c0525cd18ab13097740b89a2
treedd51537c5764d8013af47f35d99cfa8ee8225077tree | snapshot
parent65de4cc08dd734c21383ea92e88d34cee3364f22commit | 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)