application icongmusicbrowser

Differences

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

Link to this comparison view

guide:git [2010/08/02 23:36]
squentin add url to sf and github git, and list branches
guide:git [2013/04/23 17:31] (current)
squentin update sourceforge git url
Line 5: Line 5:
 gmusicbrowser git repositories : gmusicbrowser git repositories :
   * github : http://github.com/squentin/gmusicbrowser   * github : http://github.com/squentin/gmusicbrowser
-  * sourceforge : http://gmusicbrowser.git.sourceforge.net/git/gitweb.cgi?p=gmusicbrowser/gmusicbrowser;a=summary +  * sourceforge : https://sourceforge.net/p/gmusicbrowser/code/ci/master/tree/ 
-(the sourceforge repository allows you to download snapshots)+ 
 +this link will download a snapshot of the latest version : http://github.com/squentin/gmusicbrowser/tarball/master
  
 The repository contains 2 branches : The repository contains 2 branches :
Line 61: Line 62:
  
 As this modifies po/*.po you'll need to follow with a 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 ===== ===== tips =====
Line 76: Line 78:
 git rebase master git rebase master
 </code> </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"
guide/git.1280785003.txt.gz · Last modified: 2013/04/03 06:28 (external edit)
CC Attribution-Share Alike 3.0 Unported
www.chimeric.de Valid CSS Driven by DokuWiki do yourself a favour and use a real browser - get firefox!! Recent changes RSS feed Valid XHTML 1.0