Differences
This shows you the differences between two versions of the page.
Both sides previous revisionPrevious revisionNext revision | Previous revisionNext revisionBoth sides next revision | ||
guide:git [2010/01/23 05:09] – external edit 127.0.0.1 | guide:git [2011/01/11 17:05] – add "Cloning branches from other repository" section squentin | ||
---|---|---|---|
Line 2: | Line 2: | ||
[[http:// | [[http:// | ||
And as gmusicbrowser doesn' | And as gmusicbrowser doesn' | ||
+ | |||
+ | gmusicbrowser git repositories : | ||
+ | * github : http:// | ||
+ | * sourceforge : http:// | ||
+ | |||
+ | this link will download a snapshot of the latest version : http:// | ||
+ | |||
+ | 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:// | This mini-guide will show you some basic commands that you will need to follow gmusicbrowser development with git, visit the [[http:// | ||
Line 49: | Line 59: | ||
To create/ | To create/ | ||
< | < | ||
+ | //note that this requires the gettext package// | ||
+ | |||
As this modifies po/*.po you'll need to follow with a | As this modifies po/*.po you'll need to follow with a | ||
- | < | + | < |
+ | 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 ===== | ||
+ | The "git status" | ||
+ | |||
+ | An even better way is to use a command prompt that indicates the current branch, if there are untracked/ | ||
===== Making local changes ===== | ===== Making local changes ===== | ||
Line 60: | Line 78: | ||
git rebase master | git rebase master | ||
</ | </ | ||
- | 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 | + | 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' | ||
+ | < | ||
+ | git remote add ochosi git:// | ||
+ | git fetch ochosi | ||
+ | git checkout -b ochosi ochosi/ | ||
+ | </ | ||
+ | The first line creates a new remote named " | ||
+ | |||
+ | The second line fetches the remote' | ||
+ | the third creates a local branch " |