[home page clarifications, incorporate Florent Becker's feedback Simon Michael **20120428163724 Ignore-this: ae0b23ccc0c85adb2971c1f2eb8dc574 ] hunk ./doc/darcs.css 32 - color: #494a82; - margin: 1em 0 0 0; + color: black; + margin: 1em 0 .5em 0; + font-size: 1em; hunk ./doc/darcs.css 117 +#leftcol pre { + margin-left: 1em; +} + hunk ./doc/index.html 33 - Darcs is a free and open source version control system, like git, git, features, notice how: hunk ./doc/index.html 91 - Here are the commands you need to get stuff done with Darcs. To - learn more, run darcs help or see the manual. + hunk ./doc/index.html 97 - Among other features, - notice how you can always select individual edits or changes, and move - changes between repos in any order. Darcs automatically detects changes - which depend on others and groups those together. The simplicity of this - "cherry-picking" is unique to Darcs (and camp) - watch this 5-minute - video to see it in action. + The simplicity of this "cherry-picking" is unique to Darcs (and + camp). Watch this + 5-minute video + to see it in action. hunk ./doc/index.html 105 -

- Working in a local repository: -

+ +

Working in a local repository:

+ hunk ./doc/index.html 112 -$ darcs add file1 # begin tracking file1, ready to commit +$ darcs add file1 # begin tracking file1, ready to commit hunk ./doc/index.html 116 -$ darcs whatsnew # show unrecorded edits in files Darcs is tracking -$ darcs whatsnew -s # just list the files -$ darcs whatsnew -sl # also list untracked files (or: darcs status) +$ darcs whatsnew # show uncommitted changes to files Darcs is tracking +$ darcs whatsnew -s # list just the files +$ darcs whatsnew -sl # list untracked files too (or: darcs status) hunk ./doc/index.html 120 - Commit edits to the repo: + Commit edits and file changes to the repo, then list the latest commits: hunk ./doc/index.html 122 -$ darcs record # select edits and commit them to the local repo +$ darcs record # select edits and commit them to the local repo +$ darcs changes # (or: darcs log) hunk ./doc/index.html 125 - List the latest commits: + Various kinds of undo: hunk ./doc/index.html 127 -$ darcs changes --last 5 # just show five (or: darcs log) +$ darcs revert # discard uncommitted edits, resetting the working copy +$ darcs rollback # reverse a committed change in this and remote repos + # history-rewriting: +$ darcs unrecord # un-commit a change in this repo, preserving working copy +$ darcs obliterate # reverse and forget a committed change in this repo hunk ./doc/index.html 133 - Undo a commit or erase a change from the local repo: -
-$ darcs unrecord      # un-commit a change, keeping the working copy as it is
-$ darcs obliterate    # forget a change and undo its effect on the working copy
+

Working with remote repositories:

hunk ./doc/index.html 135 -

- Working with remote repositories: -

hunk ./doc/index.html 139 -$ echo > darcs.cabal # (oops, hopefully upstream will catch this...) -$ darcs record # select edits and commit them to the local repo -$ darcs send # submit patches upstream if your system speaks email +$ echo > darcs.cabal # oops, hope upstream will catch this... +$ darcs record # select edits and commit them to the local repo +$ darcs send # submit patches upstream if your system speaks email hunk ./doc/index.html 143 -$ darcs send -O # save a patch file you can email to patches@darcs.net +$ darcs send -O # save a patch file you can email to patches@darcs.net hunk ./doc/index.html 145 - Other: + Moving changes between repos, and more: hunk ./doc/index.html 148 -$ darcs pull # merge new changes from upstream, updating the working copy -$ darcs push # apply our new changes to the upstream repo via SSH -$ darcs help # list all commands and how to get more help +$ darcs pull # merge new changes from upstream, updating the working copy +$ darcs push # add our new changes to the upstream repo via SSH +$ darcs help # list all commands and how to get more help