Skip to content

Commit

Permalink
Merge branch 'rc/maint-reflog-msg-for-forced-branch'
Browse files Browse the repository at this point in the history
* rc/maint-reflog-msg-for-forced-branch:
  branch: say "Reset to" in reflog entries for 'git branch -f' operations

Conflicts:
	builtin-branch.c
  • Loading branch information
Junio C Hamano committed Apr 10, 2010
2 parents 7ec1eb9 + 936db18 commit da288e2
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion branch.c
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit da288e2

Please sign in to comment.