~mdw / stgit / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: fe4f6d5) | patch
Optimise pick --fold to use git-apply first
authorCatalin Marinas <catalin.marinas@gmail.com>
Thu, 10 Nov 2005 14:28:42 +0000 (14:28 +0000)
committerCatalin Marinas <catalin.marinas@gmail.com>
Thu, 10 Nov 2005 14:28:42 +0000 (14:28 +0000)
commitd218d2f8c234b1cb17616dc98d8e5d670138e124
treeafdcb86b66dad3cc29c9dcf8a4a6c942dfbb9ffatree | snapshot (tar.gz zip)
parentfe4f6d5812d62c1d6a5e0aa7536bad2e8a3beb6bcommit | diff
Optimise pick --fold to use git-apply first

If "git-diff-tree | git-apply" fails, the command falls back to a
three-way merge.

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