From: Junio C Hamano Date: Sun, 04 Mar 2012 23:35:57 GMT Subject: [git wiki PATCH] Teaching "--3way" to "git apply" Message-ID: <7vbooc6isi.fsf@alter.siamese.dyndns.org> In-Reply-To: <20120302091114.GA3984@sigill.intra.peff.net> I am a bit reluctant to be the one who suggests this, as I do not want to be in the mentoring business, given that as the maintainer, I am by definition a large part of the process to grade the success of student projects. But I think I should mention this, as it is a reasonable bite-size task for a student project that is to be completed inside one release cycle. --- SoC-2012-Ideas.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/SoC-2012-Ideas.md b/SoC-2012-Ideas.md index 17e07e0..aeaacb1 100644 --- a/SoC-2012-Ideas.md +++ b/SoC-2012-Ideas.md @@ -263,3 +263,16 @@ This is not as terribly complicated as it looks, because the existing networking Programming language: C89 Possible mentor(s): Vicent Marti, Russell Belfer + +Teaching "--3way" to "git apply" +-------------------------------- + +The "-3" option "git am" understands is useful only when you are +applying a full format-patch submission. Teaching the three-way +fallback to underlying "git apply" would make the feature avialable in +more use cases, and later can help making the implementation of "git +am -3" simpler. + +Programming language: C89 +Suggested by: Junio C Hamano +Possible mentors: ???