Fail git pull --rebase when local merges present? (was: [ANNOUNCE] Git v2.11.1)

2017-02-03 Thread Stephen Bash
On Thu, Feb 2, 2017 at 6:05 PM, Junio C Hamano wrote: > * "git pull --rebase", when there is no new commits on our side since >we forked from the upstream, should be able to fast-forward without >invoking "git rebase", but it didn't. As someone who has to mentor new

Fail git pull --rebase when local merges present? (was: [ANNOUNCE] Git v2.11.1)

2017-02-03 Thread Stephen Bash
On Thu, Feb 2, 2017 at 6:05 PM, Junio C Hamano wrote: > * "git pull --rebase", when there is no new commits on our side since >we forked from the upstream, should be able to fast-forward without >invoking "git rebase", but it didn't. As someone who has to mentor new developers to Git

[ANNOUNCE] Git v2.11.1

2017-02-02 Thread Junio C Hamano
The latest maintenance release Git v2.11.1 is now available at the usual places. The tarballs are found at: https://www.kernel.org/pub/software/scm/git/ The following public repositories all have a copy of the 'v2.11.1' tag and the 'maint' branch that the tag points at: url =

[ANNOUNCE] Git v2.11.1

2017-02-02 Thread Junio C Hamano
The latest maintenance release Git v2.11.1 is now available at the usual places. The tarballs are found at: https://www.kernel.org/pub/software/scm/git/ The following public repositories all have a copy of the 'v2.11.1' tag and the 'maint' branch that the tag points at: url =