blob: 14b48b6018116edcede2ec951fc02151f4380ff3 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
|
[core]
excludesfile = ~/.gitignore
[color]
ui = auto
[include]
path = .custom/gitconfig
[push]
default = matching
[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"
|