[PATCH v4 29/45] rebase: cherry-pick: automatically commit stage
From: Felipe Contreras <hidden>
Date: 2016-06-15 22:57:38
Subsystem:
the rest · Maintainer:
Linus Torvalds
When there's changes in the staging area. Just like the other rebase modes. Signed-off-by: Felipe Contreras <redacted> --- git-rebase--cherrypick.sh | 6 ++++++ 1 file changed, 6 insertions(+)
diff --git a/git-rebase--cherrypick.sh b/git-rebase--cherrypick.sh
index be17ec4..241cda7 100644
--- a/git-rebase--cherrypick.sh
+++ b/git-rebase--cherrypick.sh@@ -8,6 +8,12 @@ export GIT_CHERRY_PICK_HELP case "$action" in continue) + # do we have anything to commit? + if ! git diff-index --cached --quiet HEAD -- + then + git commit --no-verify -e || + die "Could not commit staged changes." + fi git cherry-pick --continue && move_to_original_branch return
--
1.8.3.698.g079b096