https://bugs.freedesktop.org/show_bug.cgi?id=71789 --- Comment #37 from Marek Olšák --- You can try "git am -3 ...". If that doesn't help, then I don't know. -- You are receiving this mail because: You are the assignee for the bug.