~mdw / stgit / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: a3d7efc) | patch
Log conflicts separately for all commands
authorKarl Hasselström <kha@treskal.com>
Sun, 21 Sep 2008 12:17:40 +0000 (14:17 +0200)
committerKarl Hasselström <kha@treskal.com>
Sun, 21 Sep 2008 12:19:07 +0000 (14:19 +0200)
commitd6a698bbff11af2312600afb708d23d69e75d8e3
treedd8f9f7c194f1a82b69e845672afc2e981feca98tree | snapshot (tar.gz zip)
parenta3d7efccc515eeb12001a46ea0b781133768b23ccommit | diff
Log conflicts separately for all commands

This takes care of the old-infrastructure commands as well. They'll
all be converted to the new infrastructure eventually, but until then
this patch is necessary to make all commands behave consistently.

Signed-off-by: Karl Hasselström <kha@treskal.com>
stgit/lib/log.py diff | blob | blame | history
stgit/lib/stack.py diff | blob | blame | history
GIT patch-maintenance porcelain (local modifications)