mirror of
https://github.com/mhagger/git-imerge.git
synced 2024-08-17 11:00:29 +03:00
GitRepository.manualmerge(): turn off rerere
Turn off git-rerere when initiating a manual merge, just as we already do when automerging.
This commit is contained in:
parent
9bde208ce9
commit
3f66e2838a
@ -668,7 +668,10 @@ class GitRepository(object):
|
||||
def manualmerge(self, commit, msg):
|
||||
"""Initiate a merge of commit into the current HEAD."""
|
||||
|
||||
check_call(['git', 'merge', '--no-commit', '-m', msg, commit,])
|
||||
check_call([
|
||||
'git', '-c', 'rerere.enabled=false',
|
||||
'merge', '--no-commit', '-m', msg, commit,
|
||||
])
|
||||
|
||||
def require_clean_work_tree(self, action):
|
||||
"""Verify that the current tree is clean.
|
||||
|
Loading…
Reference in New Issue
Block a user