diff options
Diffstat (limited to 'gitconfig.dot.link')
| -rw-r--r-- | gitconfig.dot.link | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/gitconfig.dot.link b/gitconfig.dot.link index 2c332de..14b48b6 100644 --- a/gitconfig.dot.link +++ b/gitconfig.dot.link @@ -12,3 +12,8 @@ [hooks] global = ~/apps/scripts/misc/git-hooks/contrib/ ~/.git_hooks + +[alias] + # Thanks https://stackoverflow.com/questions/3672073/git-merge-to-another-branch + #merge-to = "!f() { git checkout $1 && git merge $2 && git checkout -; }; f" + merge-to = "!f() { export tmp_branch=`git branch | grep '* ' | tr -d '* '`; git checkout $1 && git merge $tmp_branch && git checkout $tmp_branch; unset $tmp_branch; }; f" |