diff --git a/config/.gitconfig b/config/.gitconfig index 887c5c3..17c2688 100644 --- a/config/.gitconfig +++ b/config/.gitconfig @@ -16,7 +16,7 @@ upload = "!f(){ git push $@ origin $(git rev-parse --abbrev-ref HEAD); }; f" faxm = "!f(){ git fetch upstream master && git checkout -b ENG1FAXM-$1 upstream/master; }; f" drqs = "!f(){ git fetch upstream master && git checkout -b DRQS-$1 upstream/master; }; f" - install-hooks = "!f(){ GIT_HOOKS=\"$(git rev-parse --git-dir)/hooks/\"; GOLDEN_HOOKS=\"$HOME/devel/scripts/git/hooks\"; [ -d \"$GIT_HOOKS\" ] && [ -d \"$GOLDEN_HOOKS\" ] && cp -r \"$GOLDEN_HOOKS/.\" \"$GIT_HOOKS\"; }; f" + install-hooks = "!f(){ GIT_HOOKS=\"$(git rev-parse --git-dir)/hooks/\"; GOLDEN_HOOKS=\"$HOME/devel/scripts/git/hooks\"; [ -d \"$GIT_HOOKS\" ] && [ -d \"$GOLDEN_HOOKS\" ] && cp -rf \"$GOLDEN_HOOKS/.\" \"$GIT_HOOKS\"; }; f" refresh-master = "!f(){ git fetch upstream master; git checkout upstream/master; git branch -D master; git checkout -b master; }; f" setup-upstream = "!source $HOME/devel/scripts/git/setup-upstream.sh" [merge]