Differences

This shows you the differences between two versions of the page.

--- git:git_chectsheet [2011/08/01 10:20] – deva
+++ git:git_chectsheet [2012/08/01 12:48] (current) – removed deva
@@ Line 1: / Line 1: @@
-====List current status (including changes) in repo====
-<code>git status</code>
-====List files in repo====
-<code>git ls-files</code>
-====List deleted files in repo====
-<code>git ls-files -d</code>
-====Undelete file====
-<code>git checkout filename</code>
-====Undelete all deleted files====
-<code>git ls-files -d | xargs git checkout --</code>
-====Mark conflict as resolved====
-''filename'' will have merge conflicts marked in the same way used in CVS.
-<code>git add filename</code> marks the conflict as resolved.