Merge branch 'master' into v8
This commit is contained in:
commit
029c883713
456 changed files with 6341 additions and 1085 deletions
|
@ -260,7 +260,7 @@ reconcileStaged qh = do
|
|||
, Param "--cached"
|
||||
, Param "--raw"
|
||||
, Param "-z"
|
||||
, Param "--abbrev=40"
|
||||
, Param "--no-abbrev"
|
||||
-- Optimization: Only find pointer files. This is not
|
||||
-- perfect. A file could start with this and not be a
|
||||
-- pointer file. And a pointer file that is replaced with
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue