Quoting Peter Krefting <peter@xxxxxxxxxxxxxxxx>
> The web tree checkout script uses rebase to avoid introducing merge
> commits every time the blog comment is updated, as it in 99 % of cases
> is unrelated to any other changes found in the central repo.
>
> In the few cases where the blog comment update from the web tree
> conflicts with a change in the central repo, I want the "git pull
> --rebase" call to overwrite any changes in the central repo with my
> changes in the web tree (meaning that I would later have to manually
> re-delete the spam comments, but I can live with that).
That sounds like "-Xours" merge option that was discussed some time
ago. See
http://thread.gmane.org/gmane.comp.version-control.git/76650/focus=89021
I remember that Junio and Petr were against it because it would
encourage a bad workflow. Dscho was against the syntax used to
pass the options also.
--
Nanako Shiraishi
http://ivory.ap.teacup.com/nanako3/
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html