Re: [PATCH 1/2] push: avoid suggesting merging remote changes

2013-07-08 Thread Matthieu Moy
John Keeping j...@keeping.me.uk writes: static const char message_advice_pull_before_push[] = N_(Updates were rejected because the tip of your current branch is behind\n -its remote counterpart. Merge the remote changes (e.g. 'git pull')\n -before pushing again.\n

Re: [PATCH 1/2] push: avoid suggesting merging remote changes

2013-07-08 Thread John Keeping
On Mon, Jul 08, 2013 at 03:47:19PM +0200, Matthieu Moy wrote: John Keeping j...@keeping.me.uk writes: static const char message_advice_pull_before_push[] = N_(Updates were rejected because the tip of your current branch is behind\n - its remote counterpart. Merge the remote