Source

ml-hgext / rebaseif.py

Author Commit Message Labels Comments Date
Marcus Lindblom Sonestedt
rebaseif: revert e649f975bc06 (actually do a proper merge)
Marcus Lindblom Sonestedt
rebaseif: use internal:fail to make rebase safer
Marcus Lindblom Sonestedt
rebaseif: Use same merge behaviour for rebase and merge (fixes #12)
Marcus Lindblom Sonestedt
rebaseif: Add explicit newlines to output. Fixes #9 + untabify
Danny Tuppeny
Fix for 1.9, bail_if_changed was renamed to bailifchanged.
Jesse Glick
Normalizing repository line endings to NL from CRNL.
Marcus Lindblom Sonestedt
rebaeif: better docstrings and i18n
Marcus Lindblom Sonestedt
Minor copyright/license cleanup
Marcus Lindblom Sonestedt
Add --rebaeif to pull
Marcus Lindblom Sonestedt
Add rebaseif command