summaryrefslogtreecommitdiff
path: root/lib/diff.tcl
AgeCommit message (Expand)AuthorFilesLines
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
2008-09-01git gui: show diffs with a minimum of 1 context lineLibravatar Clemens Buchacher1-1/+1
2008-07-27git-gui: Preserve scroll position on reshow_diff.Libravatar Alexander Gavrilov1-4/+14
2008-07-26git-gui: "Stage Line": Treat independent changes in adjacent lines betterLibravatar Johannes Sixt1-3/+58
2008-07-26git-gui: Fix "Stage/Unstage Line" with one line of context.Libravatar Johannes Sixt1-0/+3
2008-07-02git-gui: Implement "Stage/Unstage Line"Libravatar Johannes Sixt1-0/+87
2008-01-16git-gui: Refresh file status description after hunk applicationLibravatar Shawn O. Pearce1-0/+2
2007-12-14git-gui: Handle file mode changes (644->755) in diff viewerLibravatar Shawn O. Pearce1-0/+1
2007-09-14git-gui: Paper bag fix missing translated stringsLibravatar Shawn O. Pearce1-2/+2
2007-09-13git-gui: add some strings to translationLibravatar Michele Ballabio1-4/+4
2007-09-09Merge branch 'maint'Libravatar Shawn O. Pearce1-6/+30
2007-09-09git-gui: Assume untracked directories are Git submodulesLibravatar Shawn O. Pearce1-3/+18
2007-09-09git-gui: handle "deleted symlink" diff markerLibravatar Michele Ballabio1-0/+1
2007-09-09git-gui: show unstaged symlinks in diff viewerLibravatar Michele Ballabio1-5/+10
2007-09-02Mark strings for translation.Libravatar Christian Stimming1-8/+8
2007-07-17git-gui: Always disable the Tcl EOF character when readingLibravatar Shawn O. Pearce1-0/+1
2007-07-09git-gui: Always use absolute path to all git executablesLibravatar Shawn O. Pearce1-4/+4
2007-07-08git-gui: Refactor our ui_status_value update techniqueLibravatar Shawn O. Pearce1-9/+9
2007-05-31git-gui: Allow as few as 0 lines of diff contextLibravatar Shawn O. Pearce1-1/+1
2007-05-07git-gui: Refactor into multiple files to save my sanityLibravatar Shawn O. Pearce1-0/+336