Re: diff weirdness (bug?)

2014-02-18 Thread Junio C Hamano
Dario Bertini writes: > On 02/14/2014 09:03 PM, Junio C Hamano wrote: >> This is a combined diff, and yaml-related lines are added relative >> to your _other_ branch you are merging (notice these + are indented >> by one place). Relative to what you had at the tip of your branch >> before you st

Re: diff weirdness (bug?)

2014-02-17 Thread Thomas Rast
Dario Bertini writes: > On 02/14/2014 09:03 PM, Junio C Hamano wrote: >> This is a combined diff, and yaml-related lines are added relative >> to your _other_ branch you are merging (notice these + are indented >> by one place). Relative to what you had at the tip of your branch >> before you st

Re: diff weirdness (bug?)

2014-02-16 Thread Dario Bertini
On 02/14/2014 09:03 PM, Junio C Hamano wrote: > This is a combined diff, and yaml-related lines are added relative > to your _other_ branch you are merging (notice these + are indented > by one place). Relative to what you had at the tip of your branch > before you started this operation that ende

Re: diff weirdness (bug?)

2014-02-14 Thread Junio C Hamano
Dario Bertini writes: > git clone g...@github.com:ansible/ansible.git > git revert 3616dffb68badb2b8d56 > > manually solve the conflict (you can look at the commit here: > https://github.com/ansible/ansible/commit/3616dffb68badb2b8d56ef34391d7aae8de79cd6 > ) > > git diff will output: > > dario@ma

diff weirdness (bug?)

2014-02-14 Thread Dario Bertini
git clone g...@github.com:ansible/ansible.git git revert 3616dffb68badb2b8d56 manually solve the conflict (you can look at the commit here: https://github.com/ansible/ansible/commit/3616dffb68badb2b8d56ef34391d7aae8de79cd6 ) git diff will output: dario@macbook ~/P/ansible (devel*+|REVERTING)> gi