|
@@ -0,0 +1,47 @@
|
|
|
|
|
+# Git
|
|
|
|
|
+
|
|
|
|
|
+Useful git commands and workflow.
|
|
|
|
|
+
|
|
|
|
|
+## Workflow
|
|
|
|
|
+
|
|
|
|
|
+For a good workflow with branches, [see this article](https://nvie.com/posts/a-successful-git-branching-model/).
|
|
|
|
|
+
|
|
|
|
|
+## Configuration
|
|
|
|
|
+
|
|
|
|
|
+`git config --global user.email "contact@jovian-hersemeule.eu"`
|
|
|
|
|
+`git config --global user.name "DricomDragon"`
|
|
|
|
|
+`git config --global core.editor "vim"`
|
|
|
|
|
+`git config --global push.followTags true`
|
|
|
|
|
+`git config --global diff.tool vimdiff`
|
|
|
|
|
+
|
|
|
|
|
+You can replace `--global` by `--local` to configure a specific project.
|
|
|
|
|
+
|
|
|
|
|
+## Useful commands
|
|
|
|
|
+
|
|
|
|
|
+### Staging
|
|
|
|
|
+
|
|
|
|
|
+`git status -s`
|
|
|
|
|
+
|
|
|
|
|
+`git diff` for difference against unstaged files
|
|
|
|
|
+
|
|
|
|
|
+`git diff --staged` or `git diff --cached` for difference against staged files
|
|
|
|
|
+
|
|
|
|
|
+`git rm --cached <file>` remove a file from git but keep this file on drive
|
|
|
|
|
+
|
|
|
|
|
+### Diff tool
|
|
|
|
|
+
|
|
|
|
|
+`git difftool` use a tool like _vimdiff_
|
|
|
|
|
+
|
|
|
|
|
+`git difftool --tool-help` see availble git diff tools
|
|
|
|
|
+
|
|
|
|
|
+See **config** for setting his own git tool for diff.
|
|
|
|
|
+
|
|
|
|
|
+### Powerful history
|
|
|
|
|
+
|
|
|
|
|
+`git commit -v` see diff
|
|
|
|
|
+
|
|
|
|
|
+`git log -p` see diff for every commit
|
|
|
|
|
+
|
|
|
|
|
+`git log --graph` see branches history
|
|
|
|
|
+
|
|
|
|
|
+`git log --stat` see numbers of modifs on each file for every commit
|
DricomDragon