rebase but don't commit (as in merge)
Uwe Brauer
oub at mat.ucm.es
Sun Sep 11 08:02:47 UTC 2022
Hi
When I merge two changesets, I also have to commit the merge.
I understand that this is a safety measure, in case there is a editing
conflict. I found this first annoying but now I see its benefit since it
enables me to commit even using the vc command from emacs and this is
enables me to have better formatted commit message, than committing from
the command line. The reason is that committing from the command line
starts emacs but just in text mode not in the special log-edit mode
Now if I rebase on the other hand, like
hg myrebase
with the alias
myrebase = !TMP=$($HG root) $HG rebase -d . -b $1 --collapse
Then automatically hg rebases and commits and emacs pops up (in text
mode).
The rebase will only be aborted if there is a conflict. That seems to me
not coherent with the policy concerning merging.
So would it be possible to have a rebase --no-commit option?
regards
Uwe Brauer
--
I strongly condemn Putin's war of aggression against the Ukraine.
I support to deliver weapons to Ukraine's military.
I support the ban of Russia from SWIFT.
I support the EU membership of the Ukraine.
--
I strongly condemn Putin's war of aggression against the Ukraine.
I support to deliver weapons to Ukraine's military.
I support the ban of Russia from SWIFT.
I support the EU membership of the Ukraine.
More information about the Mercurial
mailing list