chiark / gitweb /
~mdw / stgit / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from: 7c47d09)
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)
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>

No differences found
GIT patch-maintenance porcelain (local modifications)