diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-04-10 05:42:10 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-04-10 05:42:10 +0200 |
| commit | da288e25d9e10b746cf3b311cb4503d1810cde37 (patch) | |
| tree | 3fdf480d143a4d5d47b73b6cbeb16614d2be2332 /branch.c | |
| parent | Merge early parts of jk/cached-textconv (diff) | |
| parent | branch: say "Reset to" in reflog entries for 'git branch -f' operations (diff) | |
| download | git-da288e25d9e10b746cf3b311cb4503d1810cde37.tar.xz git-da288e25d9e10b746cf3b311cb4503d1810cde37.zip | |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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", |