meta data for this page
  •  

Differences

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

Link to this comparison view

Both sides previous revisionPrevious revision
Next revision		Previous revision
linux:tools:git [2026/06/10 12:52] – titannetlinux:tools:git [2026/06/10 12:54] (current) – titannet
Line 11: Line 11:
 | ''git add -A'', ''git add .'', ''git add <file>'' | | | ''git add -A'', ''git add .'', ''git add <file>'' | |
 | ''git reset <>'' | unstage, opposite of add | | ''git reset <>'' | unstage, opposite of add |
-| git commit -m 'message' | commit staged changes | +| ''git commit -m 'message''' | commit staged changes | 
-| git commit -am 'message' | commit all unstaged changes | +| ''git commit -am 'message''' | commit all unstaged changes | 
-| git pull [origin] [branch] | | +| ''git pull [origin] [branch]'' | | 
-| git push <origin> <branch> | |+| ''git push <origin> <branch>'' | |
 | | | | | |
  
Line 34: Line 34:
 | ''git clean'' | Delete untracked files (temporary files and leftovers)| | ''git clean'' | Delete untracked files (temporary files and leftovers)|
  
-| ''git diff'' | show difference between current and head '' |+| ''git diff'' | Show difference between current and head |
 | ''git diff HEAD'' | Diff staged and unstaged changes | | ''git diff HEAD'' | Diff staged and unstaged changes |
 | ''git diff --staged'' | Diff staged changes | | ''git diff --staged'' | Diff staged changes |
Line 49: Line 49:
 | ''git mergetool'' | run merge tool to fix merge errors | | ''git mergetool'' | run merge tool to fix merge errors |
 | ''git branch -d <name>'', ''-D'' | delete / force delete branch | | ''git branch -d <name>'', ''-D'' | delete / force delete branch |
 +| ''git config --global merge.tool p4merge'' | Define merge tool |