summaryrefslogtreecommitdiff
path: root/merge-recursive.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-01-28 23:56:13 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-01-28 23:56:13 -0800
commita9ed6ce0e7057b94809d3c51094ba96fe96fded8 (patch)
tree71e9dce5864dd1a885b8853903b6d9ae2219f91a /merge-recursive.h
parentMerge branch 'bs/maint-rename-populate-filespec' into maint (diff)
parentTeach format-patch to handle output directory relative to cwd (diff)
downloadtgif-a9ed6ce0e7057b94809d3c51094ba96fe96fded8.tar.xz
Merge branch 'jc/maint-format-patch-o-relative' into maint
* jc/maint-format-patch-o-relative: Teach format-patch to handle output directory relative to cwd Conflicts: t/t4014-format-patch.sh
Diffstat (limited to 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions