Clone, push, pull

• git clone ssh://<sfUserName>@git.code.sf.net/u/jkotan/sardana u-jkotan-sardana Clones a remote repe into the newly created directory.

• git push origin develop Pushes my develop branch to origin which is the develop branch of the remote repo, see git config --list.

• git push –tags ... Pushes tags.

• git pull origin develop Pulls the develop branch from the remote repo (origin) to my develop branch.

  Implictly fetches the develop branch to the local mirror, merges the changes from the mirror to the working tree.

  This error may occur when issuing a pull command:

   
  $ git pull
  hint: Pulling without specifying how to reconcile divergent branches is
  hint: discouraged. You can squelch this message by running one of the following
  hint: commands sometime before your next pull:
  hint: 
  hint:   git config pull.rebase false  # merge (the default strategy)
  hint:   git config pull.rebase true   # rebase
  hint:   git config pull.ff only       # fast-forward only
  hint: 
  hint: You can replace "git config" with "git config --global" to set a default
  hint: preference for all repositories. You can also pass --rebase, --no-rebase,
  hint: or --ff-only on the command line to override the configured default per
  hint: invocation.
  

  It seems to be a good strategy to chose:

   
  git config pull.rebase false