From 509551f71708b90ed5d3006af841b4f1a2df486b Mon Sep 17 00:00:00 2001 From: Joe Groocock Date: Mon, 24 Oct 2022 14:29:40 +0000 Subject: [PATCH] git: Add mv/reflog/clean-merged aliases Signed-off-by: Joe Groocock --- aliases | 3 +++ git/config | 1 + 2 files changed, 4 insertions(+) diff --git a/aliases b/aliases index fb953c2..99f016c 100644 --- a/aliases +++ b/aliases @@ -119,6 +119,7 @@ alias gau="git add -u" alias gaN="git add -N" alias gaa="ga -A" alias grm="git rm" +alias gmv="git mv" alias gc="git commit -s" alias gcm="git commit -s -em" alias gca="git commit -s --amend --date=\"\$(date -R)\"" @@ -126,6 +127,7 @@ alias gcn="git commit -s --no-edit" alias gcan="gca -s --no-edit" alias gcam="gca -s -m" alias gst="git status" +alias grl="git reflog" alias gm="git merge" alias gma="git merge --abort" @@ -175,6 +177,7 @@ alias glog="git log --color --oneline --decorate --graph" alias grst="git reset" alias gundo="git reset --keep @~1" alias gclean="git clean" +alias gclm="git cleanmerged" alias gbr="git branch" alias gbrl="git for-each-ref --sort=committerdate refs/heads/ --format=\"%(refname:short)\" | fzf -x --ansi --multi --preview-window=right:70% --preview=\"git log --format=fuller --stat --color=always {} | head -n\$((\$(tput lines)*10))\"" alias gtg="git tag" diff --git a/git/config b/git/config index 5886cbc..589d7ea 100644 --- a/git/config +++ b/git/config @@ -38,6 +38,7 @@ unpushed = !git log --oneline @{u}..HEAD leaders = !git shortlog -s -n --all --no-merges defbranch = !git symbolic-ref refs/remotes/origin/HEAD | sed \"s@^refs/remotes/origin/@@\" + cleanmerged = !git branch --merged \"origin/$(git defbranch)\" | grep -ve \"^\\\\*\" -e \"^. $(git defbranch)$\" | xargs -r git branch -d [advice] statusHints = false pushUpdateRejected = false