summaryrefslogtreecommitdiff
path: root/Documentation/technical/api-index-skel.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-03-27 10:51:10 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-03-27 10:51:10 -0700
commitd011ab4312a8ddabd143567fa9706b8e9fb9c0a4 (patch)
treea7167cc0ece6125ff59ba1fc6ae78119f863017d /Documentation/technical/api-index-skel.txt
parentMore corrections for 1.8.2.1 (diff)
parentmerge-tree: fix typo in merge-tree.c::unresolved (diff)
downloadtgif-d011ab4312a8ddabd143567fa9706b8e9fb9c0a4.tar.xz
Merge branch 'maint-1.8.1' into maint
* maint-1.8.1: merge-tree: fix typo in merge-tree.c::unresolved git-commit doc: describe use of multiple `-m` options git-pull doc: fix grammo ("conflicts" is plural)
Diffstat (limited to 'Documentation/technical/api-index-skel.txt')
0 files changed, 0 insertions, 0 deletions