Re: [PATCH 6/6] am --abort: keep unrelated commits on unborn branch

2015-06-09 Thread Paul Tan
On Tue, Jun 9, 2015 at 4:13 AM, Junio C Hamano wrote: > Paul Tan writes: > >> Since 7b3b7e3 (am --abort: keep unrelated commits since the last failure >> and warn, 2010-12-21), git-am would refuse to rewind HEAD if commits >> were made since the last git-am failure. This check was implemented in

Re: [PATCH 6/6] am --abort: keep unrelated commits on unborn branch

2015-06-08 Thread Junio C Hamano
Paul Tan writes: > Since 7b3b7e3 (am --abort: keep unrelated commits since the last failure > and warn, 2010-12-21), git-am would refuse to rewind HEAD if commits > were made since the last git-am failure. This check was implemented in > safe_to_abort(), which checked to see if HEAD's hash matche

[PATCH 6/6] am --abort: keep unrelated commits on unborn branch

2015-06-06 Thread Paul Tan
Since 7b3b7e3 (am --abort: keep unrelated commits since the last failure and warn, 2010-12-21), git-am would refuse to rewind HEAD if commits were made since the last git-am failure. This check was implemented in safe_to_abort(), which checked to see if HEAD's hash matched the abort-safety file. H