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/08/02 23:36] – add url to sf and github git, and list branches squentin | guide:git [2013/04/03 06:29] – external edit 127.0.0.1 | ||
---|---|---|---|
Line 6: | Line 6: | ||
* github : http:// | * github : http:// | ||
* sourceforge : http:// | * sourceforge : http:// | ||
- | (the sourceforge repository allows you to download | + | |
+ | this link will download | ||
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 | ||
- | < | + | < |
+ | 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 | ||
</ | </ | ||
- | 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 " |