mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'rc/maint-reflog-msg-for-forced-branch'

Browse Source 
* rc/maint-reflog-msg-for-forced-branch:
  branch: say "Reset to" in reflog entries for 'git branch -f' operations

Conflicts:
	builtin-branch.c
This commit is contained in:
Junio C Hamano
2010-04-09 20:42:10 -07:00
parent 7ec1eb93f7 936db184f0
commit da288e25d9
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
branch.c
View File

@ -198,7 +198,7 @@ void create_branch(const char *head,
log_all_ref_updates = 1; log_all_ref_updates = 1;
if (forcing) if (forcing)
snprintf(msg, sizeof msg, "branch: Reset from %s", snprintf(msg, sizeof msg, "branch: Reset to %s",
start_name); start_name);
else if (!dont_change_ref) else if (!dont_change_ref)
snprintf(msg, sizeof msg, "branch: Created from %s", snprintf(msg, sizeof msg, "branch: Created from %s",