| commit | b7c120dcc46defbf562523da11556b40d84c8d93 | [log] [tgz] |
|---|---|---|
| author | Catalin Marinas <catalin.marinas@gmail.com> | Mon Oct 03 15:35:40 2005 +0100 |
| committer | Catalin Marinas <catalin.marinas@gmail.com> | Mon Oct 03 21:15:32 2005 +0100 |
| tree | 03672b12ecb92bf2daeddf0240ca1b55b38b277a | |
| parent | 1c2cf105e7215a113447d06585220c151fe826b3 [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>