0
0

Delete article

Deleted articles cannot be recovered.

Draft of this article would be also deleted.

Are you sure you want to delete this article?

Macで開発環境を快適に

Last updated at Posted at 2025-07-20

※ 随時更新します

Git関連

diffの改善

  • vscodeのdiffで確認する。下記コマンドで設定。
    git config --global diff.tool vscode
    git config --global difftool.vscode.cmd 'code --wait --diff "$LOCAL" "$REMOTE"'
    
  • 当初はfilemergeでやろうと下記をgitconfigに設定したが、エラーでうまくいかなかった。
    [diff]
        tool = opendiff
    [difftool "opendiff"]
        cmd = opendiff "$LOCAL" "$REMOTE" -merge "$MERGED"
    [merge]
        tool = opendiff
    [mergetool "opendiff"]
        cmd = opendiff "$LOCAL" "$REMOTE" -ancestor "$BASE" -merge "$MERGED"
        trustExitCode = true
    [alias]
        macdiff = difftool -y -d -t opendiff
        macmerge = mergetool -y -t opendiff
    
0
0
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
0
0

Delete article

Deleted articles cannot be recovered.

Draft of this article would be also deleted.

Are you sure you want to delete this article?