Differences
This shows you the differences between two versions of the page.
| Next revision | Previous revision | ||
| git [2019/02/08 09:30] – created dani | git [2019/12/23 08:24] (current) – external edit 127.0.0.1 | ||
|---|---|---|---|
| Line 23: | Line 23: | ||
| file: | file: | ||
| file: | file: | ||
| - | file: | + | file: |
| file: | file: | ||
| file: | file: | ||
| Line 50: | Line 50: | ||
| * List files in local repository< | * List files in local repository< | ||
| git ls-files -m -d -u -c | git ls-files -m -d -u -c | ||
| - | </ | + | </ |
| + | |||
| + | |-m|Show modified files in the output | ||
| |-d|Show deleted files in the output | |-d|Show deleted files in the output | ||
| |-u|Show unmerged files in the output (forces --stage)| | |-u|Show unmerged files in the output (forces --stage)| | ||
| Line 59: | Line 61: | ||
| git remote -v update | git remote -v update | ||
| Fetching origin | Fetching origin | ||
| - | From ssh://dev.daniel-steiner.org/ | + | From ssh://dev.dsteiner.ch/ |
| = [up to date] master | = [up to date] master | ||
| = [up to date] from_svn | = [up to date] from_svn | ||
| Line 65: | Line 67: | ||
| * Corresponding '' | * Corresponding '' | ||
| *.scpt | *.scpt | ||
| - | </ | + | </ |
| + | |||
| + | |**Note:**|This is usefull, if you add some new ignores which where already checked in into git!| | ||
| ==== Git cache ==== | ==== Git cache ==== | ||
| Line 71: | Line 75: | ||
| * Deleting cache for all '' | * Deleting cache for all '' | ||
| git rm --cached *.scpt | git rm --cached *.scpt | ||
| - | </ | + | </ |
| + | |||
| + | |**Note:**|Everything is up to date here!| | ||
| ===== Search in log ===== | ===== Search in log ===== | ||
| Line 115: | Line 121: | ||
| git difftool -r 55c5af0 cced6b2 < | git difftool -r 55c5af0 cced6b2 < | ||
| </ | </ | ||
| - | * Show staged diffs:< | + | * Show staged |
| git diff --cached | git diff --cached | ||
| </ | </ | ||
| Line 122: | Line 128: | ||
| If you want to generate a patch for any changes from any previous commit, you can use '' | If you want to generate a patch for any changes from any previous commit, you can use '' | ||
| - | ||You can limit the patch output for a limited number of commits ('' | + | |**Note:**|You can limit the patch output for a limited number of commits ('' |
| * Show log and the path for one commit (-1):< | * Show log and the path for one commit (-1):< | ||
| Line 176: | Line 182: | ||
| git checkout < | git checkout < | ||
| </ | </ | ||
| - | |||
| |**1**|Using a commit id | | |**1**|Using a commit id | | ||
| |**2**|Using another branch| | |**2**|Using another branch| | ||
| - | + | |**Note:**|This is only working, if the path in repository is the same!| | |
| - | ||This is only working, if the path in repository is the same!| | + | |
| * To get the content and write that into a file, use this command:< | * To get the content and write that into a file, use this command:< | ||