Re: [ANNOUNCE] git-push-update, tool to push with "server-side" merge or rebase

2016-03-29 Thread Max Kirillov
On Tue, Mar 29, 2016 at 09:29:45PM -0400, Trevor Saunders wrote: > hm how? the workflow you use locally has basically nothingto do with how > pushes work. I work on several projects daily where everyone pushes to > trunk, but locally I use branches. You just need to fetch rebase then > either mer

Re: [ANNOUNCE] git-push-update, tool to push with "server-side" merge or rebase

2016-03-29 Thread Trevor Saunders
On Mon, Mar 28, 2016 at 11:08:41AM +0300, Max Kirillov wrote: > Hello. > > I would like to announce git-push-update, a tool which emulates > server-side merge or rebase. > > The link: https://github.com/max630/git-push-update > > It is a bash script which fetches latest remote branch, creates >

[ANNOUNCE] git-push-update, tool to push with "server-side" merge or rebase

2016-03-28 Thread Max Kirillov
Hello. I would like to announce git-push-update, a tool which emulates server-side merge or rebase. The link: https://github.com/max630/git-push-update It is a bash script which fetches latest remote branch, creates temporary clone, performs there merge or rebase, pushes results to server. If du