summaryrefslogtreecommitdiff
path: root/t/t6026-merge-attr.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-07-25 21:52:48 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-07-25 21:52:48 -0700
commit28bf4ba014c9b41679f41580fa9e1cc294b240d9 (patch)
treea6022548d912545768678c25ffbac6c57461787e /t/t6026-merge-attr.sh
parentDocumentation/config: describe status.submodulesummary (diff)
parentMerge branch 'maint-1.6.5' into maint-1.6.6 (diff)
downloadtgif-28bf4ba014c9b41679f41580fa9e1cc294b240d9.tar.xz
Merge branch 'maint-1.6.6' into maint-1.7.0
* maint-1.6.6: request-pull.txt: Document -p option Check size of path buffer before writing into it rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-option
Diffstat (limited to 't/t6026-merge-attr.sh')
0 files changed, 0 insertions, 0 deletions