* add .gitconfig to set default for git

  * refer: http://blog.asial.co.jp/845
 * remove default settings from .bashrc they already exist in the original .bashrc
 * fix LESS variable
  * git log command uses escape sequences
  * original LESS variable of less which was forked by git log is LESS=FRSX
 * add __git_ps1 to shell prompt
  * original PS1 is '${debian_chroot:+($debian_chroot)}\u@\h:\w\$'
  * refer: http://d.hatena.ne.jp/deeeki/20110402/git_branch_ps1

git-svn-id: https://lab.mitty.jp/svn/lab/trunk@156 7d2118f6-f56c-43e7-95a2-4bb3031d96e7

diff --git a/TipAndDoc/.bashrc b/TipAndDoc/.bashrc
index fa401a5..33a26e3 100644 (file)
--- a/TipAndDoc/.bashrc
+++ b/TipAndDoc/.bashrc
@@ -1,90 +1,3 @@
-# ~/.bashrc: executed by bash(1) for non-login shells.
-# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc)
-# for examples
-
-# If not running interactively, don't do anything
-[ -z "$PS1" ] && return
-
-# don't put duplicate lines in the history. See bash(1) for more options
-export HISTCONTROL=ignoredups
-# ... and ignore same sucessive entries.
-export HISTCONTROL=ignoreboth
-
-# check the window size after each command and, if necessary,
-# update the values of LINES and COLUMNS.
-shopt -s checkwinsize
-
-# make less more friendly for non-text input files, see lesspipe(1)
-[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
-
-# set variable identifying the chroot you work in (used in the prompt below)
-if [ -z "$debian_chroot" ] && [ -r /etc/debian_chroot ]; then
-    debian_chroot=$(cat /etc/debian_chroot)
-fi
-
-# set a fancy prompt (non-color, unless we know we "want" color)
-case "$TERM" in
-    xterm-color) color_prompt=yes;;
-esac
-
-# uncomment for a colored prompt, if the terminal has the capability; turned
-# off by default to not distract the user: the focus in a terminal window
-# should be on the output of commands, not on the prompt
-#force_color_prompt=yes
-
-if [ -n "$force_color_prompt" ]; then
-    if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
-       # We have color support; assume it's compliant with Ecma-48
-       # (ISO/IEC-6429). (Lack of such support is extremely rare, and such
-       # a case would tend to support setf rather than setaf.)
-       color_prompt=yes
-    else
-       color_prompt=
-    fi
-fi
-
-if [ "$color_prompt" = yes ]; then
-    PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
-else
-    PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
-fi
-unset color_prompt force_color_prompt
-
-# If this is an xterm set the title to user@host:dir
-case "$TERM" in
-xterm*|rxvt*)
-    PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME}: ${PWD/$HOME/~}\007"'
-    ;;
-*)
-    ;;
-esac
-
-# Alias definitions.
-# You may want to put all your additions into a separate file like
-# ~/.bash_aliases, instead of adding them here directly.
-# See /usr/share/doc/bash-doc/examples in the bash-doc package.
-
-#if [ -f ~/.bash_aliases ]; then
-#    . ~/.bash_aliases
-#fi
-
-# enable color support of ls and also add handy aliases
-if [ "$TERM" != "dumb" ] && [ -x /usr/bin/dircolors ]; then
-    eval "`dircolors -b`"
-    alias ls='ls --color=auto'
-    #alias dir='ls --color=auto --format=vertical'
-    #alias vdir='ls --color=auto --format=long'
-
-    #alias grep='grep --color=auto'
-    #alias fgrep='fgrep --color=auto'
-    #alias egrep='egrep --color=auto'
-fi
-
-# some more ls aliases
-#alias ll='ls -l'
-#alias la='ls -A'
-#alias l='ls -CF'
-
 # enable programmable completion features (you don't need to enable
 # this, if it's already enabled in /etc/bash.bashrc and /etc/profile
 # sources /etc/bash.bashrc).
@@ -95,7 +8,7 @@ fi
 umask 022   # create new file with '644'
 ulimit -c 0 # no dump core
 export PAGER=less
-export LESS='-X -i -P ?f%f:(stdin).  ?lb%lb?L/%L..  [?eEOF:?pb%pb\%..]'
+export LESS='-FRX -i -P ?f%f:(stdin).  ?lb%lb?L/%L..  [?eEOF:?pb%pb\%..]'
 
 HISTSIZE=50000
 HISTFILESIZE=50000
@@ -119,6 +32,12 @@ function I {
     if [ "$1" ]; then history | grep "$@"; else history 30; fi
 }
 
+if [ -f $BASH_COMPLETION_DIR/git ]; then
+    export PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w$(__git_ps1)\$ '
+else
+    export PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
+fi
+
 alias vi='vim'
 alias sudo='sudo -H '
 alias rm='rm -v'

diff --git a/TipAndDoc/.gitconfig b/TipAndDoc/.gitconfig
new file mode 100644 (file)
index 0000000..3ee0900
--- /dev/null
+++ b/TipAndDoc/.gitconfig
@@ -0,0 +1,13 @@
+[user]\r
+       name = Ken-ichi Mito\r
+       email = mitty@mitty.jp\r
+[color]\r
+       ui = true\r
+[alias]\r
+       co = checkout\r
+       ci = commit\r
+       st = status\r
+       br = branch\r
+       hist = log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short\r
+[core]\r
+       excludesfile = ~/.gitignore\r