no way to compare when less than two revisions
Differences
This shows you the differences between two versions of the page.
Previous revisionNext revision | |||
— | guide:git [2010/01/23 05:09] – external edit 127.0.0.1 | ||
---|---|---|---|
Line 1: | Line 1: | ||
+ | ====== git ====== | ||
+ | [[http:// | ||
+ | And as gmusicbrowser doesn' | ||
+ | |||
+ | This mini-guide will show you some basic commands that you will need to follow gmusicbrowser development with git, visit the [[http:// | ||
+ | |||
+ | ===== Initialization ===== | ||
+ | < | ||
+ | will create a " | ||
+ | |||
+ | **All following commands are to be run from this gmusicbrowser folder.** | ||
+ | |||
+ | The default " | ||
+ | < | ||
+ | |||
+ | ===== Running gmusicbrowser ===== | ||
+ | You can run the currently checked-out version simply by running : | ||
+ | < | ||
+ | You can of course run it from any folder by using the full path, for example : | ||
+ | < | ||
+ | |||
+ | You can use the -C gmusicbrowser option to specify an alternate configuration file : | ||
+ | < | ||
+ | |||
+ | ===== Changing version ===== | ||
+ | You can switch between branches or tagged version with the branch name/tag name/hash : | ||
+ | < | ||
+ | releases are tagged with their version number, for example : | ||
+ | < | ||
+ | will check out v1.1.3 | ||
+ | |||
+ | ===== Updating ===== | ||
+ | to sync your repo with the latest changes : | ||
+ | < | ||
+ | |||
+ | then, to update your " | ||
+ | < | ||
+ | git checkout master | ||
+ | git merge | ||
+ | </ | ||
+ | |||
+ | ("git pull" can replace a fetch and a merge) | ||
+ | |||
+ | if you make any modification to tracked files, you won't be able to do checkouts, you'll first need to reset changes with : | ||
+ | < | ||
+ | |||
+ | |||
+ | ===== Translations ===== | ||
+ | To create/ | ||
+ | < | ||
+ | As this modifies po/*.po you'll need to follow with a | ||
+ | < | ||
+ | |||
+ | ===== Making local changes ===== | ||
+ | If you want to make small changes to gmusicbrowser' | ||
+ | < | ||
+ | and after you update master with the above instructions, | ||
+ | < | ||
+ | git checkout mybranch | ||
+ | git rebase master | ||
+ | </ | ||
+ | if there are conflicts, you can resolve them manually or use | ||
+ | git rebase --abort | ||
+ | to abort the rebase. | ||