diff options
author | Joey Hess <joeyh@joeyh.name> | 2015-05-27 16:40:53 -0400 |
---|---|---|
committer | Joey Hess <joeyh@joeyh.name> | 2015-05-27 16:40:53 -0400 |
commit | 29d7190b5db9558a1b05ac2b66b13d284f022e5d (patch) | |
tree | 30a79dd3a97a69fdbd33726634f9bba4e9c1d267 | |
parent | 7439ae35d768c77d679cba04fb3fb07ac795ef83 (diff) | |
parent | 314846bca3c20db6f6203de4b55d1f8db4d6aa19 (diff) |
Merge branch 'master' of ssh://git-annex.branchable.com
-rw-r--r-- | doc/direct_mode/comment_19_cdf3062fb82078ad5677b82dc5933560._comment | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/doc/direct_mode/comment_19_cdf3062fb82078ad5677b82dc5933560._comment b/doc/direct_mode/comment_19_cdf3062fb82078ad5677b82dc5933560._comment new file mode 100644 index 000000000..1b82f87d1 --- /dev/null +++ b/doc/direct_mode/comment_19_cdf3062fb82078ad5677b82dc5933560._comment @@ -0,0 +1,13 @@ +[[!comment format=mdwn + username="mitzip" + subject="comment 19" + date="2015-05-27T20:20:11Z" + content=""" +Thanks for correcting that, and thanks for the git-revert suggestion! + +I have a question about the usage of git-revert for my purposes. I'm wanting to bring back a version of a file at a certain commit (not the whole commit) and I found this in the git docs... + +>Note: git revert is used to record some new commits to reverse the effect of some earlier commits (often only a faulty one). If you want to throw away all uncommitted changes in your working directory, you should see git-reset[1], particularly the --hard option. If you want to extract specific files as they were in another commit, you should see git-checkout[1], specifically the git checkout <commit> -- <filename> syntax. Take care with these alternatives as both will discard uncommitted changes in your working directory. + +That being said, should I still use `git revert` instead of `git checkout` because `git revert` will take care of making the new commit for me? +"""]] |