summaryrefslogtreecommitdiff
path: root/lib/diff.tcl
AgeCommit message (Expand)AuthorFilesLines
2019-10-04git-gui: support for diff3 conflict styleLibravatar Bert Wesarg1-1/+17
2019-10-03git-gui: use existing interface to query a path's attributeLibravatar Bert Wesarg1-14/+1
2019-09-24Merge branches 'js/msgfmt-on-windows', 'tz/fsf-address-update', 'jn/reproduci...Libravatar Pratyush Yadav1-0/+1
2019-08-29git-gui: allow undoing last revertLibravatar Pratyush Yadav1-4/+49
2019-08-26git-gui: return early when patch fails to applyLibravatar Pratyush Yadav1-0/+2
2019-08-26git-gui: allow reverting selected hunkLibravatar Pratyush Yadav1-5/+16
2019-08-26git-gui: allow reverting selected linesLibravatar Pratyush Yadav1-6/+14
2018-01-09git gui: fix staging a second line to a 1-line fileLibravatar Johannes Schindelin1-0/+1
2016-10-03git-gui: fix incorrect use of Tcl append commandLibravatar Vasco Almeida1-6/+5
2016-10-03git-gui: ensure the file in the diff pane is in the list of selected filesLibravatar Alex Riesen1-0/+3
2014-10-06git-gui: add configurable tab size to the diff viewLibravatar Michael Lutz1-1/+19
2014-06-13git-gui: show staged submodules regardless of ignore configLibravatar Jens Lehmann1-0/+3
2013-05-16git-gui: allow "\ No newline at end of file" for linewise stagingLibravatar Heiko Voigt1-2/+9
2011-11-05git-gui: add config value gui.diffopts for passing additional diff optionsLibravatar Tilman Vogel1-0/+1
2011-11-04git-gui: sort the numeric ansi codesLibravatar Pat Thoyts1-1/+1
2011-11-04git-gui: support underline style when parsing diff outputLibravatar Pat Thoyts1-1/+1
2011-01-28git-gui: handle meta diff header lines only in the header sectionLibravatar Bert Wesarg1-7/+2
2011-01-28git-gui: handle special content lines only in the diff header sectionLibravatar Bert Wesarg1-6/+9
2011-01-28git-gui: always reset the current tagLibravatar Bert Wesarg1-1/+2
2011-01-28git-gui: move 3way diff autodetect upLibravatar Bert Wesarg1-3/+4
2011-01-28git-gui: there is no "mode *" diff header lineLibravatar Bert Wesarg1-2/+1
2011-01-28git-gui: name also new symlinks soLibravatar Bert Wesarg1-3/+5
2011-01-28git-gui: handle index lines only in the diff headerLibravatar Bert Wesarg1-2/+2
2011-01-28git-gui: rework handling of diff headerLibravatar Bert Wesarg1-3/+15
2010-12-06git-gui: Fix use of hunk tag for non-hunk content.Libravatar Bert Wesarg1-7/+7
2010-12-06git-gui: Fix use of renamed tag.Libravatar Bert Wesarg1-4/+4
2010-11-19git-gui: respect conflict marker sizeLibravatar Bert Wesarg1-4/+22
2010-11-19git-gui: fix ANSI-color parsingLibravatar Bert Wesarg1-2/+10
2010-10-27git-gui: apply color information from git diff outputLibravatar Pat Thoyts1-1/+33
2010-07-30git-gui: use textconv filter for diff and blameLibravatar Clément Poulain1-1/+4
2010-01-23git-gui: Support applying a range of changes at onceLibravatar Jeff Epler1-101/+141
2010-01-23git-gui: Use git diff --submodule when availableLibravatar Jens Lehmann1-4/+13
2010-01-23git-gui: Fix applying a line when all following lines are deletionsLibravatar Jeff Epler1-0/+1
2009-08-26git-gui: Ensure submodule path is quoted properlyLibravatar Shawn O. Pearce1-2/+2
2009-08-26git-gui: fix diff for partially staged submodule changesLibravatar Jens Lehmann1-4/+6
2009-08-10git-gui: display summary when showing diff of a submoduleLibravatar Jens Lehmann1-2/+28
2009-02-08git-gui: Avoid an infinite rescan loop in handle_empty_diff.Libravatar Alexander Gavrilov1-0/+9
2008-11-16git-gui: Fix the after callback execution in rescan.Libravatar Alexander Gavrilov1-3/+3
2008-11-01git-gui: Do not munge conflict marker lines in a normal diffLibravatar Johannes Sixt1-1/+0
2008-10-10git-gui: Mark-up strings in show_{other,unmerged}_diff() for localizationLibravatar Johannes Sixt1-11/+11
2008-10-10git-gui: Show a round number of bytes of large untracked text filesLibravatar Johannes Sixt1-1/+1
2008-09-24git-gui: Reenable staging unmerged files by clicking the icon.Libravatar Alexander Gavrilov1-17/+35
2008-09-24git-gui: Allow forcing display encoding for diffs using a submenu.Libravatar Alexander Gavrilov1-0/+9
2008-09-24git-gui: Cleanup handling of the default encoding.Libravatar Alexander Gavrilov1-5/+6
2008-09-24git-gui: Use gitattribute "encoding" for file content displayLibravatar Shawn O. Pearce1-3/+6
2008-09-04Merge branch 'maint'Libravatar Shawn O. Pearce1-7/+11
2008-09-04git-gui: Fix diff parsing for lines starting with "--" or "++"Libravatar Shawn O. Pearce1-7/+11
2008-09-04git-gui: Show special diffs for complex conflict cases.Libravatar Alexander Gavrilov1-5/+89
2008-09-04git-gui: Reimplement and enhance auto-selection of diffs.Libravatar Alexander Gavrilov1-6/+12
2008-09-04git-gui: Support conflict states _U & UT.Libravatar Alexander Gavrilov1-1/+1