Skip to content

Instantly share code, notes, and snippets.

@gusaaaaa
Created February 19, 2014 15:06
Show Gist options
  • Save gusaaaaa/9093900 to your computer and use it in GitHub Desktop.
Save gusaaaaa/9093900 to your computer and use it in GitHub Desktop.
Opens a tab per each file in conflict
git status | grep 'both modified' | awk '{print $4}' | vim -p `tr '\n' ' '`
@foca
Copy link

foca commented Feb 19, 2014

That's inefficient. A better approach is vim -o $(git diff --name-only --diff-filter=U | xargs) (or -p if you are one of those people who use tabs instead of windows).

@gusaaaaa
Copy link
Author

La posta. Thanks, @foca!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment