aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarel Kočí <karel.koci@nic.cz>2016-09-06 16:25:02 +0200
committerKarel Kočí <karel.koci@nic.cz>2016-09-06 16:25:02 +0200
commit6ba57fd090395be2bb1f1918aea726f34bb5740d (patch)
tree0a7004a2d452899569c7acac2a0b53e7a04a8883
parentc3cc78165124b6b8b851daf119bce1530b394199 (diff)
downloadmyconfigs-6ba57fd090395be2bb1f1918aea726f34bb5740d.tar.gz
myconfigs-6ba57fd090395be2bb1f1918aea726f34bb5740d.tar.bz2
myconfigs-6ba57fd090395be2bb1f1918aea726f34bb5740d.zip
git add aliases and zsh don't share history
-rw-r--r--gitconfig8
-rw-r--r--zshrc1
2 files changed, 8 insertions, 1 deletions
diff --git a/gitconfig b/gitconfig
index 0fef859..de6c05c 100644
--- a/gitconfig
+++ b/gitconfig
@@ -10,3 +10,11 @@
gpgsign = true
[merge]
tool = vimdiff
+[alias]
+ co = checkout
+ ci = commit
+ st = status
+ br = branch
+ hist = log --pretty=format:'%h %ad | %s%d [%an]' --graph --date=short
+ type = cat-file -t
+ dump = cat-file -p
diff --git a/zshrc b/zshrc
index 276e26f..4bfbc9e 100644
--- a/zshrc
+++ b/zshrc
@@ -15,7 +15,6 @@ HISTSIZE=10000
SAVEHIST=10000
setopt appendhistory
setopt extendedglob
-setopt share_history
setopt hist_ignore_dups
setopt hist_expire_dups_first
setopt extended_history