Differences
This shows you the differences between two versions of the page.
Both sides previous revision Previous revision Next revision | Previous revision | ||
git:quick-start-guide [2009/04/16 13:54] andrei |
git:quick-start-guide [2011/02/23 10:11] (current) ibc Added section "Local GIT settings: global and per-repository settings" |
||
---|---|---|---|
Line 14: | Line 14: | ||
* http:// | * http:// | ||
+ | |||
+ | |||
+ | ===== Local GIT settings: global and per-repository settings ===== | ||
+ | |||
+ | GIT allows setting global configuration parameters by using the command '' | ||
+ | |||
+ | '' | ||
+ | |||
+ | |||
===== First config options ===== | ===== First config options ===== | ||
Line 25: | Line 34: | ||
Some other recommended git config setting: | Some other recommended git config setting: | ||
- | * include summaries of merged commits in commit merge messages (a MUST) | + | * include summaries of merged commits in commit merge messages (a **MUST**) |
< | < | ||
git config --global merge.log true | git config --global merge.log true | ||
Line 34: | Line 43: | ||
git config --global branch.autosetupmerge always | git config --global branch.autosetupmerge always | ||
</ | </ | ||
- | * by default | + | * by default |
< | < | ||
- | git config branch.master.mergeoptions | + | git config branch.master.rebase true |
</ | </ | ||
+ | * by default setup all new local branches to perform rebase (like above) when pull-ing (so that you don't have to run //git config branch.%%< | ||
+ | < | ||
+ | git config branch.autosetuprebase always | ||
+ | </ | ||
+ | * (**not recommended**) 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 " | ||
+ | < | ||
+ | # _not_ recommended, | ||
+ | # branches (see Note: above), otherwise you're better off without it | ||
+ | # git config branch.master.mergeoptions | ||
+ | </ | ||
+ | |||
+ | ===== GIT commit into master howto ===== | ||
+ | Please see [[git: | ||
===== GIT merge into master howto ===== | ===== GIT merge into master howto ===== | ||
Please see [[git: | Please see [[git: |