From 591433b9b909b7602fbf61a7cc60b5068f8f8ab7 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Fri, 20 Dec 2013 11:22:28 -0600 Subject: [PATCH] shears.sh: introduce the 'rewind' shortcut It is much nicer to read rewind onto than exec git reset --hard refs/rewritten/onto in the rebase script... ;-) Signed-off-by: Johannes Schindelin --- share/msysGit/shears.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/share/msysGit/shears.sh b/share/msysGit/shears.sh index c78134e0..1b785c2d 100755 --- a/share/msysGit/shears.sh +++ b/share/msysGit/shears.sh @@ -38,7 +38,7 @@ EOF } # Extra commands for use in the rebase script -extra_commands="edit mark merge start_merging_rebase cleanup" +extra_commands="edit mark rewind merge start_merging_rebase cleanup" edit () { GIT_EDITOR="$1" && @@ -67,6 +67,10 @@ mark () { git update-ref -m "Marking '$1' as rewritten" refs/rewritten/"$1" HEAD } +rewind () { + git reset --hard refs/rewritten/"$1" +} + merge () { # parse command-line arguments parents= @@ -242,9 +246,8 @@ EOF case "$handled " in *" $commit "*) ensure_labeled $commit - subtodo="$(printf '\nexec %s %s # %s\n%s' \ - 'git reset --hard' \ - "refs/rewritten/$commit" \ + subtodo="$(printf '\nrewind %s # %s\n%s' \ + "$(name_commit $commit)" \ "$(git show -s --format=%s $commit)" \ "$subtodo")" break -- 2.11.4.GIT