diff options
| -rw-r--r-- | %HOME%/.gitconfig | 10 | ||||
| -rw-r--r--[-rwxr-xr-x] | %HOME%/.local/bin/git-fixup-old (renamed from %HOME%/.local/bin/git-fixup) | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | %HOME%/.local/bin/git-pulll-old (renamed from %HOME%/.local/bin/git-pulll) | 0 |
3 files changed, 10 insertions, 0 deletions
diff --git a/%HOME%/.gitconfig b/%HOME%/.gitconfig index 07b1c3b..5369d34 100644 --- a/%HOME%/.gitconfig +++ b/%HOME%/.gitconfig @@ -15,11 +15,17 @@ # If no refspec is given, push to the branch with the same name. default = upstream +# Git submodules suck, but they suck less if you read +# https://medium.com/@porteneuve/mastering-git-submodules-34c65e940407. + # Show submodule changes in a more verbose way. [diff] submodule = log [status] submoduleSummary = true +[alias] + # Pull and sync submodules. + pulll = !git pull && git submodule sync --recursive && git submodule update --init --recursive # Automatically remove obsolete things/publish new things. [fetch] @@ -62,6 +68,10 @@ unhide = update-index --no-skip-worktree hidden = !git ls-files -v | grep --basic-regexp \"^\\([[:lower:]]\\|S\\)\" + # Squash the staging area with the latest commit. + # Pass "-a" to skip using `git add`. + fixup = !GIT_EDITOR=true git commit --amend + [filter "lfs"] smudge = git-lfs smudge -- %f process = git-lfs filter-process diff --git a/%HOME%/.local/bin/git-fixup b/%HOME%/.local/bin/git-fixup-old index 3883f10..3883f10 100755..100644 --- a/%HOME%/.local/bin/git-fixup +++ b/%HOME%/.local/bin/git-fixup-old diff --git a/%HOME%/.local/bin/git-pulll b/%HOME%/.local/bin/git-pulll-old index 79299e5..79299e5 100755..100644 --- a/%HOME%/.local/bin/git-pulll +++ b/%HOME%/.local/bin/git-pulll-old |