summaryrefslogtreecommitdiff
path: root/merge-recursive.h
diff options
context:
space:
mode:
authorLibravatar Stephen Boyd <bebarino@gmail.com>2010-07-23 09:31:27 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-07-25 21:52:19 -0700
commitd8e3ac7e7264863544c95069024f1cbaedb5db3d (patch)
treea3c7080def3c05358340133f961c62741e6834ad /merge-recursive.h
parentMerge branch 'maint-1.6.4' into maint-1.6.5 (diff)
downloadtgif-d8e3ac7e7264863544c95069024f1cbaedb5db3d.tar.xz
request-pull.txt: Document -p option
Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions