On Mon, Jan 18, 2016 at 3:01 PM, Nikolay Aleksandrovich Pavlov
<[email protected]> wrote:
>
>
> 2016-01-18 22:36 GMT+03:00 Bram Moolenaar <[email protected]>:
>>
>>
>> John Little 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. This has been a
>> > dog's breakfast at times, with me running various git commands I don't
>> > understand (as suggested by cryptic messages) trying to shut git up.
>>
>> For that reason I have changed the instructions to something that should
>> always (always?) work:
>>
>> git stash
>> git pull
>> git stash pop
>>
>> Well, you can still run into merge conflicts, and then you're in trouble
>> again. It's not easy to find out what to do, even just saying "I don't
>> care, just trhow away my local changes" does not have an obvious git
>> command. I would expect "git revert <filename>", but that doesn't work.
>> "git checkout <filename>" sometimes works. Perhaps with "-f"?
>
>
> git checkout -f if you want to throw away all your changes. git reset --hard
> HEAD should also work AFAIK.
If you _really_ want to throw away every conceivable
non-source-controlled change in the repo:
git clean -fdx
---
Justin M. Keyes
--
--
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.
