|
|
@@ -45,7 +45,7 @@
|
|
|
pullall = ! git pull && git submodule update --init --recursive --remote
|
|
|
publish = ! git push -u origin `git rev-parse --abbrev-ref HEAD`
|
|
|
diverged = ! git log --graph --date=relative --oneline `git rev-parse --abbrev-ref HEAD` origin/`git rev-parse --abbrev-ref HEAD`
|
|
|
-
|
|
|
+ fixup = "!f() { TARGET=$(git rev-parse "$1"); git commit --fixup=$TARGET ${@:2} && EDITOR=true git rebase -i --autostash --autosquash $TARGET^; }; f"
|
|
|
[core]
|
|
|
editor = vim
|
|
|
excludesfile = /Users/tom/.gitignore_global
|
|
|
@@ -63,3 +63,5 @@
|
|
|
[merge "npm-merge-driver"]
|
|
|
name = automatically merge npm lockfiles
|
|
|
driver = npx npm-merge-driver merge %A %O %B %P
|
|
|
+[pull]
|
|
|
+ rebase = preserve
|
