Changes between Version 27 and Version 28 of GitForDarcsUsers


Ignore:
Timestamp:
Jan 11, 2011 12:00:15 AM (5 years ago)
Author:
nominolo
Comment:

Mentionen Git remotes.

Legend:

Unmodified
Added
Removed
Modified
  • GitForDarcsUsers

    v27 v28  
    249249where {{{origin}}} is the name of your default remote branch.  (You can name it as you like, but certain Git commands will use {{{origin}}} as the default if no argument is specified.)
    250250
    251 XXX: will this pull into the current branch, or always into master?  (Websites suggest always into master, so you likely need to follow {{{git pull}}} with {{{git rebase <branch-name>}}})
    252 
    253 Like in Darcs, you may get conflicts.  To resolve conflicts, edit the conflicting file, {{{git add}}} it, and {{{git commit}}} it.
    254 
    255 If you want to see whether you get conflicts before pulling {{{git pull}}} is actually ... XXX
     251Git allows you to create symbolic references to multiple remote branches.  You can also associate a remote branch with a specific local branch.  For more info see [http://book.git-scm.com/3_distributed_workflows.html Distributed Workflows] and [http://book.git-scm.com/4_tracking_branches.html Tracking Branches].
     252
     253Note, that {{{git pull}}} is actually a shortcut for:
     254{{{
     255git fetch   # download data from remote branches
     256# for each remote branch:
     257git merge <remote/branch> <my-local-branch>
     258}}}
     259To find out which branch merges into which local branch see the output of {{{get remote show <remote-name>}}}.
     260
     261Like in Darcs, you may get conflicts.  To resolve conflicts, edit the conflicting file, {{{git add}}} it, and {{{git commit}}} it.  Alternatively, you can use {{{git fetch}}} and then manually {{{git merge}}}.
    256262
    257263== darcs push ==