Changes between Version 7 and Version 8 of GitForDarcsUsers


Ignore:
Timestamp:
Aug 13, 2008 3:35:06 PM (6 years ago)
Author:
nominolo
Comment:

start describing git pull

Legend:

Unmodified
Added
Removed
Modified
  • GitForDarcsUsers

    v7 v8  
    6767git commit -v 
    6868}}} 
     69 
     70=== darcs pull === 
     71 
     72There is a direct mapping to {{{darcs pull -a}}}.  Cherry-picking is not as streamlined as in Darcs.  For a start, here is how you update from the source repo: 
     73{{{ 
     74git pull 
     75}}} 
     76If all you want to do is to keep updated then this is fine.  The above is actually a shortcut for 
     77{{{ 
     78git pull origin 
     79}}} 
     80where {{{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.) 
     81 
     82XXX: will this pull into the current branch, or always into master? 
     83 
     84Like in Darcs, you may get conflicts.  To resolve conflicts, edit the conflicting file, {{{git add}}} it, and {{{git commit}}} it. 
     85 
     86If you want to see whether you get conflicts before pulling {{{git pull}}} is actually ... XXX 
    6987 
    7088=== darcs record -a ===