git - XWiki

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.

16

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

17

18

=== Open in GitX ===

19

20

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

== 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:

25

[[Git Tower>>http://www.git-tower.com/]]

26

27

= Using git locally on a Subversion Working Copy =

28

29

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!

30

31

Don't use the git-svn tool, 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.

32

33

= I want to learn git before I switch from Subversion =

34

35

(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 ;-) )

36

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:

37

38

[[**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]]

39

40

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, however my advice is don't use git-svn. Use the **git+svn** approach outlined in above blog post instead.

41

42

Once you start using git, it becomes addictive ....... you can never go back ...... really, it's that good ...... and it is not hard.

43

44

Some tips for Eclipse setup and general workflow when using git locally on svn working copies,

45

46

* check out the entire svn branch on the command line, then LINK (import no copy) the projects you want in your workspace using the Subclipse import tool, and

47

* Do your git operations (status, staging, commit, diff, branching, checkouts, rebase and merge using the terminal). git on the terminal is efficient... honest.

48

* Do all your local work and cimmits on branches other than the master branch.

49

* Switch to master branch to update from svn and commit those svn updates on the master branch.

50

* Merge your working branch(es) with or rebase your working branch(es) from the master and just keep on working.

51

* Switch to master branch before synchronizing with remote svn repo.

52

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

53

54

{{info value="Anatomony of an svn update operation on a git-managed svn working copy"}}

55

56

# Assume you are currently on a working branch. Verify this and check for uncommitted changes.

57

git status

58

59

# Either commit your local changes to your working branch using {{git add}} + {{git commit}}, or temporarily stash them using {{git stash}}

60