summaryrefslogtreecommitdiff
path: root/Documentation/technical/api-remote.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-05-16 11:46:22 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-05-16 19:46:31 -0700
commit8763dbb1b24c260243f69130c734c13563a16db6 (patch)
treef7b00dbc6d05080cf5b6100f255cad0d76dc80b8 /Documentation/technical/api-remote.txt
parentbuiltin-checkout: Don't tell user that HEAD has moved before it has (diff)
downloadtgif-8763dbb1b24c260243f69130c734c13563a16db6.tar.xz
completion: fix PS1 display during a merge on detached HEAD
If your merge stops in a conflict while on a detached HEAD, recent completion code fails to show anything. This was because various cases added to support the operation-in-progress markers (e.g. REBASE, MERGING) forgot that they need to set the variable "b" to something for the result they computed to be displayed at all. Probably not many people make trial merges on a detached HEAD (which is tremendously useful feature of git, by the way), and that may be why this was not noticed for a long time. Acked-By: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/technical/api-remote.txt')
0 files changed, 0 insertions, 0 deletions