lg1 = !"git lg1-specific --all"
lg2 = !"git lg2-specific --all"
lg3 = !"git lg3-specific --all"
-
lg1-specific = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)'
lg2-specific = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n'' %C(white)%s%C(reset) %C(dim white)- %an%C(reset)'
lg3-specific = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset) %C(bold cyan)(committed: %cD)%C(reset) %C(bold yellow)%d%C(reset)%n'' %C(white)%s%C(reset)%n'' %C(dim white)- %an <%ae> %C(reset) %C(dim white)(committer: %cn <%ce>)%C(reset)'
-
# View the current working tree status using the short format
s = status -s
-
# Show the diff between the latest commit and the current state
d = !"git diff-index --quiet HEAD -- || clear; git --no-pager diff --patch-with-stat"
-
# `git di $number` shows the diff between the state `$number` revisions ago and the current state
di = !"d() { git diff --patch-with-stat HEAD~$1; }; git diff-index --quiet HEAD -- || clear; d"
diffall = !sh git-diffall.sh
-
# Pull in remote changes for the current repository and all its submodules
p = !"git pull; git submodule foreach git pull origin master"
-
# Clone a repository including all submodules
c = clone --recursive
-
# Commit all changes
ca = !git add -A && git commit -av
-
# Switch to a branch, creating it if necessary
go = "!f() { git checkout -b \"$1\" 2> /dev/null || git checkout \"$1\"; }; f"
-
# Show verbose output about tags, branches or remotes
tags = tag -l
branches = branch -a
remotes = remote -v
bra = branch -a
brd = branch -d
-
# Amend the currently staged files to the latest commit
amend = commit --amend --reuse-message=HEAD
-
# Credit an author on the latest commit
credit = "!f() { git commit --amend --author \"$1 <$2>\" -C HEAD; }; f"
-
# Interactive rebase with the given number of latest commits
reb = "!r() { git rebase -i HEAD~$1; }; r"
-
# Find branches containing commit
fb = "!f() { git branch -a --contains $1; }; f"
-
# Find tags containing commit
ft = "!f() { git describe --always --contains $1; }; f"
-
# Find commits by source code
fc = "!f() { git log --pretty=format:'%C(yellow)%h %Cblue%ad %Creset%s%Cgreen [%cn] %Cred%d' --decorate --date=short -S$1; }; f"
-
# Find commits by commit message
fm = "!f() { git log --pretty=format:'%C(yellow)%h %Cblue%ad %Creset%s%Cgreen [%cn] %Cred%d' --decorate --date=short --grep=$1; }; f"
-
# Remove branches that have already been merged with master
# a.k.a. ?delete merged?
dm = "!git branch --merged | grep -v '\\*' | xargs -n 1 git branch -d"
-
# List contributors with number of commits
contributors = shortlog --summary --numbered
-
co = checkout
cobr = checkout -b
-
root = rev-parse --show-toplevel
-
[apply]
# Detect whitespace errors when applying a patch
whitespace = fix
-
[core]
# Use custom `.gitignore`
excludesfile = ~/.gitignore_global
-
# Treat spaces before tabs and all kinds of trailing whitespace as an error
# [default] trailing-space: looks for spaces at the end of a line
# [default] space-before-tab: looks for spaces before tabs at the beginning of a line
whitespace = space-before-tab,-indent-with-non-tab,trailing-space
-
# utocrlf = input
editor = git-editor.sh
-
[color]
# Use colors in Git commands that are capable of colored output when
# outputting to the terminal. (This is the default setting in Git = 1.8.4.)
ui = auto
-
[color "branch"]
current = yellow reverse
local = yellow
remote = green
-
[color "diff"]
meta = yellow bold
frag = magenta bold # line info
old = red # deletions
new = green # additions
-
[color "status"]
added = yellow
changed = green
untracked = cyan
-
[help]
# Automatically correct and execute mistyped commands
autocorrect = 1
-
[diff]
tool = git-difftool
# Detect copies as well as renames
renames = copies
prompt = false
-
[difftool "git-difftool"]
cmd = git-difftool.sh $LOCAL $REMOTE
-
[merge]
tool = git-mergetool
# Include summaries of merged commits in newly created merge commit messages
log = true
prompt = false
-
[mergetool "git-mergetool"]
cmd = git-mergetool.sh $LOCAL $REMOTE $BASE $MERGED
-
+[push]
+ default = simple
[include]
# Local/private config goes in the include
path = ~/.gitconfig_local
# Increase history-limit for scrolling (default is 2000)
set-option -g history-limit 15000
# mouse support - set to on if you want to use the mouse
-setw -g mode-mouse on
-set -g mouse-select-pane on
-set -g mouse-resize-pane on
-set -g mouse-select-window on
-set -g mouse-utf8 on
+#setw -g mode-mouse on
+#set -g mouse-select-pane on
+#set -g mouse-resize-pane on
+#set -g mouse-select-window on
+#set -g mouse-utf8 on
# enable vi keys.
setw -g mode-keys vi
# Reload the file with Prefix r
# open tree instead of session list
bind s run 'tmuxer choose-session'
bind-key -t vi-choice h tree-collapse
-bind-key -t vi-choice l tree-expand
\ No newline at end of file
+bind-key -t vi-choice l tree-expand
+# local/private settings
+source-file ~/.tmux_local.conf
call vundle#end() " required
filetype plugin indent on " required
-syntax enable " syntaxs highlightning
+syntax enable
"------------------------------------------------------------------------------
" Regular setting
"------------------------------------------------------------------------------
"
-set backspace=2 " backspace in insert mode works like normal editor
+set backspace=eol,start,indent
set autoindent " auto indenting
set number " line numbers
set nobackup " get rid of anoying ~file
+set noswapfile
+set nowb
set encoding=utf-8
set expandtab
-set fileencodings=ucs-bom,utf-8,euc-jp
set hid
set hlsearch
set incsearch
+set ignorecase
+set smartcase
set laststatus=2
set number
set mouse=a
set visualbell t_vb=
set modeline
set modelines=1
+set so=7
" For color
"let g:solarized_termcolors=256
projects / dotfiles.git / commitdiff