Skip to Content

Changes for page Getting Started with Git

Last modified by Bastian Triller on 2013/05/21 17:24
From version 179.1
edited by Kieran Kelleher
on 2011/07/25 18:06
Change comment: There is no comment for this version
To version 176.1
edited by Ray Kiddy
on 2011/07/25 00:50
Change comment: git annoyances. are there any? yes, there are.

Summary

Details

Page properties
Author
... ... @@ -1,1 +1,1 @@
1 -XWiki.kieran
1 +XWiki.kiddyr
Content
... ... @@ -123,14 +123,12 @@
123 123  
124 124  Keep in mind that the difficult part of what you do should be the thinking. Git makes it easy to organize and share your thoughts as branches. Your local copies may be messy or not. They are the thoughts you have in your head and lots of those thoughts will stay there and never see the light of day and that is ok. But when you have clarified your thoughts, git will make it easy to share them.
125 125  
126 -= Git Everyday Tasks =
126 += Git Annoyances =
127 127  
128 128  === How to revert? ===
129 129  
130 -Reverting is easy. The following command removes all modifications to files in your wqorking copy and brings them back to the HEAD.
130 +Reverting seems really complicated. Perhaps the simplicity of "svn revert" has fooled me. For example, say that a bunch of files get changed under you (such as, when eclipse helpfully changes the encoding specified for all the .woo files in a project without saying a word about it), how can you revert them. You might think "git revert" would work, but (if I understand it) that is only for reverting a checkin. Delete the file and do a revert? Nope. I know, svn will do just fine there, but not git. In order to do this, you need:
131 131  
132 -{{code}}
133 -
134 -git reset --hard
135 -
136 -{{/code}}
132 +> ##git ls-files --d | xargs git checkout --##
133 +>\\
134 +>>Isn't that intuitive?