~mdw / stgit / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 59c97ab) | patch
Simplify merge_recursive
authorDavid Kågedal <david@virtutech.com>
Wed, 19 Dec 2007 18:00:12 +0000 (18:00 +0000)
committerCatalin Marinas <catalin.marinas@gmail.com>
Wed, 19 Dec 2007 23:13:30 +0000 (23:13 +0000)
commit350bcba5aeae79c9e8e6619d2b00ec1804c1390f
tree1f308c38b8d06c2faeb5c2aa6365553c8c91d37ctree | snapshot (tar.gz zip)
parent59c97ab4255eb651bc9bcc05c62bc45df3840e20commit | diff
Simplify merge_recursive

Listing the unmerged files is unnecessary, since the information
isn't really used anyway. Just note if the merge failed or succeeded.

Signed-off-by: David Kågedal <davidk@lysator.liu.se>
Signed-off-by: Karl Hasselström <kha@treskal.com>
stgit/git.py diff | blob | blame | history
GIT patch-maintenance porcelain (local modifications)