38393 2010-04-30 10:44:42 -0700 specifying both --git-commit and --squash should throw an error 2010-05-24 15:34:20 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC OS X 10.5 RESOLVED WONTFIX P2 Normal --- 1 ojan webkit-unassigned cjerdonek eric jamesr oldest_to_newest 219526 0 ojan 2010-04-30 10:44:42 -0700 --git-commit will squash all the commits in the commit range into one. --squash grabs the full diff from trunk. The two are currently mutually exclusive. You could also imagine a world in which git-commit was more like dcommit (treats each commit in the range as a separate patch). If we did that, then it would make sense to allow both. In other words, ideally, --git-commit would only treat the commit range as a single patch if you also specified --squash. But, since the code currently squashes, I think we should throw an error for now if you specify both and add a FIXME for the git-commit behavior. 219554 1 cjerdonek 2010-04-30 11:51:04 -0700 Is this for webkit-patch or check-webkit-style? IIRC, check-webkit-style also has these two options. 219561 2 ojan 2010-04-30 12:02:49 -0700 Both 229950 3 ojan 2010-05-24 15:34:20 -0700 We've decided to replace --squash with --git-commit=*.