summaryrefslogtreecommitdiff
path: root/branch.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-04-10 03:42:10 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-04-10 03:42:10 (GMT)
commitda288e25d9e10b746cf3b311cb4503d1810cde37 (patch)
tree3fdf480d143a4d5d47b73b6cbeb16614d2be2332 /branch.c
parent7ec1eb93f779d06efac106cd1998410932f3c9b2 (diff)
parent936db184f0b51c07aba5e6a8f79352045f887632 (diff)
downloadgit-da288e25d9e10b746cf3b311cb4503d1810cde37.zip
git-da288e25d9e10b746cf3b311cb4503d1810cde37.tar.gz
git-da288e25d9e10b746cf3b311cb4503d1810cde37.tar.bz2
Merge branch 'rc/maint-reflog-msg-for-forced-branch'
* rc/maint-reflog-msg-for-forced-branch: branch: say "Reset to" in reflog entries for 'git branch -f' operations Conflicts: builtin-branch.c
Diffstat (limited to 'branch.c')
-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",