aboutsummaryrefslogtreecommitdiffstats
path: root/git-gui/git-gui.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2024-07-02 09:59:02 -0700
committerJunio C Hamano <gitster@pobox.com>2024-07-02 09:59:02 -0700
commit2d97b4e2358aa528f9406b3ca96981fcf89b0d11 (patch)
tree76a676bb43358f80f27ab3c3d1010b87191388fa /git-gui/git-gui.sh
parentMerge branch 'ew/object-convert-leakfix' (diff)
parentdiff: allow --color-moved with --no-ext-diff (diff)
downloadgit-2d97b4e2358aa528f9406b3ca96981fcf89b0d11.tar.gz
git-2d97b4e2358aa528f9406b3ca96981fcf89b0d11.zip
Merge branch 'rs/diff-color-moved-w-no-ext-diff-fix'
"git diff --no-ext-diff" when diff.external is configured ignored the "--color-moved" option. * rs/diff-color-moved-w-no-ext-diff-fix: diff: allow --color-moved with --no-ext-diff
Diffstat (limited to 'git-gui/git-gui.sh')
0 files changed, 0 insertions, 0 deletions