Git - npalko/npalko.github.com GitHub Wiki

git config --global user.name "Nicholas Palko"
git config --global user.email "[email protected]"
git config --global color.diff auto
git config --global color.status auto
git config --global color.branch auto

more notes:

http://snippets.dzone.com/posts/show/5714

$ git pull

You asked me to pull without telling me which branch you want to merge with, and 'branch.master.merge' in your configuration file does not tell me either. Please specify which branch you want to merge on the command line and try again (e.g. 'git pull See git-pull(1) for details.

If you often merge with the same branch, you may want to configure the following variables in your configuration file:

branch.master.remote = branch.master.merge = remote..url = remote..fetch =

See git-config(1) for details.

git config branch.master.remote origin git config branch.master.merge refs/heads/master

git checkout filename git checkout -- filename (if branch has same name as file)

The basic idea is that work is already being done in a Subversion repository, but we would like to use Git to create our own branch of development, but still incorporate changes being made in Subversion land. don’t merge anything into the master branch always merge master into feature

Initial Repository Setup$ mkdir Protobuf $ cd Protobuf $ git svn clone http://protobuf.googlecode.com/svn/trunk . $ git branch feature $ git checkout feature $ touch .gitignore $ git add .gitignore $ git commit -a -m "added .gitignore" $ git remote add origin [email protected]:npalko/Protobuf.git $ git push origin master $ git push origin feature

maintaining sync with svn

update master:$ git branch master $ git checkout HEAD vsprojects/.vcproj $ git checkout HEAD vsprojects/.sln $ git svn rebase $ git push

transfer changes in master to feature$ git checkout feature $ git merge master $ git push h4. Branch switch branch

git checkout

h4. My God, what have I changed? diff

h4. Commit your local changes git commit

h4. Submit your changes back to the repository git push git checkout - normally expects a branch head - will also accept an arbitrary commit checking out a commit referenced by a tag?

git branch - shows no branch conclusion - have a tag instead a legitmate cbmach? don't have a branch head ---> that's the problem

http://www.simplicidade.org/notes/archives/2008/02/git_bash_comple.html

PS1='[\u@\h \W$(__git_ps1 " (%s)")]$ '

Bash completion has been installed to: /usr/local/etc/bash_completion.d

Emacs support has been installed to: /usr/local/share/doc/git-core/contrib/emacs

The rest of the "contrib" is installed to: /usr/local/share/git/contrib