summaryrefslogtreecommitdiff
path: root/git-merge-octopus.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-08-19 14:23:55 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-09-15 13:23:20 -0700
commite543b3f6fee9f910573d53ddfc0750cd2bf88972 (patch)
tree829f22abe40c35168a5d72f016b13233e7fbe36e /git-merge-octopus.sh
parentgpg-interface: move parse_signature() to where it should be (diff)
downloadtgif-e543b3f6fee9f910573d53ddfc0750cd2bf88972.tar.xz
pack-protocol doc: typofix for PKT-LINE
Everywhere else we use PKT-LINE to denote the pkt-line formatted data, but "shallow/deepen" messages are described with PKT_LINE(). Fix them. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions