git/lib/diff.tcl, branch gitgui-0.20.0

git-gui: add configurable tab size to the diff view

2014-10-06T09:34:52Z

For Tk 8.5 the "wordprocessor" mode allows us to get a bit fancy for merge diffs and intend the tabs by one to compensate for the additional diff marker at the line start. The code is heavily based on how gitk handles tabs. Signed-off-by: Michael Lutz Signed-off-by: Pat Thoyts

git-gui: show staged submodules regardless of ignore config

2014-06-13T17:27:33Z

Currently setting submodule..ignore and/or diff.ignoreSubmodules to "all" suppresses all output of submodule changes for git-gui. This is really confusing, as even when the user chooses to record a new commit for an ignored submodule by adding it manually this change won't show up under "Staged Changes (Will Commit)". Fix that by using the '--ignore-submodules=dirty' option for both callers of "git diff-index --cached" when the underlying git version supports that option. Signed-off-by: Jens Lehmann Signed-off-by: Junio C Hamano Signed-off-by: Pat Thoyts

git-gui: allow "\ No newline at end of file" for linewise staging

2013-05-16T22:40:59Z

Counting of lines did not skip this line when generating the hunk header. Acked-by: Tobias Preuss Signed-off-by: Heiko Voigt Signed-off-by: Pat Thoyts

git-gui: add config value gui.diffopts for passing additional diff options

2011-11-05T00:38:01Z

Signed-off-by: Tilman Vogel Signed-off-by: Pat Thoyts

git-gui: sort the numeric ansi codes

2011-11-04T16:16:54Z

This ensures that underline does not conflict with inverse colors. Signed-off-by: Pat Thoyts

git-gui: support underline style when parsing diff output

2011-11-04T16:16:52Z

Suggested-by: Bert Wesarg Signed-off-by: Pat Thoyts

git-gui: handle meta diff header lines only in the header section

2011-01-28T09:01:17Z

Signed-off-by: Bert Wesarg Signed-off-by: Pat Thoyts

git-gui: handle special content lines only in the diff header section

2011-01-28T09:01:17Z

These two also stop the diff header. Signed-off-by: Bert Wesarg Signed-off-by: Pat Thoyts

git-gui: always reset the current tag

2011-01-28T09:01:17Z

Signed-off-by: Bert Wesarg Signed-off-by: Pat Thoyts

git-gui: move 3way diff autodetect up

2011-01-28T09:01:17Z

Signed-off-by: Bert Wesarg Signed-off-by: Pat Thoyts