~mdw / stgit / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 2156a79) | 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 14:35:40 +0000 (15:35 +0100)
commit575a7e7cb31c21fcf13aa7622200496161286d10
tree0155fb7e47b211104f9d2475ed1efa09be36e432tree | snapshot (tar.gz zip)
parent2156a798d158000cc6826af48370b73834fafe54commit | 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)