Junio C Hamano 228e2eb67e 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>

2006-12-22 15:21:55 -08:00

10 KiB

Executable File

Raw Blame History

View Raw