chiark / gitweb /
~mdw / stgit / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: b6df231) | patch
stgit.el: Handle unmerged files better
authorGustav Hållberg <gustav@virtutech.com>
Sat, 1 Aug 2009 20:04:35 +0000 (22:04 +0200)
committerGustav Hållberg <gustav@virtutech.com>
Thu, 6 Aug 2009 20:49:07 +0000 (22:49 +0200)
commit030f05358167550f18dc754ebccac6e189b9c9ff
treeafd81cb1111b01b33b9ab801447cf15beb933845tree | snapshot
parentb6df231c3f10f6e889901e7f28b096ac07624b02commit | diff
stgit.el: Handle unmerged files better

Show unmerged patches with --ours, which works with diff-mode.

Do not show duplicate entries in the work tree for unmerged files.

Open unmerged files with smerge-mode minor mode.

Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
contrib/stgit.el diff | blob | blame | history
GIT patch-maintenance porcelain (local modifications)