Permalink
Browse files

-c option to check for .git/MERGE_HEAD

  • Loading branch information...
1 parent 227e184 commit c26e9e70eeba63fc06d53935899d12dc97608843 @tkrajina committed Jan 14, 2013
Showing with 2 additions and 1 deletion.
  1. +2 −1 git-multi
View
3 git-multi
@@ -94,7 +94,8 @@ def is_ignored(project):
def is_changed():
executed, changed_lines = execute_command('git status --porcelain', output=False)
- return changed_lines
+ merge_not_finished = mod_path.exists('.git/MERGE_HEAD')
+ return changed_lines or merge_not_finished
def process_project(current_path, file_name):
if is_ignored(file_name in ignore_projects):

0 comments on commit c26e9e7

Please sign in to comment.