Allow editing of a revert-message
I think all commit operations should allow editing of the message (ie we should do this for merges too), but that's _particularly_ true of doing a "git revert". We should always explain why we needed to revert something. This patch adds a "-e" or "--edit" flag to "git revert", although I actually suspect it should be on by default (and we should have a "--no-edit" flag to disable it, probably together with an automatic disable if stdin isn't a terminal). Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
073dab137a
commit
30c7bb249e
@ -25,7 +25,7 @@ usage () {
|
|||||||
esac
|
esac
|
||||||
}
|
}
|
||||||
|
|
||||||
no_commit= replay=
|
no_commit= replay= edit=
|
||||||
while case "$#" in 0) break ;; esac
|
while case "$#" in 0) break ;; esac
|
||||||
do
|
do
|
||||||
case "$1" in
|
case "$1" in
|
||||||
@ -36,6 +36,9 @@ do
|
|||||||
-r|--r|--re|--rep|--repl|--repla|--replay)
|
-r|--r|--re|--rep|--repl|--repla|--replay)
|
||||||
replay=t
|
replay=t
|
||||||
;;
|
;;
|
||||||
|
-e|--edit)
|
||||||
|
edit=t
|
||||||
|
;;
|
||||||
-*)
|
-*)
|
||||||
usage
|
usage
|
||||||
;;
|
;;
|
||||||
@ -161,6 +164,7 @@ echo >&2 "Finished one $me."
|
|||||||
# If we are revert, or if our cherry-pick results in a hand merge,
|
# If we are revert, or if our cherry-pick results in a hand merge,
|
||||||
# we had better say that the current user is responsible for that.
|
# we had better say that the current user is responsible for that.
|
||||||
|
|
||||||
|
[ "$edit" ] && ${EDITOR:-${VISUAL:-vi}} .msg
|
||||||
case "$no_commit" in
|
case "$no_commit" in
|
||||||
'')
|
'')
|
||||||
git-commit -n -F .msg
|
git-commit -n -F .msg
|
||||||
|
Loading…
Reference in New Issue
Block a user