Skip to content

Commit

Permalink
Remove hardcoded branch name from accept-work
Browse files Browse the repository at this point in the history
We have to use WORK_BRANCH variable as a work branch instead of
hardcoded name.
  • Loading branch information
extsoft committed Jul 29, 2019
1 parent 4c587d8 commit 043b78c
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion libexec/git-elegant-accept-work
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ default() {
# 2. `git rebase` is completed (history of `${WORK_BRANCH}` and `${RMASTER}` are different),
# just work with `${MASTER}` branch.
boxtee git checkout ${MASTER}
boxtee git merge --ff-only eg
boxtee git merge --ff-only ${WORK_BRANCH}
boxtee git push ${REMOTE_NAME} ${MASTER}:${MASTER}
boxtee git branch --delete ${WORK_BRANCH}
boxtee git push ${REMOTE_NAME} --delete $(echo "${1}" | sed -e "s|${REMOTE_NAME}/||")
Expand Down

0 comments on commit 043b78c

Please sign in to comment.