diff --git a/setup.sh b/setup.sh index 31f8189..371d2e9 100755 --- a/setup.sh +++ b/setup.sh @@ -82,7 +82,7 @@ git_config(){ $_gitconfig alias.clean-p "!test -z \"\$(git status -s -uno)\"" $_gitconfig alias.newb "checkout -b" $_gitconfig alias.endb \ - "!sh -c 'git stash && git checkout master && git merge --no-ff -'" + "!sh -cx 'git stash && git checkout master && git merge --no-ff -'" #$_gitconfig alias.wc "!git ls-files -z | xargs -0 wc" # $_gitconfig push.default "simple" if _iswindows; then