Re: [PATCH v7 2/4] git-cherry-pick: Add keep-redundant-commits option
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:53:37
Neil Horman [off-list ref] writes:
quoted hunk ↗ jump to hunk
diff --git a/sequencer.c b/sequencer.c index 71929ba..e33dfbb 100644 --- a/sequencer.c +++ b/sequencer.c@@ -13,6 +13,7 @@ #include "rerere.h" #include "merge-recursive.h" #include "refs.h" +#include "argv-array.h" #define GIT_REFLOG_ACTION "GIT_REFLOG_ACTION"@@ -251,6 +252,30 @@ static int do_recursive_merge(struct commit *base, struct commit *next, return !clean; } +static int is_index_unchanged() +{
Hmm... I am reasonably sure I fixed this when I queued the previous one to
'pu'.
static int is_index_unchanged(void)
{