summaryrefslogtreecommitdiff
path: root/builtin-pack-objects.c
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2007-05-08 02:57:15 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-05-09 05:47:09 (GMT)
commitabda5227770b39bb4abd8f0b4c1a0f69c2778300 (patch)
treefbf8bedc62c3b3de51df0ffbc21736031ca6d417 /builtin-pack-objects.c
parent4662231e5654924c78fcb4b630fb48c58b945b7f (diff)
downloadgit-abda5227770b39bb4abd8f0b4c1a0f69c2778300.zip
git-abda5227770b39bb4abd8f0b4c1a0f69c2778300.tar.gz
git-abda5227770b39bb4abd8f0b4c1a0f69c2778300.tar.bz2
Use .git/MERGE_MSG in cherry-pick/revert
Rather than storing the temporary commit message data in .msg (in the working tree) we now store the message data in .git/MERGE_MSG. By storing the message in the .git/ directory we are sure we will never have a collision with a user file, should a project actually have a ".msg" file in their top level tree. We also don't need to worry about leaving this stale file behind during a `reset --hard` and have it show up in the output of status. We are using .git/MERGE_MSG here to store the temporary message as it is an already established convention between git-merge, git-am and git-rebase that git-commit will default the user's edit buffer to the contents of .git/MERGE_MSG. If the user is going to need to resolve this commit or wants to edit the message on their own prepping that file with the desired message "just works". Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'builtin-pack-objects.c')
0 files changed, 0 insertions, 0 deletions