Permalink
Browse files

added merge-dry & merge-wet aliases

  • Loading branch information...
1 parent d41e8f0 commit 1c1e0ec1a87e815313ef3f44748ba3c1f9dbd371 @noelweichbrodt committed Dec 18, 2012
Showing with 3 additions and 1 deletion.
  1. +3 −1 gitconfig
View
4 gitconfig
@@ -17,6 +17,8 @@
undo = reset --soft HEAD^
pl = git checkout HEAD
pr = git checkout
+ merge-dry = "!f() { git merge-tree `git merge-base $2 $1` $2 $1; }; f" #check how the merge of dev into master will go: git dry dev master
+ merge-wet = "!f() { git merge --no-commit --no-ff $1; }; f"
amend = commit --amend -C HEAD
check = "!git fetch; git log HEAD.. --oneline"
[color]
@@ -41,4 +43,4 @@
[merge]
stat = true
[advice]
- pushNonFastForward = false
+ pushNonFastForward = false

0 comments on commit 1c1e0ec

Please sign in to comment.