X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.gitconfig;h=a5dd9706d03a62d005ce9909e998b0677aa7e4aa;hb=50b9dfa17f24b869e9b1df2a982d5cbf8353423e;hp=4ecffc961f05df80455355b514ce00f71b1e9c42;hpb=54bbf45016b36c34c560a2158ae51329d74805ea;p=dotfiles.git diff --git a/.gitconfig b/.gitconfig index 4ecffc9..a5dd970 100644 --- a/.gitconfig +++ b/.gitconfig @@ -102,9 +102,18 @@ # Find text in any commit ever grep-all = !"f() { git rev-list --all | xargs git grep \"$@\"; }; f" + # 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`" # Get the current branch name @@ -131,7 +140,7 @@ lr1 = log --decorate --reverse --oneline lr5 = log --decorate --reverse -5 null-merge = merge --strategy=ours - rbi123 = "!f() { git rebase --interactive $1 $2 ${3:-\"@{upstream\\}\"}; }; f" + rbi123 = "!f() { exec git rebase --interactive $1 $2 ${3:-\"@{upstream\\}\"}; }; f" rbi = !git rbi123 '' '' rbia = !git rbi123 --autosquash '' rbiap = !git rbi123 --autosquash --preserve-merges