Browse Source

git close-branch allow ff merge

pull/1/head
10sr 10 years ago
parent
commit
bb95ca7bd8
1 changed files with 1 additions and 1 deletions
  1. +1
    -1
      setup.sh

+ 1
- 1
setup.sh View File

@@ -141,7 +141,7 @@ setup_gitconf(){
# workflow # workflow
_git_open_branch="checkout -b" _git_open_branch="checkout -b"
_git_close_branch="!sh -cx 'git stash && \ _git_close_branch="!sh -cx 'git stash && \
git checkout master && git merge --no-ff -'"
git checkout master && git merge -'"
$_gc alias.open-branch "$_git_open_branch" $_gc alias.open-branch "$_git_open_branch"
$_gc alias.close-branch "$_git_close_branch" $_gc alias.close-branch "$_git_close_branch"
$_gc alias.o "$_git_open_branch" $_gc alias.o "$_git_open_branch"


Loading…
Cancel
Save