Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'rc/maint-reflog-msg-for-forced-branch'
author
Junio C Hamano
<gitster@pobox.com>
Sat, 10 Apr 2010 03:42:10 +0000
(20:42 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Sat, 10 Apr 2010 03:42:10 +0000
(20:42 -0700)
* rc/maint-reflog-msg-for-forced-branch:
branch: say "Reset to" in reflog entries for 'git branch -f' operations
Conflicts:
builtin-branch.c
branch.c
patch
|
blob
|
history
raw
(from parent 1:
7ec1eb9
)
diff --git
a/branch.c
b/branch.c
index 9e1f63ed8dbe8b087f99292880059642d9744697..2ab42aaf4da38b4ea45ef7f0a0f6b807313d4a22 100644
(file)
--- 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",