1  #!/bin/sh
 2  #
 3  # git-edit-conflicted-files - Open all conflicted files in your editor
 4  #
 5  # Opens all files with merge conflicts in your preferred editor.
 6  # Uses git-conflicts to find conflicted files and opens them all at once.
 7  #
 8  # Usage: git-edit-conflicted-files [editor]
 9  #
10  # Examples:
11  #   git-edit-conflicted-files        # Use $VISUAL or $EDITOR
12  #   git-edit-conflicted-files vim    # Use vim specifically
13  
14  if [ "$1" = "-h" ] || [ "$1" = "--help" ]; then
15    echo "Usage: $(basename "$0") [editor]"
16    echo "Open all conflicted files in your editor"
17    echo "Uses \$VISUAL or \$EDITOR if no editor specified"
18    exit 0
19  fi
20  
21  EDIT="${1:-${VISUAL:-$EDITOR}}"
22  eval $EDIT $(git conflicts | ruby -e "puts ARGF.each_line.to_a.map{|l| \"'\"+l.strip+\"'\"}.join(' ')")