depot_tools

Commit Graph

Author	SHA1	Message	Date
thakis	9bd40a63c4	Make merge driver complain about older gits The git coming with Xcode 7.0 is too old to know about %P. Most people will be on newer Xcodes (and Trusty's git and depot_tools's Windows git are new enough), so this doesn't affect most folks -- so just complaining loudly is good enough. BUG=574611 TBR=dpranke Review-Url: https://codereview.chromium.org/2388483004	9 years ago
dcheng	ff84560ede	Introduce git merge driver for the blink reformatting Based on CL from primiano@: https://codereview.chromium.org/2348793003/ This is a simple tool that can help automatically resolve conflicts from clang-format reformatting patches. BUG=574611 Review-Url: https://codereview.chromium.org/2356933002	9 years ago

Author

SHA1

Message

Date

thakis

9bd40a63c4

Make merge driver complain about older gits

The git coming with Xcode 7.0 is too old to know about %P. Most
people will be on newer Xcodes (and Trusty's git and depot_tools's
Windows git are new enough), so this doesn't affect most folks -- so
just complaining loudly is good enough.

BUG=574611
TBR=dpranke

Review-Url: https://codereview.chromium.org/2388483004

dcheng

ff84560ede

Introduce git merge driver for the blink reformatting

Based on CL from primiano@: https://codereview.chromium.org/2348793003/

This is a simple tool that can help automatically resolve conflicts
from clang-format reformatting patches.

BUG=574611

Review-Url: https://codereview.chromium.org/2356933002

2 Commits (f3d5a1147faed6b303d5733e34802db5720a2986)