janek
/
dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

config/git: add sf alias using fzf

This commit is contained in:
xeruf 2021-06-24 22:07:50 +02:00
parent f6c6a1752c
commit d00dd95668
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.config/git/config
View File

@ -73,6 +73,7 @@
stb = status --short --branch stb = status --short --branch
sv = --paginate status -v sv = --paginate status -v
svv = --paginate status -vv svv = --paginate status -vv
sf = !git diff-index HEAD --name-only | fzf --preview='git diff HEAD --color=always -- {}' --multi | git commit -v --pathspec-from-file=-
r = remote -v r = remote -v
b = branch -vv b = branch -vv
@ -94,7 +95,7 @@
#dir = !git root | sed 's/$/\\/.git/' | grep --color=never "/" # grep ensures a proper exit status on fail #dir = !git root | sed 's/$/\\/.git/' | grep --color=never "/" # grep ensures a proper exit status on fail
lg = log --pretty=tformat:'%C(auto)%h%d %s %Cgreen(%cd) %Cblue<%an>%Creset' --date=human --graph lg = log --pretty=tformat:'%C(auto)%h%d %s %Cgreen(%cd) %Cblue<%an>%Creset' --date=human --graph
lgo = lg HEAD @{push} lgu = lg HEAD @{push}
lo = log --pretty=tformat:'%C(auto)%h%d %s %Cgreen(%cd) %Cblue<%an>%Creset' --date=human --no-merges lo = log --pretty=tformat:'%C(auto)%h%d %s %Cgreen(%cd) %Cblue<%an>%Creset' --date=human --no-merges
lp = log -p --date=local lp = log -p --date=local
ln = !git --no-pager lo "-$(a=$(git rev-list --count HEAD...@{push} 2>/dev/null); expr $a + 3 \\& ${a:-0} \\> 3 \\| 6)" --color=always --graph HEAD @{u} 2>/dev/null | head -9 || git --no-pager lo -7 ln = !git --no-pager lo "-$(a=$(git rev-list --count HEAD...@{push} 2>/dev/null); expr $a + 3 \\& ${a:-0} \\> 3 \\| 6)" --color=always --graph HEAD @{u} 2>/dev/null | head -9 || git --no-pager lo -7

2
.local/bin/scripts/git-rmgonebranches
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# Cleans up remote branches and removes branches where the remote-tracking branches got removed. # Cleans up remote branches and removes branches where the remote-tracking branches got removed.
git fetch -p && git fetch --prune &&
for branch in `git branch -vv | grep ": gone]" | cut -d" " -f3` for branch in `git branch -vv | grep ": gone]" | cut -d" " -f3`
do git branch -D "$branch" do git branch -D "$branch"
done done