Le Tirsdag 17 mars 2009, Johannes Schindelin a écrit : > Hi, > > On Tue, 17 Mar 2009, Olivier Goffart wrote: > > I use git in a workflow in wich we often need to edit the message logs > > of some commits. The way we do it is using git rebase -i and choose > > edit. But then you need to do git commit --amend and git rebase > > --continue, which is error prone and add more useless steps. > > > > The attached patch add a new keyword to git rebase interactive to just > > edit the message log. > > > > I was told on IRC that this has been discussed already not so long ago, > > and looking on the archive[1], all i seen was bikesheeding . Here is a > > patch :-) > > Unfortunately, the implementation is not the problem, but picking the best > name. The first letter "m" will be taken in a short while by the "merge" > command for "rebase -i -p", so "message" is out, sadly. > > But the "rephrase" command will be part of the "rebase -i -p" series when > I will finally be able to submit it. Hi, Sorry I'm late to reply :-) I still think this feature to edit the message in git rebase -i is really usefull. So 'm' is really taken, what about 'r' for 'rephrase'? or maybe 'rephrase' is something different? Regards -- Olivier
commit 5d784b748328c7bccfddab7edba5a9dcf70518b8
Author: Olivier Goffart <ogoffart@xxxxxxx>
Date: Tue Mar 17 19:41:40 2009 +0100
rebase interactive: add the possibility to easily edit the message log of commits
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 314cd36..91714d6 100755
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -406,6 +406,16 @@ do_next () {
die_with_patch $sha1 ""
fi
;;
+ rephrase|r)
+ comment_for_reflog message
+
+ mark_action_done
+
+ pick_one $sha1 ||
+ die_with_patch $sha1 "Could not apply $sha1... $rest"
+
+ git commit --amend || failed=t
+ ;;
*)
warn "Unknown command: $command $sha1 $rest"
die_with_patch $sha1 "Please fix this in the file $TODO."
@@ -754,6 +764,7 @@ first and then run 'git rebase --continue' again."
# p, pick = use commit
# e, edit = use commit, but stop for amending
# s, squash = use commit, but meld into previous commit
+# r, rephrase = use commit and promt the editor to edit the message log
#
# If you remove a line here THAT COMMIT WILL BE LOST.
# However, if you remove everything, the rebase will be aborted.
Attachment:
signature.asc
Description: This is a digitally signed message part.