Skip to content

Commit

Permalink
update Version Control in README
Browse files Browse the repository at this point in the history
  • Loading branch information
bostonaholic committed Jan 3, 2013
1 parent 8340456 commit e982e87
Showing 1 changed file with 29 additions and 24 deletions.
53 changes: 29 additions & 24 deletions README.md
Expand Up @@ -97,6 +97,35 @@ Think of it as "directory edit" mode.
* `u` => unschedule action for this line
* `x` => execute scheduled changes

### Version Control

Using [Magit](http://daemianmack.com/magit-cheatsheet.html)

`C-x v =` => diff

`C-x v u` => undo local changes

`C-x v l` => view commit log

`C-x v i` => include in repository (`git add <file>`)

`C-c g` => MAGIT status

* `<tab>` => view diff
* `s` => stage changes
* `S` => stage all changes
* `u` => unstage changes
* `c` => commit buffer
* `k` => delete file
* `C-c C-c` => commit changes
* `C-c C-a` => amend changes
* `P` => push buffer
* `F` => pull
* `b` => change branch
* `B` => new branch
* `g` => refresh status buffer
* `l` => view `git log`

### Clojure

`C-c C-j` => clojure-jack-in
Expand Down Expand Up @@ -127,30 +156,6 @@ buffer.

`M-n` => jump to next problem

### Version Control

`C-x v =` => diff

`C-x v u` => undo local changes

`C-x v l` => view commit log

`C-x v i` => include in repository (`git add <file>`)

`C-c g` => MAGIT status

* `<tab>` => view diff
* `s` => stage changes
* `u` => unstage changes
* `c` => commit buffer
* `C-c C-c` => commit changes
* `C-c C-a` => amend changes
* `P` => push
* `F` => pull
* `b` => change branch
* `B` => new branch
* `g` => refresh status buffer

### Snippets ###

We are using YASnippet, a TextMate-like snippet templates. Check
Expand Down

0 comments on commit e982e87

Please sign in to comment.