Hi Christian,
I'm sorry I missed that page while lurking over the discussion on moving
to github. And really, it's nowhere near a reasonable git flow! Please,
consider updating the guide to the following:
--------------8<--------------8<--------------8<--------------8<--------------
You can obtain Vim for the first time with:
git clone https://github.com/vim/vim.git
And, if you don't have local changes, update to the latest version with:
cd vim
git pull
If you made some changes, e.g. to a makefile, you can keep them and
merge with the latest version with:
cd vim
git fetch origin
git rebase origin/master
Or you can keep it as a local commit:
git checkout -b local_changes
git commit -am "my local changes"
Then when you want to update:
cd vim
git fetch --all
git checkout local_changes
git rebase origin/master
When you want to start working on a new patch, create a new branch based
on master:
git fetch --all
git checkout -b <feature_branch> origin/master
# do your changes and all your commits
Once you have created a new fork of vim on github, you add your fork as
a new remote, and then you push to it as a new branch:
git remote add github [email protected]:<your-name>/vim.git
git push -u github github/<feature_branch>
Then on github you can click on "create a pull request", based on that
branch. Of course, <feature_branch> is being the name of your feature.
You might want to read documentation on the following git commands (use
git help <command>):
git status
git diff origin/master
git log -v
git branch -av
git reflog
You might also want to have a look at different tools to visualize git
branches:
ncurses:
tig: http://jonas.nitro.dk/tig/
Xorg:
gitg: https://github.com/GNOME/gitg
git-cola: https://github.com/git-cola/git-cola
OSX:
gitx: https://rowanj.github.io/gitx/
gitup: https://github.com/git-up/GitUp
If you don't know how to use git, you'll probably want to look at the
Documentation.
-------------->8-------------->8-------------->8-------------->8--------------
Basically, I'd advise to avoid as much as possible to use `git pull` in
a git flow except when just updating an unmodified local workspace to
the remote, as git pull is a shorthand for:
git fetch origin ; git rebase origin/master
But when you've got merges, then a git pull might not do things the way
you want, and using git stash is the wrong way around that.
Cheers,
--
Guyzmo
--
--
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.
