summaryrefslogtreecommitdiff
path: root/git-parse-remote.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-12-22 23:21:55 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-12-22 23:21:55 (GMT)
commit228e2eb67e9f15983519f472cc1566a3dd857f9c (patch)
tree2ba0c8bf7369621e825bf1e9f486e64abf52ff61 /git-parse-remote.sh
parent2295e8d0c4cec41fbe257ddb957516a7c1a139df (diff)
downloadgit-228e2eb67e9f15983519f472cc1566a3dd857f9c.zip
git-228e2eb67e9f15983519f472cc1566a3dd857f9c.tar.gz
git-228e2eb67e9f15983519f472cc1566a3dd857f9c.tar.bz2
merge and reset: adjust for "reset --hard" messages
An earlier commit made "reset --hard" chattier but leaking its message from "git rebase" (which calls it when first rewinding the current branch to prepare replaying our own changes) without explanation was confusing, so add an extra message to mention it. Inside restorestate in merge (which is rarely exercised codepath, where more than one strategies are attempted), resetting to the original state uses "reset --hard" -- this can be squelched entirely. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-parse-remote.sh')
0 files changed, 0 insertions, 0 deletions