Signed-off-by: Stefan Beller <sbel...@google.com>
---
When working on a large feature consisting of lots of commits,
my development workflow is to create a lot of very small commits and
then reshuffle these via interactive rebase.
Sometimes the commit message titles for these very small commits are
not as good as I thought they would, such that the interactive rebase
session needs to be accompanied by extensive use of gitk in my case.
This is a small hack that adds the diffstat to the interactive rebase
helping me a bit during the rebase, such that:
$ git rebase -i HEAD^^
pick 2eaa3f532c Third batch for 2.12
# Documentation/RelNotes/2.12.0.txt | 40
+++++++++++++++++++++++++++++++++++++++
# 1 file changed, 40 insertions(+)
pick 3170a3a57b add information to rebase
# git-rebase--interactive.sh | 2 ++
# 1 file changed, 2 insertions(+)
# Rebase 2eaa3f532c..3170a3a57b onto 2eaa3f532c (1 command)
#
# Commands:
# p, pick = use commit
# r, reword = use commit, but edit the commit message
# e, edit = use commit, but stop for amending
I am not completely satisfied with the result, as I initially wished these
information would just appear in line after the commit subject, but this
comes close. Maybe the last line also needs to be dropped.
This is not a patch meant for inclusion, as for that we'd want to hide this
feature behind an option I'd guess.
Stefan
git-rebase--interactive.sh | 2 ++
1 file changed, 2 insertions(+)
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 41fd374c72..db73c69674 100644
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -1220,6 +1220,7 @@ do
if test t != "$preserve_merges"
then
printf '%s\n' "${comment_out}pick $sha1 $rest" >>"$todo"
+ git diff --stat $sha1^..$sha1 |sed s/^/"$comment_char"/
>>"$todo"
else
if test -z "$rebase_root"
then
@@ -1238,6 +1239,7 @@ do
then
touch "$rewritten"/$sha1
printf '%s\n' "${comment_out}pick $sha1 $rest" >>"$todo"
+ git diff --stat $sha1^..$sha1 |sed s/^/"$comment_char"/
>>"$todo"
fi
fi
done
--
2.11.0.193.g3170a3a57b
