summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-04-11 20:39:47 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-04-11 20:39:47 (GMT)
commitc512b035556eff4d8f869afeda5fd78bc7a4966d (patch)
tree46da90bee6578f892bd1a419be8f2835875eef46
parentd8c416b2518a96e5d535b8e4b2349e7c647a4be5 (diff)
parent936db184f0b51c07aba5e6a8f79352045f887632 (diff)
downloadgit-c512b035556eff4d8f869afeda5fd78bc7a4966d.zip
git-c512b035556eff4d8f869afeda5fd78bc7a4966d.tar.gz
git-c512b035556eff4d8f869afeda5fd78bc7a4966d.tar.bz2
Merge branch 'rc/maint-reflog-msg-for-forced-branch' into maint
* rc/maint-reflog-msg-for-forced-branch: branch: say "Reset to" in reflog entries for 'git branch -f' operations
-rw-r--r--branch.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/branch.c b/branch.c
index 9e1f63e..2ab42aa 100644
--- a/branch.c
+++ b/branch.c
@@ -198,7 +198,7 @@ void create_branch(const char *head,
log_all_ref_updates = 1;
if (forcing)
- snprintf(msg, sizeof msg, "branch: Reset from %s",
+ snprintf(msg, sizeof msg, "branch: Reset to %s",
start_name);
else if (!dont_change_ref)
snprintf(msg, sizeof msg, "branch: Created from %s",