You are here: start » git » quick-start-guide

Differences

This shows you the differences between two versions of the page.

Link to this comparison view

Both sides previous revision Previous revision
Next revision 		Previous revision
Next revision Both sides next revision
git:quick-start-guide [2009/04/16 11:03]
212.230.253.254 Small typo 		git:quick-start-guide [2009/04/22 20:56]
andrei added note about using rebase by default for master
Line 34: Line 34:
 git config --global branch.autosetupmerge always git config --global branch.autosetupmerge always
 </code> </code>
-   * 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)+   * by default perform a rebase instead of a merge when pulling into the local master branch (highly recommended, it gets rid of a lot of confusing merge origin/master messages). It's equivalent to adding **--rebase** to git pull command line.
 <code> <code>
-git config branch.master.mergeoptions  "--no-ff"+git config branch.master.rebase true
 </code> </code>
 +   * 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 "-**-no-ff**" by default like described below, but then make sure to add "**--ff**" every time you update your local master version (git pull **--ff** origin master), or you don't use it, but then always remember to add "-**-no-ff**" when merging some other branch into master (e.g.: git merge **--no-ff** origin/foo).
 +<code>
 +# 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  "--no-ff"
 +</code>
 +
 +===== GIT commit into master howto =====
  
 +Please see [[git:commit-into-master|GIT commit into master howto]]
  
 ===== GIT merge into master howto ===== ===== GIT merge into master howto =====
  
 Please see [[git:merge-into-master|GIT merge into master howto]] Please see [[git:merge-into-master|GIT merge into master howto]]

Trace: • berlin_2010 • devel • db_unix

Navigation

Wiki

Other

QR Code
QR Code git:quick-start-guide (generated for current page)