Re: [PATCH] fix shell command line in example

[Joey Hess <joey@kitenet.net>]

[-- Attachment #1: Type: text/plain, Size: 929 bytes --]

Thomas Rast wrote:
>   * Update the upstream origin of the current branch, then merge the
>     tracked branch into the current one:
>   +
>   --------------------------------------------------
>   $ git pull
>   --------------------------------------------------
> 
> modulo avoiding confusion around upstream/tracking.

I support having a simple "git pull" example; I think it's the first
thing users should be reaching for, followed perhaps by "git pull foo bar"
when they have multiple remotes. 

Still, an example of pulling all tracking branches from a remote and
merging in the right one for the currently checked out branch would be
good to have, that's also a common need when using git without a
centralized origin. AFAICS, there's no way to do all that in a single
git pull command? My feeling was that this sort of scenario was what
the example was trying to do (rather badly).

-- 
see shy jo

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 828 bytes --]