Skip to content

GitRepository.manualmerge(): turn off rerere #195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mhagger wants to merge 1 commit into
base: master
Choose a base branch
from
Open

GitRepository.manualmerge(): turn off rerere #195

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion gitimerge.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -668,7 +668,10 @@ def automerge(self, commit1, commit2, msg=None):
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.
Expand Down