diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-02-27 13:57:18 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-02-27 13:57:18 -0800 |
| commit | c13c783c9d3d7d3eff937b7bf3642d2a7fe32644 (patch) | |
| tree | c650be76225f1b73aa5df51bcba519c532ebf437 /builtin/merge-ours.c | |
| parent | Merge branch 'jk/tempfile-ferror-fclose-confusion' (diff) | |
| parent | branch: record creation of renamed branch in HEAD's log (diff) | |
| download | tgif-c13c783c9d3d7d3eff937b7bf3642d2a7fe32644.tar.xz | |
Merge branch 'km/delete-ref-reflog-message'
"git update-ref -d" and other operations to delete references did
not leave any entry in HEAD's reflog when the reference being
deleted was the current branch. This is not a problem in practice
because you do not want to delete the branch you are currently on,
but caused renaming of the current branch to something else not to
be logged in a useful way.
* km/delete-ref-reflog-message:
branch: record creation of renamed branch in HEAD's log
rename_ref: replace empty message in HEAD's log
update-ref: pass reflog message to delete_ref()
delete_ref: accept a reflog message argument
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions