git: update config, aliases; add config.local

diff --git a/.gitignore b/.gitignore
index 50c82590cac8245872af09edcbe1655bfd765def..e432edcfd2d7238f65ae988b37dbd91f5c3a000c 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,6 @@
 
 # zsh local
 /etc/zsh/.z*.local
 
 # zsh local
 /etc/zsh/.z*.local

+
+# git local
+/etc/git/config.local

diff --git a/etc/git/config b/etc/git/config
index 1f7f15ee8067bf4eac2f3efa93940eeed46b057d..ae73c100acfe0f309ce4f64f9fb5f582973d1fe4 100644 (file)
--- a/etc/git/config
+++ b/etc/git/config
@@ -7,7 +7,11 @@
        submodules-pull = submodule foreach git pull origin master
        pr = "!f() { git fetch -fu ${2:-origin} refs/pull/$1/head:pr/$1 && git checkout pr/$1; }; f"
        tree = log --oneline --graph --branches --color
        submodules-pull = submodule foreach git pull origin master
        pr = "!f() { git fetch -fu ${2:-origin} refs/pull/$1/head:pr/$1 && git checkout pr/$1; }; f"
        tree = log --oneline --graph --branches --color

-[pull]
-       ff = only
+

 [init]
        defaultBranch = master
 [init]
        defaultBranch = master

+[pull]
+       ff = only
+
+[include]
+       path = config.local

diff --git a/etc/zsh/.zshrc b/etc/zsh/.zshrc
index d1d10ddb528e0bbcef30e58dfc3dffc92a30b2cb..55e9c6e3984584a7180d003ae6e7f776741bb1bb 100644 (file)
--- a/etc/zsh/.zshrc
+++ b/etc/zsh/.zshrc
@@ -248,6 +248,7 @@ alias pa=$ps
 alias spa="sudo $ps"
 unset ps
 ## git
 alias spa="sudo $ps"
 unset ps
 ## git

+alias g=git

 alias gd='git diff'
 alias gdh='git diff HEAD'
 alias ga='git add'
 alias gd='git diff'
 alias gdh='git diff HEAD'
 alias ga='git add'


@@ -256,6 +257,8 @@ alias gc='git commit'
 alias gca='git commit --amend'
 alias gp='git push'
 alias gu='git pull'
 alias gca='git commit --amend'
 alias gp='git push'
 alias gu='git pull'

+alias gl='git log'
+alias gt='git tree' # from gitconfig

 ## cd/zoxide
 function up {
     \cd $(printf '../%.0s' {1..${1:-1}})
 ## cd/zoxide
 function up {
     \cd $(printf '../%.0s' {1..${1:-1}})