summaryrefslogtreecommitdiff
path: root/notes-merge.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-06-16 14:33:51 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-06-16 14:33:51 -0700
commit6de4c808391ffff01185c093d6c46f2861f48862 (patch)
treed81826d1015e8c5f7c735651a7f9bd20df2db772 /notes-merge.c
parentMerge branch 'ah/usage-strings' into maint (diff)
parentglossary: add "remote", "submodule", "superproject" (diff)
downloadtgif-6de4c808391ffff01185c093d6c46f2861f48862.tar.xz
Merge branch 'sb/glossary-submodule' into maint
* sb/glossary-submodule: glossary: add "remote", "submodule", "superproject"
Diffstat (limited to 'notes-merge.c')
0 files changed, 0 insertions, 0 deletions