gwh/slackbuilds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Mention non-support for rewriting merge commits in the manual.

Browse source
This commit is contained in:
Marius Vollmer 2008-09-15 02:27:43 +03:00
parent e0e9544c09
commit 7419a8b48a
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
magit.texi
View file

@ -362,6 +362,11 @@ want to combine multiple previous commits into a single new one, use
@kbd{a} to apply them all to your working tree, and then commit them
together.
Magit has no explicit support for rewriting merge commits. It will
happily include merge commits in the list of pending commits, but
there is no way of replaying them automatically. You have to redo the
merge explicitly.
You can also use @kbd{v} to revert a commit when you have changed your
mind. This will change the @code{.} mark back to @code{*}.