Pass the --aggressive flag to git-read-tree
authorCatalin Marinas <catalin.marinas@gmail.com>
Thu, 9 Mar 2006 21:53:54 +0000 (21:53 +0000)
committerCatalin Marinas <catalin.marinas@gmail.com>
Thu, 9 Mar 2006 21:54:38 +0000 (21:54 +0000)
commitedf4f599dcc78b741df36bf835cc14a1e0bafedb
tree23c3831830bbd0e120aaa69add9795b82b075a90
parent9f8a7c77791ec415475a88016d2bf072028373f9
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>
stgit/git.py