summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2008-09-30git-gui: Make Ctrl-T safe to use for conflicting files.Libravatar Alexander Gavrilov4-6/+17
2008-09-30git-gui: Do not automatically stage file after merge tool finishesLibravatar Johannes Sixt1-9/+1
2008-09-26git-gui: Show/hide "Sign Off" based on nocommitmsg optionLibravatar Shawn O. Pearce1-2/+2
2008-09-26Merge branch 'maint'Libravatar Shawn O. Pearce1-1/+1
2008-09-26git-gui: Help identify aspell version on Windows tooLibravatar Gustaf Hendeby1-1/+1
2008-09-24git-gui: Reenable staging unmerged files by clicking the icon.Libravatar Alexander Gavrilov3-33/+70
2008-09-24git-gui: Support the encoding menu in gui blame.Libravatar Alexander Gavrilov1-0/+17
2008-09-24git-gui: Optimize encoding name resolution using a lookup table.Libravatar Alexander Gavrilov1-29/+53
2008-09-24git-gui: Allow forcing display encoding for diffs using a submenu.Libravatar Alexander Gavrilov3-2/+44
2008-09-24git-gui: Add a menu of available encodings.Libravatar Alexander Gavrilov2-4/+142
2008-09-24git-gui: Cleanup handling of the default encoding.Libravatar Alexander Gavrilov5-6/+46
2008-09-24git-gui: Assume `blame --incremental` output is in UTF-8Libravatar Shawn O. Pearce1-7/+1
2008-09-24git-gui: Use gitattribute "encoding" for file content displayLibravatar Shawn O. Pearce4-4/+26
2008-09-24git-gui: Add support for calling out to the prepare-commit-msg hookLibravatar Joshua Williams1-0/+65
2008-09-24git-gui: Hide commit related UI during citool --nocommitLibravatar Shawn O. Pearce1-48/+56
2008-09-24git-gui: Add more integration options to citool.Libravatar Alexander Gavrilov2-6/+83
2008-09-13git-gui: Updated German translation.Libravatar Christian Stimming1-21/+172
2008-09-12git-gui: I18n fix sentence parts into full sentences for translation again.Libravatar Christian Stimming1-6/+6
2008-09-12git-gui: Restore ability to Stage Working Copy for conflicts.Libravatar Alexander Gavrilov2-0/+11
2008-09-12git-gui: Fix Blame Parent & Context for working copy lines.Libravatar Alexander Gavrilov2-3/+29
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: Make F5 reselect a diff, if an untracked file is selected.Libravatar Alexander Gavrilov1-9/+35
2008-09-04git-gui: Reimplement and enhance auto-selection of diffs.Libravatar Alexander Gavrilov3-39/+109
2008-09-04git-gui: Support conflict states _U & UT.Libravatar Alexander Gavrilov4-3/+7
2008-09-04git-gui: Support more merge tools.Libravatar Alexander Gavrilov1-0/+27
2008-09-04git-gui: Don't allow staging files with conflicts.Libravatar Alexander Gavrilov1-0/+8
2008-09-04git-gui: Support calling merge tools.Libravatar Alexander Gavrilov3-0/+260
2008-09-04git-gui: Support resolving conflicts via the diff context menu.Libravatar Alexander Gavrilov2-60/+190
2008-09-04git-gui: Mark forgotten strings for translation.Libravatar Christian Stimming1-2/+2
2008-09-01Merge branch 'maint'Libravatar Shawn O. Pearce4-5/+5
2008-09-01git-gui: Fix string escaping in po2msg.shLibravatar Alexander Gavrilov1-2/+2
2008-09-01git gui: show diffs with a minimum of 1 context lineLibravatar Clemens Buchacher3-3/+3
2008-08-24git-gui: Allow specifying an initial line for git gui blame.Libravatar Alexander Gavrilov3-5/+14
2008-08-24git-gui: Better positioning in Blame Parent CommitLibravatar Alexander Gavrilov1-4/+61
2008-08-24git-gui: Support passing blame to a parent commit.Libravatar Alexander Gavrilov1-10/+38
2008-08-24git-gui: Support starting gitk from Gui BlameLibravatar Alexander Gavrilov3-2/+55
2008-08-24git-gui: Teach git gui about file type changesLibravatar Gustaf Hendeby3-1/+26
2008-08-12git-gui: update all remaining translations to French.Libravatar Alexandre Bourget1-254/+299
2008-08-12git-gui: Update french translationLibravatar Alexandre Bourget1-126/+127
2008-08-10git-gui 0.11Libravatar Shawn O. Pearce1-1/+1
2008-08-04git-gui: Adapt discovery of oguilib to execdir 'libexec/git-core'Libravatar Johannes Sixt1-1/+5
2008-08-03git-gui: add a part about format strings in po/READMELibravatar Michele Ballabio1-6/+11
2008-08-03git-gui: update po/it.poLibravatar Michele Ballabio1-246/+284
2008-08-03git-gui: update Japanese translationLibravatar しらいしななこ1-246/+281
2008-08-02git-gui: Update swedish translation.Libravatar Mikael Magnusson1-232/+283
2008-08-02git-gui: Update git-gui.pot for 0.11 nearing releaseLibravatar Shawn O. Pearce1-236/+277
2008-08-02git-gui: Update German translationLibravatar Christian Stimming1-32/+70
2008-07-29git-gui (Windows): Change wrapper to execdir 'libexec/git-core'Libravatar Steffen Prohaska1-4/+7