Getting Started with Git

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.//

28

29

= Get Started with Project Wonder =

30

31

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

32

33

* [[Downloading Wonder>>http://wiki.objectstyle.org/confluence/display/WONDER/Getting+the+Wonder+Source+Code]] Wiki Page

34

35

= Use Git with a Subversion Project =

36

37

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

38

39

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]].

40

41

= Git Goodies for WebObjects Developers =

42

43

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).

48

49

* [[EGit/Git For Eclipse Users>>http://wiki.eclipse.org/EGit/Git_For_Eclipse_Users]]

50

* [[User Guide>>http://wiki.eclipse.org/EGit/User_Guide]]

51

* Installation

52

*1. In Eclipse, select //Help > Install New Sofware...//

53

*1. Select the "Helios" download site from the Work with: combo box

54

*1. Expand the "Collaboration" group

55

*1. Select the EGit plugin, click Next

56

*1. Complete the install process and agree to the license, etc.

57

*1. Restart Eclipse.

58

59

=== Git Bash Completion ===

60

61

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:

62

[[Git Bash Auto-Completion>>http://progit.org/book/ch2-7.html]]

=== GitX git GUI ===

GitX is an awesome FREE history viewer made for OS X. It is a better way to visualize your branch and commit history of your git repository. However, power users (aka "cool kids") will probably only use it for history viewing while they continue to use the terminal command line for checkouts, branching, staging, rebasing and committing.

67

[[GitX Home Page>>http://gitx.frim.nl/]]

=== Open in GitX ===

[[Open In GitX Finder Droplet>>http://code.google.com/p/git-osx-installer/wiki/OpenInGitX]]

=== Git Tower ===

[[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.

76

77

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.

78

Miguel Arroz

79

80

= Unique Git Concepts =

=== Rebasing ===

Rebasing is unique to git. There is no counterpart in Subversion.

85

86

Rebasing cuts down on the spaghetti history of merging and helps to keep history nice and linear.

87

88

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.

89

90

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.

91

92

* If you don't understand rebasing, don't use it You can learn more about it here:

93

** [[http://progit.org/book/ch3-6.html]]

94

** [[http://www.eecs.harvard.edu/~~cduan/technical/git/git-5.shtml]]

95

** [[http://book.git-scm.com/4_rebasing.html]]