Changes for page Getting Started with Git

Last modified by Bastian Triller on 2013/05/21 17:24

From 169.1 to 170.1 From 171.1 to 172.1

From version 170.1

edited by Kieran Kelleher
on 2011/04/01 15:58

Change comment: There is no comment for this version

To version 171.1

edited by Ray Kiddy
on 2011/07/04 19:09

Change comment: added some "unique concept" bits

Raw
Rendered

Summary

Page properties (3 modified, 0 added, 0 removed)

Details

Page properties

Title

@@ -1,1 +1,1 @@
--git
++Getting Started with Git

Author

@@ -1,1 +1,1 @@
--XWiki.kieran
++XWiki.kiddyr

Content

@@ -1,31 +1,63 @@
--= Got Git? If not, Get Git here =
++{{toc}}{{/toc}}
--Just pick the latest release for your Mac architecture here:
--[[OS X dmg Installer>>http://code.google.com/p/git-osx-installer/]]
++= Got Git? No? Get Git =
--= Learning About git =
++* Official Download Site: [[http://git-scm.com/download]]
++* Direct Download Links:
++** MacOS X [[.dmg Binary Installers>>http://code.google.com/p/git-osx-installer/]]
++** Microsoft Windows [[.exe Binary Installers>>http://code.google.com/p/msysgit/]]
--Start here:
++= Learn About Git =
--* [[Excellent Concept Tutorial on Git>>http://www.eecs.harvard.edu/~~cduan/technical/git/]]
++* Learn the concepts.
++** [[This>>http://www.eecs.harvard.edu/~~cduan/technical/git/]] is an excellent tutorial on the basic concepts behind Git
--Have a Good Laugh here as Linus Torvalds Evangelizes git:
--//this is more fun than learning, but gives you insight into the motivation behind git!//
++* Learn the basics.
++** [[Everyday GIT With 20 Commands Or So>>http://www.kernel.org/pub/software/scm/git/docs/everyday.html]]
++** [[Free Online Pro Git book>>http://progit.org/book/]]
++* Get familiar with the reference materials available online
++** Official [[Git Documentation>>http://git-scm.com/documentation]] Site
++** Official [[Git User Manual>>http://www.kernel.org/pub/software/scm/git/docs/user-manual.html]]
++** [[Git Reference>>http://gitref.org/index.html]]
++
++* Git Cheat Sheets
++** [[http://cheat.errtheblog.com/s/git/]]
++** [[http://ktown.kde.org/%7Ezrusin/git/git-cheat-sheet-medium.png]]
++
  * [[Linus Torvalds talks about git>>http://www.youtube.com/watch?v=4XpnKHJAok8]]
++Have a Good Laugh here as Linus Torvalds Evangelizes git. //NOTE: This isn't really learning, but it is way more fun and gives you insight into the motivation behind git.//
--Learn the basics here:
++= Get Started with Project Wonder =
--* [[Everyday GIT With 20 Commands Or So>>http://www.kernel.org/pub/software/scm/git/docs/everyday.html]]
--* [[Free Online Pro Git book>>http://progit.org/book/]]
++The best way to learn a new concept is to actually use it, and what better way than to do something practical like clone (checkout) the Project Wonder source code
--Get the Detailed Reference Materials Here:
++* [[Downloading Wonder>>http://wiki.objectstyle.org/confluence/display/WONDER/Getting+the+Wonder+Source+Code]] Wiki Page
--* [[Git User Manual>>http://www.kernel.org/pub/software/scm/git/docs/user-manual.html]]
--* [[Git Reference>>http://gitref.org/index.html]]
++= Use Git with a Subversion Project =
--= Git Goodies =
++OK, so you want to use Git but you are working on a team project that is hosted in a subversion repository ... and it is making you depressed :-( . Well, you can still use Git to manage your local SVN working copy and be happy again
++I recommend you just use the [[git+svn protocol>>http://www.lostechies.com/blogs/derickbailey/archive/2010/02/03/branch-per-feature-how-i-manage-subversion-with-git-branches.aspx]].
++
++= Git Goodies for WebObjects Developers =
++
++This is a list of tools that other WebObjects developers have found to be helpful. It's not a comprehensive list, and if you find things not listed here please add them
++
++=== EGit ===
++
++EGit is a plugin for Eclipse 3.6. It's not as good as Tower or GitX, but you can use it for most tasks (add, commit, push, pull).
++
++* [[EGit/Git For Eclipse Users>>http://wiki.eclipse.org/EGit/Git_For_Eclipse_Users]]
++* [[User Guide>>http://wiki.eclipse.org/EGit/User_Guide]]
++* Installation
++*1. In Eclipse, select //Help > Install New Sofware...//
++*1. Select the "Helios" download site from the Work with: combo box
++*1. Expand the "Collaboration" group
++*1. Select the EGit plugin, click Next
++*1. Complete the install process and agree to the license, etc.
++*1. Restart Eclipse.
++
  === Git Bash Completion ===
  This is really an absolute necessity and a **huge** productivity improvement. Basically you need the bash completion script from the source tarball and use your shell profile to include it whenever you open a shell. See the **Auto-Completion** section on this page:
@@ -40,97 +40,53 @@
  [[Open In GitX Finder Droplet>>http://code.google.com/p/git-osx-installer/wiki/OpenInGitX]]
--== Git Tower ==
++=== Git Tower ===
--For those of you who just get panic attacks at the thought of using the Terminal, there is a commercial app for that:
--[[Git Tower>>http://www.git-tower.com/]]
++[[Git Tower>>http://www.git-tower.com/]] is a commerical app for those of you who just get panic attacks at the thought of using the Terminal.
--I use Tower (bought it), but only for committing and fixing merge conflicts. I think Tower misses quite a bit of the flagship feature of GIT: branches. You can't see a branch tree graphically, like you can with gitX or even the command line (git log ---graph ---color, IIRC). But it's cool for committing. For everything else I use command line.
--- Miguel Arroz
++I use Tower (bought it), but only for committing and fixing merge conflicts. I think Tower misses quite a bit of the flagship feature of GIT: branches. You can't see a branch tree graphically, like you can with gitX or even the command line (git log -graph -color, IIRC). But it's cool for committing. For everything else I use command line.
++ Miguel Arroz
--= Using git locally on a Subversion Working Copy =
++= Unique Git Concepts =
--OK, so you are addicted to git, and now you have to work on a team project that is hosted in a remote subversion repository ... and it is making you depressed :-(. Well, you can use manage your local svn working copy using git and be happy again!
++=== Rebasing ===
--There is a git-svn tool (type man git-svn in the terminal for details), but that adds yet another tool into the mix that you have to learn. So while you could use it and YMMV for projects tht are going to be on svn forever, I recommend you just use the [[git+svn protocol>>http://www.lostechies.com/blogs/derickbailey/archive/2010/02/03/branch-per-feature-how-i-manage-subversion-with-git-branches.aspx]] instead, especially if you are typically working on one particular branch of the remote svn repository.
++Rebasing is unique to git. There is no counterpart in Subversion.
--= I want to learn git before I switch from Subversion =
++Rebasing cuts down on the spaghetti history of merging and helps to keep history nice and linear.
--(This kind of repeats some of the previous section, but that's on purpose so we can condition you brain to start using git right now ;-) )
--Even while you are working with svn repositories, you can start learning and taking advantage of git right now by making your local svn working copy an actual local git repository. The idea is to use the appropriate ignore feature of each SCM system to ignore the hidden files of the other system. The concept is described here:
++Conceptually, when I rebase my current branch A on another branch B, git removes all my branch A commits back to the common ancestor of A and B, stashes those commits away temporarily, moves the head of the current branch A to the tip of the other branch B, and then re-applys all my stashed commits as **new commit** patches to my branch B.
--[[**git+svn** Working Protocol>>http://www.lostechies.com/blogs/derickbailey/archive/2010/02/03/branch-per-feature-how-i-manage-subversion-with-git-branches.aspx]]
++However before using it on work that is shared with others you MUST follow the these rules, otherwise you will screw everyone else on the project.
--When you first learn about git and you google "git svn" you will learn about a command line tool git-svn which works directly with remote svn repos. Unless you want to use git locally to switch between svn branches, I don't recommend it. Use the **git+svn** approach outlined in above blog post instead.
++* If you don't understand rebasing, don't use it You can learn more about it here:
++** [[http://progit.org/book/ch3-6.html]]
++** [[http://www.eecs.harvard.edu/~~cduan/technical/git/git-5.shtml]]
++** [[http://book.git-scm.com/4_rebasing.html]]
++** [[http://blip.tv/file/4094727]]
++* Use rebase only on **private** branches
++* Use rebase only for commits that have **not been pushed** to a remote repo
--Once you start using git, it becomes addictive ....... you can never go back ...... really, it's that good ...... and it is not hard.
++=== Push/Pull vs Commit/Update ===
--Some tips for Eclipse setup and general workflow when using git locally on svn working copies,
++It may be helpful to separate "push/pull" in your mind from "commit/update". Say that I have a bunch of changes that I want to --commit to Wonder-- share with the community. I am not going to push my changes. I am going to check in my changes to my repository (either a clone or a fork) and then push from my repository or generate a pull request from my repository. My repository should be fully checked in before I do this.
--* check out the entire svn branch that you work on using the command line, then LINK (import no copy) the projects you want in your workspace using the Subclipse import tool, and
--* Do your git operations (status, staging, commit, diff, branching, checkouts, rebase and merge using the terminal). git on the terminal is efficient... honest.
--* Do all your local work and cimmits on branches other than the master branch.
--* Switch to master branch to update from svn and commit those svn updates on the master branch.
--* Merge your working branch(es) with or rebase your working branch(es) from the master and just keep on working.
--* Switch to master branch before synchronizing with remote svn repo.
--* You can use ##git stash## to temporarily  put aside your uncommitted changes before doing an svn update. Then use ##git stash pop## to replay those uncommitted changes onto the working copy.
++Say that I do not want to check in all of the changes I am looking at. The answer seems to be that you create a branch, take the changes you want to share, commit them and then share from that branch. And, again, before one generates the pull request or does the push, the branch should be clean and all changes in it should be committed.
--{{code title="Mechanics of an svn update operation on a git-managed svn working copy"}}
++What if one wants to generate a pull request the origin and also push to a fork? You would do this if you were not a Wonder committer but wanted to share code. You organize your changes in your local repository/branch and, from the clean repository or branch, generate the pull request and, separately, push the changes to your fork.
++=== Versions? or Diffs? ===
--# Assume you are currently on a working branch. Verify this and check for uncommitted changes.
--git status
++One satori that I had while speaking to my git guru (thanks, Kieran!) is this. Subversion is all about versions. CVS was all about versions. We have been working with these a long time and the ideas are sticky. Git is //not// about versions. It is about diffs. Diffs are the main thing. If you think about it, this makes sense. You have thoughts and make changes and those diffs are the product of your work. If you get those diffs into something, that is good, but the work product was the diffs.
--# Either commit your local changes to your working branch
--# using 'git add' + 'git commit', or temporarily stash
--# them using 'git stash'
--git stash
++All this rebasing and such may seem odd. But the main thing is the diffs. I have edits from a two-week old repository. What do I do? I move the diffs so that they are diffs from the latest code. That is a rebase. When we make edits, we are used to being over-concerned about merge conflicts. But they do not happen all that often and are actually easy to deal with when they do, if the tools are oriented to making them easy to deal with. If we are worrying about the versions and not the diffs, we are paying attention to the paper we write on and not to the words we are putting down.
--# Switch to master branch
--git checkout master
++Internally, git keeps track of text fragments and not files. Why is this? Because the versions are not the point. The diffs are. I can imagine how Linus Torvalds had this idea. He was looking at all the versions of all the files in Linux and all the e-mails of all the diffs. These are two separate worlds. It is conceptually painful to look at every diff, find its source and see how it maps to what now exists. At some point, he must have realized that all he needed was the e-mails. If he had no files any longer, but all the e-mails, he could always reconstruct the files. He would not have to make the conceptual switch from the diffs to the versions and back. Collectively, those e-mails with the diffs defined everything that needed to be said. Quod erat demonstrandum.
--# Ensure there are no changes either from an svn perspective
--# or a git perspective on the master branch.
--git status
--svn status
++=== How Easy Are Branches? ===
--# Update the master branch from remote svn repo
--svn update
++It may be helpful to realize this. You should become comfortable with branching. In svn, branching is hard but it is not hard in git. If you have a thought, mull over that thought for a few minutes and jot something down, you have done enough to justify a branch and the branch will be not much harder than finding the post-its on your desk, and perhaps easier. Think about when you would have created a branch in svn. For that amount of work and to establish that level of separation, in git you would create a fork, or create a new repository.
--# Commit those updates to git repo
--git commit -a -m "updated from remote svn repo"
++Might you end up with too many branches? Perhaps. How messy is your desk? If you are a clean-desk person, you will probably not have too many branches. You will organize and combine your branches. You will rebase your branches. You may delete your branches. After all, you had the thought. You can write the code again. If it is too distracting to keep the branch relevant, tuck the thought into the back of your head, delete the branch, let it go and move on.  If you are a messy-desk person, you will probably have lots of branches. It would probably be a good thing to clean up, merge and rebase your branches before you try to share your changes. But that is obvious. Nobody wants to see how messy your desk is.
--# Switch to your working branch
--git checkout workingbranch
--
--# Merge or rebase your working branch off of the updated master.
--# This rewinds your branch commits back to the common commit ancestor
--# shared between your working branch and the master branch. Then it
--# applies the master branch commits (the svn updates) so that this
--# working branch becomes identical to the master. After that it 'replays'
--# your working branch commits on top of the updated branch.
--# This ensures a clean linear progression. Rebasing is a very cool feature of git.
--rebase master
--
--# Now if you stashed uncommitted changes earlier, you can pop them back into
--# the working copy
--git stash pop
--
--{{/code}}
--
--{{code title="Mechanics of an svn commit operation from a git-managed svn working copy"}}
--
--# First perform an svn update as outlined above in the previous section
--
--# Switch to the master branch
--git checkout master
--
--# Merge your working branch with the master
--git merge workingbranch
--
--# Use svn status, svn add and svn commit to commit your changes to the remote svn repository
--
--# Switch back to your workingbranch and get back to work.
--
--
--{{/code}}
++Keep in mind that the difficult part of what you do should be the thinking. Git makes it easy to organize and share your thoughts as branches. Your local copies may be messy or not. They are the thoughts you have in your head and lots of those thoughts will stay there and never see the light of day and that is ok. But when you have clarified your thoughts, git will make it easy to share them.

Changes for page Getting Started with Git

Summary

Details

Applications

Navigation

My Recent Modifications

Need help?