El 31/10/2007, a las 5:17, Björn Steinbrink escribió:
How about:
\--first-parent::
When this option is given and --preserve-merges is not, then
merge commits are completely ignored and only commits from the
first parent ancestry are rebased. This allows to pretend that
merges never happened.
If --preserve-merges is also given, the merge commits are
preserved, but only their first parent is rebased as opposed to
the default behaviour which would rebase all parents.
Minor nitpick:
- first parent ancestry are rebased. This allows to pretend that
+ first parent ancestry are rebased. This allows you to pretend that
Cheers,
Wincent