Differences
This shows you the differences between two versions of the page.
Next revision | Previous revision Next revision Both sides next revision | ||
git:quick-start-guide [2008/11/20 14:03] miconda created |
git:quick-start-guide [2009/04/22 20:56] andrei added note about using rebase by default for master |
||
---|---|---|---|
Line 2: | Line 2: | ||
The document tries to collect useful information to make life easier working with the GIT repository of SIP Router Project. | The document tries to collect useful information to make life easier working with the GIT repository of SIP Router Project. | ||
+ | |||
===== GIT URLs ===== | ===== GIT URLs ===== | ||
- | * git:// | + | * %%git:// |
- | * http:// | + | * http:// |
- | * ssh:// | + | * %%ssh:// |
Line 13: | Line 14: | ||
* http:// | * http:// | ||
+ | ===== First config options ===== | ||
+ | |||
+ | * Recommended git version: >= 1.5.6.1 | ||
+ | * First of all, set your name and email address: | ||
+ | < | ||
+ | git config --global user.name ' | ||
+ | git config --global user.email 'your email address' | ||
+ | </ | ||
+ | |||
+ | Some other recommended git config setting: | ||
+ | |||
+ | * include summaries of merged commits in commit merge messages (a MUST) | ||
+ | < | ||
+ | git config --global merge.log true | ||
+ | git config --global merge.summary true # same as above, for older git versions | ||
+ | </ | ||
+ | * behave as if --track is added to every git-pull | ||
+ | < | ||
+ | git config --global branch.autosetupmerge always | ||
+ | </ | ||
+ | * by default perform a rebase instead of a merge when pulling into the local master branch (highly recommended, | ||
+ | < | ||
+ | git config branch.master.rebase true | ||
+ | </ | ||
+ | * by default use --no-ff when merging into master (this means that a merge commit message will be generated for all merges; without it fast-forward merges will not generate a merge message). **Note**: --no-ff will generate merge logs even when updating master from origin (git pull origin master), which is not what you want. You should either use " | ||
+ | < | ||
+ | # recommended _only_ if you do a _lot_ of merges between public branches | ||
+ | # (see Note: above), otherwise you're better off without it in the config | ||
+ | # git config branch.master.mergeoptions | ||
+ | </ | ||
+ | |||
+ | ===== GIT commit into master howto ===== | ||
+ | |||
+ | Please see [[git: | ||
+ | |||
+ | ===== GIT merge into master howto ===== | ||
+ | Please see [[git: |