41
40

Delete article

Deleted articles cannot be recovered.

Draft of this article would be also deleted.

Are you sure you want to delete this article?

More than 5 years have passed since last update.

1slide で理解するGit

Last updated at Posted at 2014-04-02

1slide

gitslide.PNG

setting

git diff/git mergeはツールの使用を推奨。ツールの設定を行い、下記のコマンドで実行する。

diff : git difftool -y --dir-diff
merge : git mergetool -y

difftool/mergetoolの設定
git config --global merge.tool vimdiff
標準ではkdiff3、tkdiff、meld、xxdiff、emerge、vimdiff、gvimdiff、ecmerge、opendiffが使用可能。
WinMergeはないのか、という場合こちら参照。
推奨されているP4Mergeの設定はこちら

WinMerge2.14.0.37では下記の設定で意図通り動作することを確認。

[diff]
    tool = WinMerge
    guitool = WinMerge
[difftool]
    keepBackup = false
[difftool "WinMerge"]
    cmd = \"C:/Program Files/WinMerge/WinMergeU.exe\" -e -u -x -wl -dl "base" -dr "mine" \"$LOCAL\" \"$REMOTE\"
[merge]
    tool = WinMerge
[mergetool]
    keepBackup = false
[mergetool "WinMerge"]
    cmd = \"C:/Program Files/WinMerge/WinMergeU.exe\" -r -e -u -wl -wm -dl "mine" -dm "branch" -dr "merged" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
41
40
0

Register as a new user and use Qiita more conveniently

  1. You get articles that match your needs
  2. You can efficiently read back useful information
  3. You can use dark theme
What you can do with signing up
41
40

Delete article

Deleted articles cannot be recovered.

Draft of this article would be also deleted.

Are you sure you want to delete this article?