Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also .

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
...
  • 3 commits
  • 2 files changed
  • 0 commit comments
  • 1 contributor
Showing with 9 additions and 1 deletion.
  1. +8 −0 .gitconfig
  2. +1 −1 .vimrc
View
8 .gitconfig
@@ -14,7 +14,15 @@
autocrlf = input
editor = vim
[merge]
+ keepBackup = false
tool = vimdiff
+[mergetool]
+ keepBackup = false
+[mergetool "p4merge"]
+ cmd = p4merge "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
+ keepTemporaries = false
+ trustExitCode = false
+ keepBackup = false
[alias]
st = status
br = branch
View
2 .vimrc
@@ -8,7 +8,7 @@ set vb t_vb= " ビープをならさない
set whichwrap=b,s,h,l,<,>,[,] " カーソルを行頭、行末で止まらないようにする
set showcmd " コマンドをステータス行に表示
set showmode " 現在のモードを表示
-set clipboard=unnamed " ヤンクした文字は、システムのクリップボードに入れる
+"set clipboard=unnamed " ヤンクした文字は、システムのクリップボードに入れる
set list " 不可視文字表示
set listchars=tab:__,trail:_,nbsp:_,extends:>,precedes:< " 不可視文字の表示形式

No commit comments for this range

Something went wrong with that request. Please try again.