On Wed, Apr 11, 2012 at 01:47:48PM -0700, Junio C Hamano wrote: > You inherited the following from your previous round. > > Applying: git-cherry-pick: Add keep-redundant-commits option > /srv/project/git/git.git/.git/rebase-apply/patch:115: space before tab in indent. > * The head tree and the parent tree match > /srv/project/git/git.git/.git/rebase-apply/patch:116: space before tab in indent. > * meaning the commit is empty. Since it wasn't created > /srv/project/git/git.git/.git/rebase-apply/patch:117: space before tab in indent. > * empty (based on the previous test), we can conclude > /srv/project/git/git.git/.git/rebase-apply/patch:118: space before tab in indent. > * the commit has been made redundant. Since we don't > /srv/project/git/git.git/.git/rebase-apply/patch:119: space before tab in indent. > * want to keep redundant commits, just skip this one > warning: squelched 3 whitespace errors > fatal: 8 lines add whitespace errors. > Repository lacks necessary blobs to fall back on 3-way merge. > Cannot fall back to three-way merge. > Patch failed at 0001 git-cherry-pick: Add keep-redundant-commits option > Grr, thanks, forgot to run checkpatch Neil -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html