~mdw / stgit / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 757c545) | patch
Split git.merge into two functions
authorDavid Kågedal <david@virtutech.com>
Wed, 19 Dec 2007 18:00:11 +0000 (18:00 +0000)
committerCatalin Marinas <catalin.marinas@gmail.com>
Wed, 19 Dec 2007 23:13:30 +0000 (23:13 +0000)
commitfab69eacedd180b5c67812336bfdb5f52f6a4ae5
tree9e698c016d2906739ec173828de240e2fa0f4d2etree | snapshot (tar.gz zip)
parent757c5455dd57c4178962f0920d7ccfdf617efa05commit | diff
Split git.merge into two functions

This only prepares for later simplifications.

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