X-Git-Url: https://git.phdru.name/?p=dotfiles.git;a=blobdiff_plain;f=.gitconfig;h=9740736f6aef3266ae292bd790f27d52c4ca4402;hp=66db0bdc97d085df47c36d6ba06e7b2301396b2d;hb=f08975628aad267b22545b05b182f0b79918d441;hpb=1d9311cbfa743a494a85dcc28bf87d6c00fa4b58

diff --git a/.gitconfig b/.gitconfig
index 66db0bd..9740736 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -68,7 +68,7 @@
 
   # See https://blog.filippo.io/git-fixup-amending-an-older-commit/
   # This is a slightly modified version
-  fixup = "!f() { TARGET=$(git rev-parse \"$1\"); git commit --fixup=$TARGET && GIT_EDITOR=true exec git rebase --interactive --autosquash $TARGET~; }; f"
+  fixup = "!f() { TARGET=$(git rev-parse \"$1\"); git commit --fixup=$TARGET && GIT_EDITOR=true exec git rebase --interactive --autostash --autosquash $TARGET~; }; f"
 
   ### remote ###
 
@@ -136,6 +136,8 @@
   unassume-all = "!git assumed | xargs git update-index --no-assume-unchanged"
   assumed  = !"git ls-files -v | grep ^h | cut -c 3-"
 
+  stashes = stash list
+
 	branches = branch --all
 	ca = commit --all
 	cv = commit --verbose
@@ -150,7 +152,7 @@
 	file = cat-file -t
 	type = cat-file -t
 	ff = merge --ff-only
-	git = !git
+	#git = !exec git
 	l1 = log --decorate --oneline
 	l5 = log --decorate -5
 	ld = log --decorate
@@ -161,7 +163,7 @@
 	lr1 = log --decorate --reverse --oneline
 	lr5 = log --decorate --reverse -5
 	null-merge = merge --strategy=ours
-	rbi123 = "!f() { exec git rebase --interactive $1 $2 ${3:-\"@{upstream\\}\"}; }; f"
+	rbi123 = "!f() { exec git rebase --interactive --autostash $1 $2 ${3:-\"@{upstream\\}\"}; }; f"
 	rbi = !exec git rbi123 '' ''
 	rbia = !exec git rbi123 --autosquash ''
 	rbiap = !exec git rbi123 --autosquash --preserve-merges
@@ -176,6 +178,14 @@
 	sw = show --word-diff --decorate
 	unstage = reset HEAD --
 
+	# Github: pull request, Gitlab: merge request
+	mpr = "!f() { git fetch ${2:-origin} refs/$3/$1/head:pr/$1 && if [ \"$4\" = checkout ]; then git checkout pr/$1; fi; }; f"
+	fetch-mr = "!f() { git mpr $1 $2 merge-requests; }; f"
+	merge-request = "!f() { git mpr $1 $2 merge-requests checkout; }; f"
+	fetch-pr = "!f() { git mpr $1 $2 pull; }; f"
+	pull-request = "!f() { git mpr $1 $2 pull checkout; }; 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"
+
 [branch]
 	autosetuprebase = always
 
@@ -191,6 +201,9 @@
 [include]
 	path = ~/lib/config/git/light_bg
 
+[init]
+	defaultBranch = master
+
 [log]
 	abbrevCommit = true
 	#mailmap = true
@@ -236,13 +249,9 @@
 # Github URL shortcuts
 [url "git@github.com:"]
 	insteadOf = "gh:"
-	pushInsteadOf = "github:"
-	pushInsteadOf = "git://github.com/"
-[url "git://github.com/"]
 	insteadOf = "github:"
+	insteadOf = "git://github.com/"
 [url "git@gist.github.com:"]
 	insteadOf = "gst:"
-	pushInsteadOf = "gist:"
-	pushInsteadOf = "git://gist.github.com/"
-[url "git://gist.github.com/"]
 	insteadOf = "gist:"
+	insteadOf = "git://gist.github.com/"