summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Fankhauser2023-02-03 14:31:01 +0100
committerAndreas Fankhauser2023-02-03 14:31:01 +0100
commit79cbc7e77842f1512e003c6878953893c5ccf06c (patch)
tree97eacfb8a45b700f8a282b79e8ccfbf42720b9b1
parent0ad736ca4aea46537fec88295b96ca32d3eb2cca (diff)
downloaddotfiles-79cbc7e77842f1512e003c6878953893c5ccf06c.zip
dotfiles-79cbc7e77842f1512e003c6878953893c5ccf06c.tar.gz
(git) new alias rsmbuh (ResetSoftMergeBaseUpstreamHead)
-rw-r--r--src/git/_gitconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/git/_gitconfig b/src/git/_gitconfig
index ef17fe0..b2dcb56 100644
--- a/src/git/_gitconfig
+++ b/src/git/_gitconfig
@@ -36,6 +36,8 @@
l9 = log --graph --decorate --date-order -n9
la = log --graph --decorate --date-order --all
mb = merge-base
+ #mbu = merge-base origin/develop
+ #rsmbuh = ! git reset --soft `git mbu HEAD`
s = status
rimraf = ! git clean -df && git reset --hard HEAD
delmerged = !git br -d $(find .git/refs/heads -type f|cut -c17-)