~mdw / stgit / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 94227db) | patch
'status --reset' should remove the conflicts as well
authorCatalin Marinas <catalin.marinas@gmail.com>
Wed, 5 Oct 2005 08:32:08 +0000 (09:32 +0100)
committerCatalin Marinas <catalin.marinas@gmail.com>
Wed, 5 Oct 2005 08:32:08 +0000 (09:32 +0100)
commit3c3e0344d3b9f2626a31105f9f794142ed4a8dfa
tree32117789f7cf3b16d9f37670dba8c3620773ded4tree | snapshot (tar.gz zip)
parent94227db3c3ae40343c1cbc41b5617389eb7d7c40commit | diff
'status --reset' should remove the conflicts as well

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