On 17 January 2016, John Little <[email protected]> wrote:
> On Sunday, January 17, 2016 at 4:59:10 AM UTC+13, LCD 47 wrote:
> > The trick is to use "--set-upstream-to". Something like this:
> >
> > git clone https://github.com/vim/vim.git
> > cd vim
> > git co -b local
> > git br -u origin/master
> >
> > This creates a branch named "local", switches to it, and sets it up
> > so that when you run "git pull" it merges changes from GitHub. After
> > that you can just patch and commit your changes to this branch:
> >
> > ... edit ...
> > git ci -am 'Some work done.'
> > ... edit ...
> > git ci -am 'Some more work done.'
> >
> > "git pull" will then merge changes to upstream master to your
> > branch, keeping your changes:
> >
> > git pull
>
> I've following the instructions on vim.org, which says if you have
> local changes use git fetch followed by git merge.
[...]
> Or, would I be better with the cryptic commands above? (I say cryptic
> because '... use "--set-upstream-to". Something like ...' followed by
> commands where --set-upstream-to does not appear.)
It does, "git br -u" is a shortcut for "git branch --set-upstream-to".
See "man git-branch", and perhaps the "Tracking Branches" section in the
official Git book:
http://git-scm.com/book/ch3-5.html#Tracking-Branches
It's a common problem, and the "cryptic" sequence of commands above
is really all you need to solve it. I think with recent versions of git
you can further shorten
git co -b local
git br -u origin/master
to
git co -b local origin/master
/lcd
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
