chiark / gitweb /
~mdw / stgit / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from: d218d2f)
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)
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>

No differences found
GIT patch-maintenance porcelain (local modifications)