Skip to Content

Changes for page Getting Started with Git

Last modified by Bastian Triller on 2013/05/21 17:24
From version 174.1
edited by t_hoepfner
on 2011/07/26 08:29
Change comment: There is no comment for this version
To version 175.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.t_hoepfner
1 +XWiki.kiddyr
Content
... ... @@ -7,17 +7,11 @@
7 7  ** MacOS X [[.dmg Binary Installers>>http://code.google.com/p/git-osx-installer/]]
8 8  ** Microsoft Windows [[.exe Binary Installers>>http://code.google.com/p/msysgit/]]
9 9  
10 -{{info title="Git is included with XCode 4.x"}}
11 -
12 -XCode 4.x installs a copy of git in /usr/bin/git
13 -
14 -{{/info}}
15 -
16 16  = Learn About Git =
17 17  
18 18  * Learn the concepts.
19 19  ** [[This>>http://www.eecs.harvard.edu/~~cduan/technical/git/]] is an excellent tutorial on the basic concepts behind Git
20 -** [[Git for Computer Scientists>>http://eagain.net/articles/git-for-computer-scientists/]] gives another good view on the underlying concepts
14 +
21 21  * Learn the basics.
22 22  ** [[Everyday GIT With 20 Commands Or So>>http://www.kernel.org/pub/software/scm/git/docs/everyday.html]]
23 23  ** [[Free Online Pro Git book>>http://progit.org/book/]]
... ... @@ -129,14 +129,12 @@
129 129  
130 130  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.
131 131  
132 -= Git Everyday Tasks =
126 += Git Annoyances =
133 133  
134 134  === How to revert? ===
135 135  
136 -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:
137 137  
138 -{{code}}
139 -
140 -git reset --hard
141 -
142 -{{/code}}
132 +> ##git ls-files --d | xargs git checkout --##
133 +>\\
134 +>>Isn't that intuitive?