Skip to content
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

Jump to bottom

Edit files #16

Merged
merged 2 commits into from
Jul 20, 2016
Merged

Edit files #16

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
23a8180
Prefer $VISUAL over $EDITOR; use vi as the last resort
phdru Jul 18, 2016
34db6dd
Edit all files of the given type
phdru Jul 18, 2016
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
Next Next commit
Prefer $VISUAL over $EDITOR; use vi as the last resort
  • Loading branch information
@phdru
phdru committed Jul 18, 2016
commit 23a81809e404a8475f9b0c26733341a7961d75f5
2 changes: 1 addition & 1 deletion gitalias.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,7 +480,7 @@

# Editing and adding conflicted files: when we get many merge conflicts
# and want to quickly solve them using an editor, then add the files.
edit-unmerged = !"f() { git ls-files --unmerged | cut -f2 | sort -u ; }; $EDITOR `f`"
edit-unmerged = !"f() { git ls-files --unmerged | cut -f2 | sort -u ; }; "${VISUAL:-${EDITOR:-vi}}" `f`"
add-unmerged = !"f() { git ls-files --unmerged | cut -f2 | sort -u ; }; git add `f`"

# Ours & Theirs - easy merging when you know which files you want
Expand Down