[Libreoffice] git: backporting/cherry-picking a patch across different repositories

[Lionel Elie Mamane]

On Mon, Nov 28, 2011 at 11:46:44PM +0100, Eike Rathke Dwrote:
> On Monday, 2011-11-28 10:39:25 +0100, Lionel Elie Mamane wrote:

>> ~/src/libreoffice/libreoffice-3.4/clone/filters$ ( cd ~/src/libreoffice/core/; git format-patch --stdout b645f9195f4da3014e001fb27b8a117d89c8f389^1..b645f9195f4da3014e001fb27b8a117d89c8f389 ) | git am -s

> Just a hint: with format-patch option -1 you don't need to specify the
> commit twice to form a range, so

> ~/src/libreoffice/libreoffice-3.4/clone/filters$ ( cd ~/src/libreoffice/core/; git format-patch --stdout -1 b645f9195f4da3014e001fb27b8a117d89c8f389 ) | git am -s

Ah, thanks, that's indeed more practical to type.

Also, I've just lived on another backport that the patch failed to
apply because of tabs vs spaces... In that case:

git am --abort
Repeat the command adding the --ignore-space-change option to the "git
am" call.

-- 
Lionel