This shows you the differences between two versions of the page.
Both sides previous revision Previous revision Next revision | Previous revision Next revision Both sides next revision | ||
software:git [2010/12/10 03:58] tjhoban |
software:git [2011/01/31 08:37] tjhoban |
||
---|---|---|---|
Line 6: | Line 6: | ||
The quick version: | The quick version: | ||
- | pull changes down from the central repository (do this before making your own work.): | + | pull changes down from the central repository (do this before starting your own work.): |
><code<>git pull origin master</code> | ><code<>git pull origin master</code> | ||
Line 17: | Line 17: | ||
<code>git rm <filename/directory></code> | <code>git rm <filename/directory></code> | ||
+ | |||
+ | See what changes have been made to the codebase: | ||
+ | |||
+ | <code>git status</code> | ||
commit some changes: | commit some changes: | ||
Line 30: | Line 34: | ||
<code>git diff <filename></code> | <code>git diff <filename></code> | ||
- | See what changes have been made to the codebase: | + | Sometimes (rarely) a repository will get confused. You will see errors like: |
+ | |||
+ | <code>error: unable to create temporary sha1 filename .git/objects/95: File exists</code> | ||
+ | |||
+ | This can be corrected by either "chown -R prog .git", or by the commands: | ||
+ | |||
+ | <code> | ||
+ | git fsck | ||
+ | git prune | ||
+ | git repack | ||
+ | git fsck | ||
+ | </code> | ||
- | <code>git status</code> |