Re: [PATCH 2/2] rebase -i: do not leave a CHERRY_PICK_HEAD file behind
From: Johannes Schindelin <hidden>
Date: 2016-06-15 23:05:21
Hi, On 2015-06-17 14:58, SZEDER Gábor wrote:
Quoting Johannes Schindelin [off-list ref]:quoted
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index dc3133f..16e0a82 100644 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh@@ -849,7 +849,11 @@ continue) # do we have anything to commit? if git diff-index --cached --quiet HEAD -- then - : Nothing to commit -- skip this + : Nothing to commit -- skip this commit"While at it", perhaps you could turn this into a proper comment with '#". Now that this if-branch starts to actually do something, there's no reason to continue (ab)using the null command.
Sure thing. I'll wait if there are more comments and then send out v2. Ciao, Johannes