summaryrefslogtreecommitdiff
path: root/git-merge-ours.sh
diff options
context:
space:
mode:
authorLibravatar Ryan Anderson <ryan@michonline.com>2006-02-02 11:56:06 -0500
committerLibravatar Junio C Hamano <junkio@cox.net>2006-02-02 17:52:50 -0800
commitd366c7037679794edff38cdbc422997607aca5f1 (patch)
treed7f7c449824ae921ed0ff066cf98f2e066272404 /git-merge-ours.sh
parentcommit.c: "Merge" fix in pretty_print_commit. (diff)
downloadtgif-d366c7037679794edff38cdbc422997607aca5f1.tar.xz
Provide a more meaningful initial "From " line when using --compose in git-send-email.
git-send-email, when used with --compose, provided the user with a mbox-format file to edit. Some users, however, were confused by the leading, blank, "From " line, so this change puts the value that will appear on the From: line of the actual email on this line, along with a note that the line is ignored. Signed-off-by: Ryan Anderson <ryan@michonline.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge-ours.sh')
0 files changed, 0 insertions, 0 deletions