bin/edit-conflicts.sh

   1 #!/bin/sh
   2 #
   3 # Copyright (c) 2007 Johannes E. Schindelin
   4 #
   5 # Cleanup unreachable files and optimize the repository.
   6
   7 USAGE='my-edit-conflicts'
   8 SUBDIRECTORY_OK=Yes
   9 . "$(git --exec-path)"/git-sh-setup
  10 cd_to_toplevel
  11
  12 test -z "$(git ls-files --unmerged)" && echo "Nothing to do" && exit
  13
  14 git ls-files --unmerged | cut -b51- | grep ' ' >/dev/null &&
  15 die "filenames contain spaces"
  16
  17 opt=
  18 test vi = "${VISUAL:-${EDITOR:-vi}}" && opt="+/<<<<<<<"
  19 "${VISUAL:-${EDITOR:-vi}}" $opt $(git ls-files --unmerged | cut -b51- | uniq)
  20 git add $(git ls-files --unmerged | cut -b51- | uniq)