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

Document new behavior of 'c' and 'C' during a rebase.

Browse source
This commit is contained in:
Marius Vollmer 2009-03-22 01:54:52 +02:00
parent 6f2d0955e5
commit 4bc9bc2c73
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
magit.texi
View file

@ -489,7 +489,11 @@ is already in progress, ask you how to continue.
When a rebase is stopped in the middle because of a conflict, the
header of the status buffer will indicate how far along you are in the
series of commits that are being replayed.
series of commits that are being replayed. When that happens, you
should resolve the conflicts and stage everything and hit @kbd{R c} to
continue the rebase. Alternatively, hitting @kbd{c} or @kbd{C} while
in the middle of a rebase will also ask you whether to continue the
rebase.
Of course, you can initiate a rebase in any number of ways, by
configuring @code{git pull} to rebase instead of merge, for example.