On Mon, Mar 31, 2014 at 3:15 PM, Junio C Hamano wrote:
> As you are doing -3 (not the -p3), it would have:
>
> * noticed that the patch is trying to update "baz/file";
>
> * noticed that there is no "baz/file" but it could salvage the
>patch by doing a three-way merge, in case that the patch
Sverre Rabbelier writes:
> Hi,
>
> I noticed something very odd with git am, and have been able to narrow
> it down to a minimal example.
>
> git init tmp
> cd tmp
> mkdir -p foo/bar/baz
> cd foo/bar/baz
> echo file > file
> git add file
> git commit -m "1"
> echo other > other
> echo mo
Hi,
I noticed something very odd with git am, and have been able to narrow
it down to a minimal example.
git init tmp
cd tmp
mkdir -p foo/bar/baz
cd foo/bar/baz
echo file > file
git add file
git commit -m "1"
echo other > other
echo more >> file
git add file other
git commit -m "my tes
3 matches
Mail list logo
