Page MenuHomeBlueprint

No OneTemporary

diff --git a/.gitconfig b/.gitconfig
index 9ad5197..33a38ef 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,76 +1,59 @@
[user]
name = Miroslaw Baran
[core]
excludesfile = ~/.gitignore
[color]
diff = always
status = always
branch = always
[merge]
tool = bc3
[diff]
tool = bc3
compactionHeuristic = true
[difftool]
prompt = false
[alias]
- branch-name = !git for-each-ref --format='%(refname:short)' $(git symbolic-ref HEAD)
- remote-branch-name = "!_() { \
- full_ref=\"$(git rev-parse --symbolic-full-name --verify HEAD@{upstream})\"; \
- remote=\"$(git remote-name)\"; \
- echo \"${full_ref##refs/remotes/$remote/}\"; \
- }; _"
- remote-name = !git config branch.$(git branch-name).remote
branches = branch -a
id = rev-parse
pull = pull --ff-only
merge = merge --no-ff
up = merge --ff-only
update = merge --ff-only
in = !git incoming
out = !git outgoing
- incoming = "!_() { \
- remote=${1:-$(git remote-name)}; \
- branch=${2:-$(git remote-branch-name)}; \
- git fetch -q $remote && git --no-pager log HEAD..${remote}/${branch}; \
- }; _"
- outgoing = "!_() { \
- remote=${1:-$(git remote-name)}; \
- branch=${2:-$(git remote-branch-name)}; \
- git fetch -q $remote && git --no-pager log ${remote}/${branch}..HEAD; \
- }; _"
ci = commit
co = checkout
st = status -s -b
gll = log --color=always --all --graph --topo-order --pretty='format: %Cgreen%h%Creset %s%Cred%d%Creset%n'
root = !pwd -P
sm = submodule
pullsub = submodule foreach "git pull origin master"
unstage = reset HEAD --
ctags = "!: ${GIT_DIR:=.git} && ${GIT_DIR}/hooks/ctags"
stash-rename = "!_() { rev=$(git rev-parse $1) && git stash drop $1 || exit 1 ; git diff-index --quiet HEAD; s=$?; [ $s != 0 ] && git stash save \"tmp stash from stash-rename\"; git stash apply $rev && shift && git stash save \"$@\" && [ $s != 0 ] && git stash pop stash@{1}; }; _"
pip = "!pip install --upgrade $(git root)"
[gui]
fontui = -family Ubuntu -size 10 -weight normal -slant roman -underline 0 -overstrike 0
fontdiff = -family \"Ubuntu Mono\" -size 11 -weight normal -slant roman -underline 0 -overstrike 0
[init]
templatedir = ~/.git-template
[difftool "bc3"]
trustExitCode = true
[mergetool "bc3"]
trustExitCode = true
[filter "lfs"]
clean = git-lfs clean %f
smudge = git-lfs smudge %f
required = true
diff --git a/.local/share/git/git-branch-name b/.local/share/git/git-branch-name
new file mode 100755
index 0000000..6b2892c
--- /dev/null
+++ b/.local/share/git/git-branch-name
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+git for-each-ref --format='%(refname:short)' $(git symbolic-ref HEAD)
diff --git a/.local/share/git/git-incoming b/.local/share/git/git-incoming
new file mode 100755
index 0000000..b99ad1d
--- /dev/null
+++ b/.local/share/git/git-incoming
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+remote=${1:-$(git-remote-name)}
+branch=${2:-$(git-remote-branch-name)}
+git fetch -q ${remote} && git --no-pager log HEAD..${remote}/${branch}
diff --git a/.local/share/git/git-outgoing b/.local/share/git/git-outgoing
new file mode 100755
index 0000000..a9876b8
--- /dev/null
+++ b/.local/share/git/git-outgoing
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+remote=${1:-$(git-remote-name)}
+branch=${2:-$(git-remote-branch-name)}
+git fetch -q ${remote} && git --no-pager log ${remote}/${branch}..HEAD
diff --git a/.local/share/git/git-remote-branch-name b/.local/share/git/git-remote-branch-name
new file mode 100755
index 0000000..b06e50c
--- /dev/null
+++ b/.local/share/git/git-remote-branch-name
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+full_ref=$(git rev-parse --symbolic-full-name --verify HEAD@{upstream})
+remote=$(git-remote-name)
+echo ${full_ref##refs/remotes/$remote/}
diff --git a/.local/share/git/git-remote-name b/.local/share/git/git-remote-name
new file mode 100755
index 0000000..109cdf5
--- /dev/null
+++ b/.local/share/git/git-remote-name
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+git config branch.$(git-branch-name).remote
diff --git a/.zshrc b/.zshrc
index 5d492eb..a90fdc0 100644
--- a/.zshrc
+++ b/.zshrc
@@ -1,133 +1,133 @@
# Path to your oh-my-zsh configuration.
export ZSH="${HOME}/.local/share/oh-my-zsh"
# Theme settings. Optionally, if you set this to "random",
# it'll load a random theme each time that oh-my-zsh is
# loaded.
ZSH_THEME="sunny"
# Set to this to use case-sensitive completion
# CASE_SENSITIVE="true"
# Comment this out to disable weekly auto-update checks
DISABLE_AUTO_UPDATE="true"
# Uncomment following line if you want to disable colors in ls
# DISABLE_LS_COLORS="true"
# Uncomment following line if you want to disable autosetting
# terminal title.
# DISABLE_AUTO_TITLE="true"
# Uncomment following line if you want red dots to be
# displayed while waiting for completion
# COMPLETION_WAITING_DOTS="true"
# Which plugins would you like to load? (plugins can be found
# in ~/.oh-my-zsh/plugins/*)
# Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
# Example format: plugins=(rails git textmate ruby lighthouse)
plugins=(
vi-mode
python
virtualenvwrapper
mosh
colorize
git-flow-avh
history-substring-search
)
path_components=(
/usr/local/opt/coreutils/libexec/gnubin
/usr/local/{s,}bin /{s,}bin /usr/{s,}bin /usr/games
- "${HOME}/bin" "${HOME}/.rvm/bin"
+ "${HOME}/bin" "${HOME}/.rvm/bin" "${HOME}/.local/share/git"
)
# functions
cleanup_path() {
local dir
local -a path
for dir in "$@"; do
if [[ -d "${dir}" ]]; then
path+="${dir}"
fi
done
echo "${(j.:.)path}"
}
# environment variables
export PATH="$(cleanup_path ${path_components[@]})"
export HISTFILE=~/.zsh_history
export HISTSIZE=100000
export SAVEHIST=100000
export FORTUNES=$HOME/.fortunes/common
export ONELINERS=$HOME/.fortunes/one-liners
export SIGFIXED=$HOME/.signatures/sigfixed
export IRCNICK="Jubal"
export IRCNAME="when it rains, it pours..."
export IRCSERVER="polska.irc.pl"
export IRCUMODE="+iw-s"
export VISUAL=vim
export EDITOR=vim
export MC_SKIN=$HOME/.config/mc/solarized.ini
export WORKON_HOME="$HOME/.virtualenvs"
# get the oh-my-zsh baseline
if [[ -f "$ZSH/oh-my-zsh.sh" ]]; then
source $ZSH/oh-my-zsh.sh
fi
# and local changes
if [[ -f "$HOME/.zshrc.local" ]]; then
source "$HOME/.zshrc.local"
fi
# shell settings
setopt appendhistory
setopt autocd
setopt completeinword
setopt nocorrectall
setopt extendedglob
setopt histexpiredupsfirst
setopt histignoredups
setopt histverify
setopt incappendhistory
setopt nohistfindnodups
setopt nomatch
setopt notify
setopt sharehistory
# keybindings
bindkey "" up-line-or-history
bindkey "" down-line-or-history
bindkey "" forward-char
bindkey "" backward-char
bindkey "[3~" vi-delete-char
bindkey "^R" history-incremental-search-backward
bindkey "^H" backward-delete-char
bindkey "" vi-beginning-of-line
bindkey "" vi-end-of-line
# aliases
if [[ -x /usr/bin/dircolors ]]; then
test -r ~/.dircolors && eval "$(dircolors ~/.dircolors)" || eval "$(dircolors)"
alias ls='ls --color=auto'
alias dir='dir --color=auto'
alias vdir='vdir --color=auto'
alias grep='grep --color=auto'
alias fgrep='fgrep --color=auto'
alias egrep='egrep --color=auto'
fi
alias rx="exec $SHELL"
# pager settings
which lesspipe >/dev/null 2>&1 && eval $(lesspipe)
export LESS="-R -F -X"

File Metadata

Mime Type
application/octet-stream
Expires
Thu, Aug 13, 13:09 (1 d, 23 h)
Storage Engine
local-disk
Storage Format
Raw Data
Storage Handle
79/45/1200f2073d2a2dd620afa9f28f81

Event Timeline