summaryrefslogtreecommitdiffhomepage
path: root/git.html.markdown
diff options
context:
space:
mode:
authorJacob Ward <jacobward1898@gmail.com>2015-10-31 20:27:51 -0600
committerJacob Ward <jacobward1898@gmail.com>2015-10-31 20:27:51 -0600
commit5d09566ee4881028cd53dee83ae27343beb8269d (patch)
treed5d48488f23e08690f1ec54610c9fe81e34d2fe8 /git.html.markdown
parent08b43e21f1a273d5ca471e0accdf46ba706a4cd5 (diff)
parentdbe6184519860e526432c4987a6f67d6c0acf38e (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