summaryrefslogtreecommitdiffhomepage
path: root/git.html.markdown
diff options
context:
space:
mode:
authorCY Lim <cylim@CYs-Macbook-2015.local>2015-11-02 11:18:19 +1100
committerCY Lim <cylim@CYs-Macbook-2015.local>2015-11-02 11:18:19 +1100
commit094761f6936e9fbe625a9175a6404e2dca7d6504 (patch)
tree0999371c1f48011acdfabe8eb3b0e01760833e06 /git.html.markdown
parent44ca091c73afe13ec8760021cfed1d77afc5e4a5 (diff)
parent463cec82d08a58c6452b5b2beec5ee3b99e33ba6 (diff)
Merge remote-tracking branch 'adambard/master'
Diffstat (limited to 'git.html.markdown')
-rw-r--r--git.html.markdown14
1 files changed, 14 insertions, 0 deletions
diff --git a/git.html.markdown b/git.html.markdown
index bedc9853..e7ca07d6 100644
--- a/git.html.markdown
+++ b/git.html.markdown
@@ -6,6 +6,7 @@ contributors:
- ["Leo Rudberg" , "http://github.com/LOZORD"]
- ["Betsy Lorton" , "http://github.com/schbetsy"]
- ["Bruno Volcov", "http://github.com/volcov"]
+ - ["Andrew Taylor", "http://github.com/andrewjt71"]
filename: LearnGit.txt
---
@@ -333,6 +334,9 @@ $ git log --oneline
# Show merge commits only
$ git log --merges
+
+# Show all commits represented by an ASCII graph
+$ git log --graph
```
### merge
@@ -499,6 +503,16 @@ $ git reset 31f2bb1
# after the specified commit).
$ git reset --hard 31f2bb1
```
+### revert
+
+Revert can be used to undo a commit. It should not be confused with reset which restores
+the state of a project to a previous point. Revert will add a new commit which is the
+inverse of the specified commit, thus reverting it.
+
+```bash
+# Revert a specified commit
+$ git revert <commit>
+```
### rm