new file:   .bashrc
	new file:   .dmrc
	new file:   .fbtermrc
	new file:   .htoprc
	new file:   .rtorrent.rc
	new file:   .screenrc
	new file:   .vimperatorrc
	new file:   .vimrc
	new file:   .xinitrc
	new file:   .xmobarrc
	new file:   .zshrc
	new file:   xmonad.hs
	new file:   .tmux.conf
	typechange: .vimperatorrc
	typechange: .vimrc
	typechange: .xmobarrc
	typechange: .zshrc
	typechange: xmonad.hs
	new file:   _tmux.conf
	new file:   _vim/.netrwhist
	new file:   _vim/after/ftplugin/haskell.vim
	new file:   _vim/after/ftplugin/ruby.vim
	new file:   _vim/after/ftplugin/vim.vim
	new file:   _vim/after/ftplugin/zsh.vim
	new file:   _vim/swap/.Xmodmap.swp
	new file:   _vim/swap/report.swp
	new file:   _vimperatorrc
	new file:   _vimrc
	new file:   _xmobarrc
	new file:   _xmonad/xmonad-arm-linux
	new file:   _xmonad/xmonad.errors
	new file:   _xmonad/xmonad.hi
	new file:   _xmonad/xmonad.hs
	new file:   _xmonad/xmonad.o
	new file:   _zsh/auto-fu.zsh
	new file:   _zsh/history
	new file:   _zshrc
	deleted:    .tmux.conf
	deleted:    .vimperatorrc
	deleted:    .vimrc
	deleted:    .xmobarrc
	deleted:    .zshrc
	deleted:    xmonad.hs
	modified:   _zsh/history
	new file:   autolink.sh
	modified:   _zsh/history
	modified:   _zsh/history
	modified:   _zsh/history
	new file:   _xmonad/xmonad-x86_64-linux
	modified:   _xmonad/xmonad.errors
	modified:   _xmonad/xmonad.hi
	modified:   _xmonad/xmonad.hs
	modified:   _xmonad/xmonad.o
	modified:   _zsh/history
	new file:   _zsh/history.LOCK
	new file:   _Xdefaults
	modified:   _zsh/history
	modified:   autolink.sh
	new file:   newlink
	deleted:    _Xdefaults
	deleted:    _tmux.conf
	deleted:    _vim/.netrwhist
	deleted:    _vim/after/ftplugin/haskell.vim
	deleted:    _vim/after/ftplugin/ruby.vim
	deleted:    _vim/after/ftplugin/vim.vim
	deleted:    _vim/after/ftplugin/zsh.vim
	deleted:    _vim/swap/.Xmodmap.swp
	deleted:    _vim/swap/report.swp
	deleted:    _vimperatorrc
	deleted:    _vimrc
	deleted:    _xmobarrc
	deleted:    _xmonad/xmonad-arm-linux
	deleted:    _xmonad/xmonad-x86_64-linux
	deleted:    _xmonad/xmonad.errors
	deleted:    _xmonad/xmonad.hi
	deleted:    _xmonad/xmonad.hs
	deleted:    _xmonad/xmonad.o
	deleted:    _zsh/auto-fu.zsh
	deleted:    _zsh/history
	deleted:    _zsh/history.LOCK
	deleted:    _zshrc
	deleted:    autolink.sh
	deleted:    newlink

 Untracked files:
	home/
	new file:   home/.Xdefaults
	new file:   home/.tmux.conf
	new file:   home/.vim/.netrwhist
	new file:   home/.vim/after/ftplugin/haskell.vim
	new file:   home/.vim/after/ftplugin/ruby.vim
	new file:   home/.vim/after/ftplugin/vim.vim
	new file:   home/.vim/after/ftplugin/zsh.vim
	new file:   home/.vim/swap/.swp
	new file:   home/.vim/swap/arg.c.swp
	new file:   home/.vim/swap/report.swp
	new file:   home/.vimperatorrc
	new file:   home/.vimrc
	new file:   home/.xmobarrc
	new file:   home/.xmonad/xmonad-arm-linux
	new file:   home/.xmonad/xmonad-x86_64-linux
	new file:   home/.xmonad/xmonad.errors
	new file:   home/.xmonad/xmonad.hi
	new file:   home/.xmonad/xmonad.hs
	new file:   home/.xmonad/xmonad.o
	new file:   home/.zsh/auto-fu.zsh
	new file:   home/.zsh/history
	new file:   home/.zshrc
	new file:   home/.Xdefaults
	new file:   home/.tmux.conf
	new file:   home/.vim/.netrwhist
	new file:   home/.vim/after/ftplugin/haskell.vim
	new file:   home/.vim/after/ftplugin/ruby.vim
	new file:   home/.vim/after/ftplugin/vim.vim
	new file:   home/.vim/after/ftplugin/zsh.vim
	new file:   home/.vim/swap/.swp
	new file:   home/.vim/swap/arg.c.swp
	new file:   home/.vim/swap/report.swp
	new file:   home/.vimperatorrc
	new file:   home/.vimrc
	new file:   home/.xmobarrc
	new file:   home/.xmonad/xmonad-arm-linux
	new file:   home/.xmonad/xmonad-x86_64-linux
	new file:   home/.xmonad/xmonad.errors
	new file:   home/.xmonad/xmonad.hi
	new file:   home/.xmonad/xmonad.hs
	new file:   home/.xmonad/xmonad.o
	new file:   home/.zsh/auto-fu.zsh
	new file:   home/.zsh/history
	new file:   home/.zshrc
Merge remote-tracking branch 'origin/master'

Conflicts:
	home/.zshrc

	modified:   home/.zshrc
	modified:   home/.tmux.conf
	modified:   home/.vimrc
	modified:   home/.zsh/history
	modified:   home/.zshrc
	modified:   home/.zsh/history
	modified:   home/.zshrc
	home/.zsh-autosuggestions
	home/bin
	modified:   home/.Xdefaults
	modified:   home/.zsh/history
	home/.zsh-autosuggestions
	home/bin
	modified:   .zsh/history
	new file:   bin/mkcd.sh
	modified:   .zsh/history
	new file:   cat3.e
	new file:   spawn.c
	new file:   spawn.o
Merge branch 'reject'
	deleted:    home/.Xdefaults
	deleted:    home/.tmux.conf
	deleted:    home/.vim/.netrwhist
	deleted:    home/.vim/after/ftplugin/haskell.vim
	deleted:    home/.vim/after/ftplugin/ruby.vim
	deleted:    home/.vim/after/ftplugin/vim.vim
	deleted:    home/.vim/after/ftplugin/zsh.vim
	deleted:    home/.vim/swap/.swp
	deleted:    home/.vim/swap/arg.c.swp
	deleted:    home/.vim/swap/report.swp
	deleted:    home/.vimperatorrc
	deleted:    home/.vimrc
	deleted:    home/.xmobarrc
	deleted:    home/.xmonad/xmonad-arm-linux
	deleted:    home/.xmonad/xmonad-x86_64-linux
	deleted:    home/.xmonad/xmonad.errors
	deleted:    home/.xmonad/xmonad.hi
	deleted:    home/.xmonad/xmonad.hs
	deleted:    home/.xmonad/xmonad.o
	deleted:    home/.zsh/auto-fu.zsh
	deleted:    home/.zsh/history
	deleted:    home/.zshrc
	deleted:    home/bin/mkcd.sh