rwxr-xr-x 1 dspitzer admin 34B Aug 13 13:09 /usr/local/bin/fooĪnd I configured it in my. But git difftool is not piped through less.Īs suggested by zrzka's comment, I created /usr/local/bin/foo: ✗ cat /usr/local/bin/foo gitconfig to open up p4merge (on Mac) when diffing files with git. git branch and git diff both stop after one page and h brings up "SUMMARY OF LESS COMMANDS". Just in case it's related, I don't know why all git commands I run in iTerm (or Terminal) are piped through less. The following tools are valid, but not currently available: 'git difftool -tool=' may be set to one of the following:ībdiff.cmd /usr/local/bin/bbdiff -wait -resume $LOCAL $REMOTE Using a command like less would be more suitable for a CLI-based experience. Responding to zrzka's third comment: ✗ git difftool -tool-help Responding to zrzka's second comment: ✗ git config -l | fgrep diffĭ=/usr/local/bin/bbdiff -wait -resume $LOCAL $REMOTE hast less konfiguriert, um einige Zeilen vor dem Spiel anzuzeigen mit -jump-targetN, das ist ziemlich ntzlich. Update: (with answers to questions in the comments) Eine andere Mglichkeit wre, das gesamte Diff anzuzeigen und die Ausgabe mit dem normalen zu durchsuchen less Befehle (Typ / und dann das Muster). Note I'm using macOS 10.15.6 with its default zsh and git version 2.28.0.
How do I figure out why bbdiff isn't being invoked? color 'diff' old red strike new green italic git config italic.
gitconfig, I setup my ~/.gitconfig to contain the following: Ĭmd = /usr/local/bin/bbdiff -wait -resume "$LOCAL" "$REMOTE"īut when I run git difftool or git difftool somefile.ext, I just get the diff dumped to stdout (in color).
After reading through Configuring diff tool with.
0 kommentar(er)
