summaryrefslogtreecommitdiff
path: root/lib/merge.tcl
AgeCommit message (Expand)AuthorFilesLines
2010-01-27git-gui: use themed tk widgets with Tk 8.5Libravatar Pat Thoyts1-7/+7
2008-10-10git-gui: Fix switch statement in lib/merge.tclLibravatar Johannes Sixt1-1/+1
2008-09-30git-gui: Make Ctrl-T safe to use for conflicting files.Libravatar Alexander Gavrilov1-0/+1
2008-07-13git-gui: MERGE_RR lives in .git/ directly with newer Git versionsLibravatar Johannes Schindelin1-0/+1
2008-02-03git-gui: (i18n) Fix a bunch of still untranslated strings.Libravatar Christian Stimming1-3/+2
2007-09-02Mark strings for translation.Libravatar Christian Stimming1-30/+30
2007-08-20git-gui: Allow git-merge to use branch names in conflict markersLibravatar Shawn O. Pearce1-1/+1
2007-07-29git-gui: Minor refactoring of merge command line in merge supportLibravatar Shawn O. Pearce1-3/+3
2007-07-29git-gui: Use progress bar while resetting/aborting filesLibravatar Shawn O. Pearce1-4/+12
2007-07-29git-gui: Unify wording to say "to stage" instead of "to add"Libravatar Christian Stimming1-7/+11
2007-07-25git-gui: Remove usernames from absolute SSH urls during mergingLibravatar Shawn O. Pearce1-0/+3
2007-07-25git-gui: Format tracking branch merges as though they were pullsLibravatar Shawn O. Pearce1-4/+28
2007-07-25git-gui: Cleanup bindings within merge dialogLibravatar Shawn O. Pearce1-5/+9
2007-07-25git-gui: Replace merge dialog with our revision picker widgetLibravatar Shawn O. Pearce1-70/+11
2007-07-19git-gui: Completely remove support for creating octopus mergesLibravatar Shawn O. Pearce1-68/+17
2007-07-18git-gui: Convert merge dialog to use class systemLibravatar Shawn O. Pearce1-41/+65
2007-07-09git-gui: Always use absolute path to all git executablesLibravatar Shawn O. Pearce1-8/+10
2007-07-08git-gui: Refactor our ui_status_value update techniqueLibravatar Shawn O. Pearce1-7/+7
2007-07-04git-gui: Unlock the index when cancelling merge dialogLibravatar Shawn O. Pearce1-1/+3
2007-06-11git-gui: Save geometry before the window layout is damagedLibravatar Shawn O. Pearce1-2/+3
2007-05-08git-gui: Convert browser, console to "class" formatLibravatar Shawn O. Pearce1-1/+2
2007-05-08git-gui: Allow shift-{k,j} to select a range of branches to mergeLibravatar Shawn O. Pearce1-0/+2
2007-05-07git-gui: Use vi-like keys in merge dialogLibravatar Shawn O. Pearce1-6/+14
2007-05-07git-gui: Include commit id/subject in merge choicesLibravatar Shawn O. Pearce1-45/+54
2007-05-07git-gui: Show all possible branches for mergeLibravatar Shawn O. Pearce1-7/+13
2007-05-07git-gui: Move merge support into a namespaceLibravatar Shawn O. Pearce1-13/+18
2007-05-07git-gui: Move console procs into their own namespaceLibravatar Shawn O. Pearce1-3/+3
2007-05-07git-gui: Refactor into multiple files to save my sanityLibravatar Shawn O. Pearce1-0/+281
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 03:53:32 +0000