chiark / gitweb /
~mdw / stgit / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 84fcbc3) | patch
Add a --reset option to resolved
authorCatalin Marinas <catalin.marinas@gmail.com>
Wed, 5 Oct 2005 15:58:18 +0000 (16:58 +0100)
committerCatalin Marinas <catalin.marinas@gmail.com>
Wed, 5 Oct 2005 15:58:18 +0000 (16:58 +0100)
commit7c47d096c74a2654fc9d67490adbe3066d24df98
tree7d55625e631c257322cde8d9e3da2d3111924f02tree | snapshot
parent84fcbc3b78f3a0156025d4eb6f6b76df7a5df233commit | diff
Add a --reset option to resolved

With this option one can ask for a conflicted file to be reset to one of
the local, remote or older states.

Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
stgit/commands/common.py diff | blob | blame | history
stgit/commands/resolved.py diff | blob | blame | history
GIT patch-maintenance porcelain (local modifications)