Re: [PATCH v2 3/3] am: let --signoff override --no-signoff

On Fri, Aug 7, 2015 at 5:29 PM, Johannes Schindelin johannes.schinde...@gmx.de wrote: diff --git a/builtin/am.c b/builtin/am.c index 0961304..8c95aec 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -2265,6 +2284,9 @@ int cmd_am(int argc, const char **argv, const char *prefix)

Re: [PATCH v2 3/3] am: let --signoff override --no-signoff

On Wed, Aug 12, 2015 at 11:06 AM, Paul Tan pyoka...@gmail.com wrote: It's not present in this diff context, but this hunk modifies the code path where in_progress is true. In other words, we only check for SIGNOFF_EXPLICIT if ..we are resuming. (Ugh, butter fingers) Thanks, Paul -- To

Re: [PATCH v2 3/3] am: let --signoff override --no-signoff

Hi Paul, On 2015-08-04 16:08, Paul Tan wrote: diff --git a/builtin/am.c b/builtin/am.c index 0961304..8c95aec 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -2151,8 +2169,9 @@ int cmd_am(int argc, const char **argv, const [...] char *prefix) OPT_BOOL('3', 3way,

[PATCH v2 3/3] am: let --signoff override --no-signoff

After resolving a conflicting patch, a user may wish to sign off the patch to declare that the patch has been modified. As such, the user will expect that running git am --signoff --continue will append the signoff to the commit message. However, the --signoff option is only taken into account