diff options
| author |  Pratik Karki <predatoramigo@gmail.com> | 2018-09-04 14:27:20 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-09-06 11:55:43 -0700 |
| commit | d4c569f8f4c67e3846303f772e1b6bdbabf98297 (patch) | |
| tree | 55a38fcb5a815d7033adbefa9c9bf30e8061222b /Documentation/git-mergetool.txt | |
| parent | builtin rebase: start a new rebase only if none is in progress (diff) | |
| download | tgif-d4c569f8f4c67e3846303f772e1b6bdbabf98297.tar.xz | |
builtin rebase: only store fully-qualified refs in `options.head_name`
When running a rebase on a detached HEAD, we currently store the string
"detached HEAD" in options.head_name. That is a faithful translation of
the shell script version, and we still kind of need it for the purposes of
the scripted backends.
It is poor style for C, though, where we would really only want a valid,
fully-qualified ref name as value, and NULL for detached HEADs, using
"detached HEAD" for display only. Make it so.
Signed-off-by: Pratik Karki <predatoramigo@gmail.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-mergetool.txt')
0 files changed, 0 insertions, 0 deletions