From e37626e24a35b51bcd17860ef9b80c41b43db4ab Mon Sep 17 00:00:00 2001 From: Marius Vollmer Date: Thu, 14 Aug 2008 02:05:19 +0300 Subject: [PATCH] Manual improvements. --- magit.texi | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/magit.texi b/magit.texi index a429ab6e..8d29790e 100644 --- a/magit.texi +++ b/magit.texi @@ -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 can only stage whole files once all conflicts in them have been -resolved. If you can not easily and immediately resolve the conflicts -from a merge, you should abort it. +resolved. @node 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. 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 -current branch onto and how far along you are in the series of commits -that are being replayed. +header of the status buffer will indicate how far along you are in the +series of commits that are being replayed. Of course, you can initiate a rebase in any number of ways, by 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 @chapter Pushing and Pulling 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 -almost all the support for remote repositories that Magit offers. - -You can type @kbd{p} to pop up a buffer with the transcript of running +buffer, and it will run @code{git push} when you type @kbd{P}. You +can type @kbd{p} to pop up a buffer with the transcript of running 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 branch (by setting the Git config option @code{branch..remote}), Magit will show that repository in the