Differences
This shows you the differences between two versions of the page.
| Both sides previous revision Previous revision | Next revision Both sides next revision | ||
|
git:quick-start-guide [2009/04/22 18:45] andrei |
git:quick-start-guide [2009/04/22 20:56] andrei added note about using rebase by default for master |
||
|---|---|---|---|
| Line 33: | Line 33: | ||
| < | < | ||
| git config --global branch.autosetupmerge always | 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 " | * 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 | + | # recommended |
| # (see Note: above), otherwise you're better off without it in the config | # (see Note: above), otherwise you're better off without it in the config | ||
| # git config branch.master.mergeoptions | # git config branch.master.mergeoptions | ||
