Sublime Text as editor in Git-Bash
In ~/.gitconfig (or %USERPROFILE%\.gitconfig on Windows): [core] editor = sublime_text -n -w[core] editor = sublime_text -n -w
Category: git
Change commit date
$ git rebase -i HEAD~3 In editor mark commit that need change as ‘edit’ (the second commit in example below) pick 64b0966 commit message 1… edit 07f540b commit message 2… pick a2b69e4 commit message 3… # Rebase 50d9975..a2b69e4 onto 50d9975 (3 command(s)) # # Commands: # p, pick = use commit # Read more about Change commit date[…]
GIT: conflict resolve on pull or merge
Theirs on top git pull -s recursive -X theirs <remote> <branch> git merge -s recursive -X theirs <branch> My on top git pull -s recursive -X ours <remote> <branch> git merge -s recursive -X ours <branch>
git: file history with diff
Show diff ONLY for src/main/resources/file.xmlgit log -p src/main/resources/file.xml Show diff for ALL FILES that touches src/main/resources/file.xmlgit log -p –full-diff src/main/resources/file.xml Show diff but with 0 context lines (no context lines) git log -p -U0 Similar like above, but diff in history git diff -U0
Git tags
Tags git tag -a v1.0 -m ‘version 1.0’ # add tag git tag -d v1.0 # remove tag git push origin :refs/tags/v1.0 # remove remote tag
git (github) repository as npm dependency
{ "name": "node-sample-app", "version": "0.0.1", "private": true, "scripts": { "start": "node app.js" }, "dependencies": { "private-module1": "git+https://github.com/marioosh-net/private-module1", "private-module2": "git+ssh://github.com/marioosh-net/private-module2#master" } }{ "name": "node-sample-app", "version": "0.0.1", "private": true, "scripts": { "start": "node app.js" }, "dependencies": { "private-module1": "git+https://github.com/marioosh-net/private-module1", "private-module2": "git+ssh://github.com/marioosh-net/private-module2#master" } } more info here
Git usable commands
Delete branches git branch -d branch-name # delete local branch git push origin :branch-name # delete remote branch Rename local branch git branch -m old-branch new-branch Join/merge last X (in example below 3) commits into one git rebase -i HEAD~3 In editor (pick last, squash 2 earlier commits): pick 7e168d2 commit message 3 s b3bd215 commit message Read more about Git usable commands[…]