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

Manual improvements.

Browse source
This commit is contained in:
Marius Vollmer 2008-08-14 02:05:19 +03:00
parent 52c2e3e4ee
commit e37626e24a
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
magit.texi
View file

@ -234,8 +234,7 @@ resolve the conflicts and stage the resolved files, for example with
You can not stage individual hunks one by one as you resolve them, you You can not stage individual hunks one by one as you resolve them, you
can only stage whole files once all conflicts in them have been can only stage whole files once all conflicts in them have been
resolved. If you can not easily and immediately resolve the conflicts resolved.
from a merge, you should abort it.
@node Rebasing @node Rebasing
@chapter Rebasing @chapter Rebasing
@ -244,24 +243,25 @@ Typing @kbd{R} in the status buffer will initiate a rebase or, if one
is already in progress, ask you how to continue. is already in progress, ask you how to continue.
When a rebase is stopped in the middle because of a conflict, the When a rebase is stopped in the middle because of a conflict, the
header of the status buffer will indicate what you are rebasing your header of the status buffer will indicate how far along you are in the
current branch onto and how far along you are in the series of commits series of commits that are being replayed.
that are being replayed.
Of course, you can initiate a rebase in any number of ways, by Of course, you can initiate a rebase in any number of ways, by
configuring @code{git pull} to rebase instead of merge, for example. configuring @code{git pull} to rebase instead of merge, for example.
Such a rebase can be finished with Magit as well. Such a rebase can be finished with @kbd{R} as well.
@node Pushing and Pulling @node Pushing and Pulling
@chapter Pushing and Pulling @chapter Pushing and Pulling
Magit will run @code{git pull} when you type @kbd{U} in the status Magit will run @code{git pull} when you type @kbd{U} in the status
buffer, and it will run @code{git push} when you type @kbd{P}. That's buffer, and it will run @code{git push} when you type @kbd{P}. You
almost all the support for remote repositories that Magit offers. can type @kbd{p} to pop up a buffer with the transcript of running
You can type @kbd{p} to pop up a buffer with the transcript of running
these commands. these commands.
That's almost all the support for remote repositories that Magit
offers. You should have setup your Git configuration to do the right
thing for @code{git push} and @code{git pull}.
If you have configured a default remote repository for the current If you have configured a default remote repository for the current
branch (by setting the Git config option branch (by setting the Git config option
@code{branch.<branch>.remote}), Magit will show that repository in the @code{branch.<branch>.remote}), Magit will show that repository in the