~mdw / stgit / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 1c2cf10) | patch
Optimise 'push' to use git-apply instead of git-read-tree
authorCatalin Marinas <catalin.marinas@gmail.com>
Mon, 3 Oct 2005 14:35:40 +0000 (15:35 +0100)
committerCatalin Marinas <catalin.marinas@gmail.com>
Mon, 3 Oct 2005 20:15:32 +0000 (21:15 +0100)
commitb7c120dcc46defbf562523da11556b40d84c8d93
tree03672b12ecb92bf2daeddf0240ca1b55b38b277atree | snapshot (tar.gz zip)
parent1c2cf105e7215a113447d06585220c151fe826b3commit | diff
Optimise 'push' to use git-apply instead of git-read-tree

With this patch, 'push' will use 'git-diff-tree | git-apply' first. If this
operation fails, it will fall back to the three-way merge with
git-read-tree.

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