aboutsummaryrefslogtreecommitdiff
path: root/vim/syntax
diff options
context:
space:
mode:
authorJani Nikula <jani@nikula.org>2013-02-10 00:49:00 +0200
committerDavid Bremner <bremner@debian.org>2013-02-14 07:57:05 -0400
commita03769db17fe5e2ff15a27391086387d1bfe37e7 (patch)
tree4460ffc762df989a09e5fad4df84bca4ed5aebd6 /vim/syntax
parentd037040997f0dc38467f51e2cd89a558a72acd2a (diff)
nmbug: only push master branch on nmbug push
nmbug pull only merges upstream master, but nmbug push tries to push all local branches. The asymmetry results in conflicts whenever there have been changes in the config branch in the origin: $ nmbug push To nmbug@nmbug.tethera.net:nmbug-tags ! [rejected] config -> config (non-fast-forward) error: failed to push some refs to 'nmbug@nmbug.tethera.net:nmbug-tags' hint: Updates were rejected because a pushed branch tip is behind its remote hint: counterpart. If you did not intend to push that branch, you may want to hint: specify branches to push or set the 'push.default' configuration hint: variable to 'current' or 'upstream' to push only the current branch. 'git push origin' exited with nonzero value To fix this, only push the master branch on nmbug push. Any config changes need to be done manually via git anyway.
Diffstat (limited to 'vim/syntax')
0 files changed, 0 insertions, 0 deletions