{"thread":{"id":"4881","subject":"[PATCH 2/2] Record rebase changes as 'rebase' in the reflog.","startedAt":"2006-07-14T04:47:23Z","lastAt":"2006-07-14T04:47:23Z","messageCount":1,"participants":["Shawn Pearce"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"23798","messageId":"20060714044723.GB1982@spearce.org","threadId":"4881","inReplyTo":null,"subject":"[PATCH 2/2] Record rebase changes as 'rebase' in the reflog.","fromName":"Shawn Pearce","fromEmail":"spearce@spearce.org","sentAt":"2006-07-14T04:47:23Z","receivedAt":"2006-07-14T04:47:23Z","isPatch":true,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"\nSigned-off-by: Shawn O. Pearce <spearce@spearce.org>\n---\n git-am.sh     |    6 +++++-\n git-rebase.sh |    9 ++++++---\n 2 files changed, 11 insertions(+), 4 deletions(-)\n\ndiff --git a/git-am.sh b/git-am.sh\nindex db9a20a..3a129e0 100755\n--- a/git-am.sh\n+++ b/git-am.sh\n@@ -91,6 +91,7 @@ fall_back_3way () {\n }\n \n prec=4\n+rloga=am\n dotest=.dotest sign= utf8= keep= skip= interactive= resolved= binary= ws= resolvemsg=\n \n while case \"$#\" in 0) break;; esac\n@@ -130,6 +131,9 @@ do\n \t--resolvemsg=*)\n \tresolvemsg=$(echo \"$1\" | sed -e \"s/^--resolvemsg=//\"); shift ;;\n \n+\t--reflog-action=*)\n+\trloga=`expr \"z$1\" : 'z-[^=]*=\\(.*\\)'`; shift ;;\n+\n \t--)\n \tshift; break ;;\n \t-*)\n@@ -413,7 +417,7 @@ do\n \tparent=$(git-rev-parse --verify HEAD) &&\n \tcommit=$(git-commit-tree $tree -p $parent <\"$dotest/final-commit\") &&\n \techo Committed: $commit &&\n-\tgit-update-ref -m \"am: $SUBJECT\" HEAD $commit $parent ||\n+\tgit-update-ref -m \"$rloga: $SUBJECT\" HEAD $commit $parent ||\n \tstop_here $this\n \n \tif test -x \"$GIT_DIR\"/hooks/post-applypatch\ndiff --git a/git-rebase.sh b/git-rebase.sh\nindex 6d06665..14d7ed9 100755\n--- a/git-rebase.sh\n+++ b/git-rebase.sh\n@@ -131,7 +131,8 @@ do\n \t\t\tfinish_rb_merge\n \t\t\texit\n \t\tfi\n-\t\tgit-am --resolved --3way --resolvemsg=\"$RESOLVEMSG\"\n+\t\tgit-am --resolved --3way --resolvemsg=\"$RESOLVEMSG\" \\\n+\t\t\t--reflog-action=rebase\n \t\texit\n \t\t;;\n \t--skip)\n@@ -150,7 +151,8 @@ do\n \t\t\tfinish_rb_merge\n \t\t\texit\n \t\tfi\n-\t\tgit-am -3 --skip --resolvemsg=\"$RESOLVEMSG\"\n+\t\tgit-am -3 --skip --resolvemsg=\"$RESOLVEMSG\" \\\n+\t\t\t--reflog-action=rebase\n \t\texit\n \t\t;;\n \t--abort)\n@@ -288,7 +290,8 @@ fi\n if test -z \"$do_merge\"\n then\n \tgit-format-patch -k --stdout --full-index \"$upstream\"..ORIG_HEAD |\n-\tgit-am --binary -3 -k --resolvemsg=\"$RESOLVEMSG\"\n+\tgit-am --binary -3 -k --resolvemsg=\"$RESOLVEMSG\" \\\n+\t\t--reflog-action=rebase\n \texit $?\n fi\n \n-- \n1.4.1.gd3d5\n"}]}