  #
  # Some example alias instructions
  # If these are enabled they will be used instead of any instructions
-@@ -91,28 +94,28 @@
+@@ -91,28 +92,28 @@
  # \rm will call the real rm not the alias.
  #
  # Interactive operation...
 -# alias rm='rm -i'
 -# alias cp='cp -i'
 -# alias mv='mv -i'
+-#
 +alias rm='rm -i'
 +alias cp='cp -i'
 +alias mv='mv -i'
- #
++
  # Default to human readable figures
 -# alias df='df -h'
 -# alias du='du -h'
+-#
 +alias df='df -h'
 +alias du='du -h'
- #
++
  # Misc :)
 -# alias less='less -r'                          # raw control characters
 -# alias whence='type -a'                        # where, of a sort
 -# alias grep='grep --color'                     # show differences in colour
 -# alias egrep='egrep --color=auto'              # show differences in colour
 -# alias fgrep='fgrep --color=auto'              # show differences in colour
+-#
 +alias less='less -r'                          # raw control characters
 +alias whence='type -a'                        # where, of a sort
 +alias grep='grep --color'                     # show differences in colour
 +alias egrep='egrep --color=auto'              # show differences in colour
 +alias fgrep='fgrep --color=auto'              # show differences in colour
- #
++
  # Some shortcuts for different directory listings
 -# alias ls='ls -hF --color=tty'                 # classify files in colour
 -# alias dir='ls --color=auto --format=vertical'

 # Set MANPATH so it includes users' private man if it exists
 # if [ -d "${HOME}/man" ]; then
diff -u orig/.bashrc ./.bashrc
--- orig/.bashrc	2014-04-07 17:55:09.000000000 +0900
+++ ./.bashrc	2014-07-15 10:42:06.322721200 +0900
@@ -67,12 +67,15 @@
 #
 # Don't put duplicate lines in the history.
 # export HISTCONTROL=$HISTCONTROL${HISTCONTROL+,}ignoredups
+export HISTCONTROL=ignoreboth
+export HISTTIMEFORMAT='%y/%m/%d %T '
 #
 # Ignore some controlling instructions
 # HISTIGNORE is a colon-delimited list of patterns which should be excluded.
 # The '&' is a special pattern which suppresses duplicate entries.
 # export HISTIGNORE=$'[ \t]*:&:[fb]g:exit'
 # export HISTIGNORE=$'[ \t]*:&:[fb]g:exit:ls' # Ignore the ls command as well
+export HISTIGNORE="?:??:???:f *:h *"
 #
 # Whenever displaying the prompt, write the previous line to disk
 # export PROMPT_COMMAND="history -a"
@@ -80,9 +83,9 @@
 # Aliases
 #
 # Some people use a different file for aliases

 
 # Umask
 #
@@ -128,6 +129,9 @@
 # if [ -f "${HOME}/.bash_functions" ]; then
 #   source "${HOME}/.bash_functions"
 # fi
+if [ -f "${HOME}/bin/myfuncitons" ]; then
+    source "${HOME}/bin/myfuncitons"
+fi
 #
 # Some example functions:
 #
