Skip to content

Commit

Permalink
Merge pull request #16 from phdru/edit-files
Browse files Browse the repository at this point in the history
Edit files
  • Loading branch information
joelparkerhenderson committed Jul 20, 2016
2 parents 67b5745 + 34db6dd commit 48e613a
Showing 1 changed file with 10 additions and 1 deletion.
11 changes: 10 additions & 1 deletion gitalias.txt
Original file line number Diff line number Diff line change
Expand Up @@ -478,9 +478,18 @@
unadd = reset HEAD
unstage = reset HEAD

# Edit all files of the given type
edit-cached = !"f() { git ls-files --cached | sort -u ; }; \"${VISUAL:-${EDITOR:-vi}}\" `f`"
edit-deleted = !"f() { git ls-files --deleted | sort -u ; }; \"${VISUAL:-${EDITOR:-vi}}\" `f`"
edit-others = !"f() { git ls-files --others | sort -u ; }; \"${VISUAL:-${EDITOR:-vi}}\" `f`"
edit-ignored = !"f() { git ls-files --ignored | sort -u ; }; \"${VISUAL:-${EDITOR:-vi}}\" `f`"
edit-killed = !"f() { git ls-files --killed | sort -u ; }; \"${VISUAL:-${EDITOR:-vi}}\" `f`"
edit-modified = !"f() { git ls-files --modified | sort -u ; }; \"${VISUAL:-${EDITOR:-vi}}\" `f`"
edit-stage = !"f() { git ls-files --stage | cut -f2 | sort -u ; }; "${VISUAL:-${EDITOR:-vi}}" `f`"

# 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

0 comments on commit 48e613a

Please sign in to comment.