sdiff

Colored, side by side, inline git diff output in my terminal

|▌冷眼眸甩不掉的悲伤 提交于 2019-12-07 11:38:24
问题 Please note this question is not a duplicate of, but a followup to the question "How can I get a side-by-side diff when I do “git diff”?". This question seeks new information and the solution to a problem. Also, please note that I am seeking only solutions whose output is inline in the terminal like the default git diff is -- I don't want anything which opens an external gui diff program. Progress so far I have followed the suggestion from the SO question linked above and put the following

Colored, side by side, inline git diff output in my terminal

不问归期 提交于 2019-12-05 18:44:01
Please note this question is not a duplicate of, but a followup to the question "How can I get a side-by-side diff when I do “git diff”?" . This question seeks new information and the solution to a problem. Also, please note that I am seeking only solutions whose output is inline in the terminal like the default git diff is -- I don't want anything which opens an external gui diff program. Progress so far I have followed the suggestion from the SO question linked above and put the following executable on my path: #!/bin/bash # side-by-side diff with custom options: sdiff -w200 -l "$2" "$5" I