summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorLibravatar Richard Hansen <rhansen@bbn.com>2013-09-04 15:04:34 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-09-04 15:04:01 -0700
commit4b6acde54364d9350779eb470a1677aa78ed5bf4 (patch)
treeb34fbac0239e4a8ea4fe807e9e3bab7bb46c622c /builtin/merge.c
parentrevisions.txt: fix and clarify <rev>^{<type>} (diff)
downloadtgif-4b6acde54364d9350779eb470a1677aa78ed5bf4.tar.xz
glossary: fix and clarify the definition of 'ref'
Signed-off-by: Richard Hansen <rhansen@bbn.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions