X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.gitconfig;h=7b4c249bf575f8ee31f5b3a0bb19cdf9e4b5b579;hb=88c29c2b4ebe7406ac70b23a3dee74e3d32294f9;hp=9e3e776bd021a4cb8f02e55c5f0b5d00a7773d6e;hpb=b11c3b167cefe888135d7fdb4430253d117b5716;p=dotfiles.git diff --git a/.gitconfig b/.gitconfig index 9e3e776..7b4c249 100644 --- a/.gitconfig +++ b/.gitconfig @@ -152,7 +152,7 @@ file = cat-file -t type = cat-file -t ff = merge --ff-only - git = !exec git + #git = !exec git l1 = log --decorate --oneline l5 = log --decorate -5 ld = log --decorate @@ -178,6 +178,8 @@ sw = show --word-diff --decorate unstage = reset HEAD -- + # Github: pull request, Gitlab: merge request + mr = "!f() { git fetch ${2:-origin} refs/merge-requests/$1/head:pr/$1 && git checkout pr/$1; }; f" pr = "!f() { git fetch ${2:-origin} refs/pull/$1/head:pr/$1 && git checkout pr/$1; }; f" clean-pr = "!git checkout master ; git for-each-ref refs/heads/pr/* --format=\"%(refname)\" | while read ref ; do branch=${ref#refs/heads/} ; git branch -D $branch ; done"