[PATCH] New option to choose fast-forwarding on merge (take 2)

[John A Meinel]

John Arbash Meinel has voted +1.
Status is now: Semi-approved
Comment:
The implementation seems clean enough. And having the ability to supply --pull allows people the option of which workflow they want to use.

Also, because of how our options are implemented, there is an implicit '--no-pull' that is available. We should change the help generator to be aware of this, and include it in the help text.


For details, see: http://bundlebuggy.aaronbentley.com/request/%3C20061125204030.GA15284%40efreet.light.src%3E