Changes between Version 2 and Version 3 of GitForDarcsUsers


Ignore:
Timestamp:
Aug 12, 2008 2:20:13 PM (7 years ago)
Author:
nominolo
Comment:

add even more notes

Legend:

Unmodified
Added
Removed
Modified
  • GitForDarcsUsers

    v2 v3  
    11[[PageOutline]]
    22= Git for Darcs Users =
     3
     4Just like Darcs, every Git command comes with a {{{--help}}} option.  For example {{{git add --help}}}.  You can also check out the [http://git.or.cz/gitwiki/GitDocumentation official Git documentation].
     5
     6Also see "General Notes" below for features present in Git but not in Darcs.
     7
     8= General Settings
     9
     10Just like Darcs, Git has global and per-repository configuration options.  To globally set your committer name and email use
     11{{{
     12git config --global user.name "Haskell Curry"
     13git config --global user.email [email protected]
     14}}}
     15
     16= Commands
     17
     18== darcs init ==
     19
     20{{{
     21git init
     22}}}
     23
     24== darcs get ==
     25
     26{{{
     27git clone <repo-url> [<local-name>]
     28}}}
     29
     30== darcs add ==
     31
     32{{{
     33git add <dir-or-file>
     34}}}
    335
    436== darcs record ==
     
    1951}}}
    2052If you do not supply a commit message, it will open your default editor.  If you want to abort the commit, use an empty commit message.
     53
     54To see what will be committed, use
     55{{{
     56git diff --cached
     57}}}
    2158
    2259'''Tip''': If you want to see the diff when you edit the commit message, use
     
    4986git log --stat
    5087}}}
     88
     89=== other ===
     90{{{
     91git log -p
     92}}}
     93Shows the patch for each commit.
     94
    5195See {{{git log --help}}} for a lot of extra options, to refine the output.
    5296
     
    87131== The Index ==
    88132
     133== Local Branches ==
     134
     135TODO:
     136{{{
     137git branch
     138git branch <name>
     139git branch -b <name>
     140git checkout
     141git branch -d <name>
     142git branch -D <name>
     143git stash
     144git show-branch
     145}}}
     146
     147{{{
     148git pull
     149git fetch
     150git merge
     151}}}
     152
    89153== Suggested Workflow ==
    90154
     155TODO:
     156 - feature branches
     157 - {{{git rerere}}}
    91158
    92