summaryrefslogtreecommitdiff
path: root/merge-recursive.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-08-18 22:07:54 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-08-18 22:07:54 -0700
commitd8308c79fc2cae2d1891f92b9e0f9ec0361fe7df (patch)
tree25598aff5456212a2ea45cff89c72fd49dc5a848 /merge-recursive.h
parentMerge branch 'maint' (diff)
parentam: Document new --exclude=<path> option (diff)
downloadtgif-d8308c79fc2cae2d1891f92b9e0f9ec0361fe7df.tar.xz
Merge branch 'ma/am-exclude'
* ma/am-exclude: am: Document new --exclude=<path> option am: pass exclude down to apply
Diffstat (limited to 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions