Differences

This shows you the differences between two versions of the page.

--- guide:git [2010/01/26 01:28] – squentin
+++ guide:git [2022/05/23 01:30] (current) – external edit 127.0.0.1
@@ Line 2: / Line 2: @@
 [[http://en.wikipedia.org/wiki/Git_%28software%29|Git]] is a distributed revision control, that you can use to keep up to date to the latest modification in gmusicbrowser.
 And as gmusicbrowser doesn't need compilation (apart from translations), git makes it very easy to follow gmusicbrowser development.
+gmusicbrowser git repositories :
+  * github : http://github.com/squentin/gmusicbrowser
+  * sourceforge : https://sourceforge.net/p/gmusicbrowser/code/ci/master/tree/
+this link will download a snapshot of the latest version : http://github.com/squentin/gmusicbrowser/tarball/master
+The repository contains 2 branches :
+  * master : the default branch, that currently contains v1.1.x
+  * v1.0.x
 This mini-guide will show you some basic commands that you will need to follow gmusicbrowser development with git, visit the [[http://git-scm.com/documentation|official site]] for more information.
@@ Line 52: / Line 62: @@
 As this modifies po/*.po you'll need to follow with a
-<code>git reset --hard</code>
+<code>git checkout po/*.po</code>
+To revert the changes to po/*.po files, else git won't let you update the branch or change branch (to prevent the loss of these modifications).
 ===== tips =====
@@ Line 67: / Line 78: @@
 git rebase master
 </code>
-if there are conflicts, you can resolve them manually or use
+if there are conflicts, you can resolve them manually or use "''git rebase --abort''" to abort the rebase.
-git rebase --abort
+Do not use rebase on branch you published, as rebase rewrite the history of the branch, use merge instead.
-to abort the rebase.
+===== Cloning branches from other repository =====
+You can easily track branches from other repository, for example, to track ochosi's branch :
+<code>
+git remote add ochosi git://github.com/ochosi/gmusicbrowser.git
+git fetch ochosi
+git checkout -b ochosi ochosi/master
+</code>
+The first line creates a new remote named "ochosi" (you can list the remotes with "git remote")
+The second line fetches the remote's data, and create the remote branches, here ochosi/master (you can view it with "git branch -a")
+the third creates a local branch "ochosi" that tracks the remote branch "ochosi/master"