summaryrefslogtreecommitdiff
path: root/ll-merge.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-08-01 14:44:24 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-08-01 14:44:24 -0700
commit3503b8d0da61d920ebd9294fd6a9a0f758328fd3 (patch)
tree5c01cf6a4f85971bd016764a6772fcfc0c4232d7 /ll-merge.h
parentMerge branch 'jl/maint-fetch-recursive-fix' into maint (diff)
parentglossary: clarify description of HEAD (diff)
downloadtgif-3503b8d0da61d920ebd9294fd6a9a0f758328fd3.tar.xz
Merge branch 'nk/ref-doc' into maint
* nk/ref-doc: glossary: clarify description of HEAD glossary: update description of head and ref glossary: update description of "tag" git.txt: de-emphasize the implementation detail of a ref check-ref-format doc: de-emphasize the implementation detail of a ref git-remote.txt: avoid sounding as if loose refs are the only ones in the world git-remote.txt: fix wrong remote refspec
Diffstat (limited to 'll-merge.h')
0 files changed, 0 insertions, 0 deletions