Differences
This shows you the differences between two versions of the page.
Both sides previous revision Previous revision Next revision | Previous revision | ||
git [2019/02/08 09:38] – 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 61: | 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 121: | Line 121: | ||
git difftool -r 55c5af0 cced6b2 < | git difftool -r 55c5af0 cced6b2 < | ||
</ | </ | ||
- | * Show staged diffs:< | + | * Show staged |
git diff --cached | git diff --cached | ||
</ | </ | ||
Line 182: | 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: | |**Note: | ||
- | |||
* 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:< |