| commit | edf4f599dcc78b741df36bf835cc14a1e0bafedb | |
| author | Catalin Marinas <catalin.marinas@gmail.com> | |
| Thu, 9 Mar 2006 21:53:54 +0000 (9 21:53 +0000) | ||
| committer | Catalin Marinas <catalin.marinas@gmail.com> | |
| Thu, 9 Mar 2006 21:54:38 +0000 (9 21:54 +0000) | ||
| tree | 23c3831830bbd0e120aaa69add9795b82b075a90 | treesnapshot (tar.gz zip) |
| parent | 9f8a7c77791ec415475a88016d2bf072028373f9 | commitdiff |
Pass the --aggressive flag to git-read-tree
This flags solves the file removals which consumes the most time when
resolving the three-way merge conflicts.
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
This flags solves the file removals which consumes the most time when
resolving the three-way merge conflicts.
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
| stgit/git.py | diffblobblamehistory |