aboutsummaryrefslogtreecommitdiff
path: root/lib/merge.tcl
Commit message (Expand)AuthorAge
* git-gui: Fix switch statement in lib/merge.tclJohannes Sixt2008-10-10
* git-gui: Make Ctrl-T safe to use for conflicting files.Alexander Gavrilov2008-09-30
* git-gui: MERGE_RR lives in .git/ directly with newer Git versionsJohannes Schindelin2008-07-13
* git-gui: (i18n) Fix a bunch of still untranslated strings.Christian Stimming2008-02-03
* Mark strings for translation.Christian Stimming2007-09-02
* git-gui: Allow git-merge to use branch names in conflict markersShawn O. Pearce2007-08-20
* git-gui: Minor refactoring of merge command line in merge supportgitgui-0.8.0Shawn O. Pearce2007-07-29
* git-gui: Use progress bar while resetting/aborting filesShawn O. Pearce2007-07-29
* git-gui: Unify wording to say "to stage" instead of "to add"Christian Stimming2007-07-29
* git-gui: Remove usernames from absolute SSH urls during mergingShawn O. Pearce2007-07-25
* git-gui: Format tracking branch merges as though they were pullsShawn O. Pearce2007-07-25
* git-gui: Cleanup bindings within merge dialogShawn O. Pearce2007-07-25
* git-gui: Replace merge dialog with our revision picker widgetShawn O. Pearce2007-07-25
* git-gui: Completely remove support for creating octopus mergesShawn O. Pearce2007-07-19
* git-gui: Convert merge dialog to use class systemShawn O. Pearce2007-07-18
* git-gui: Always use absolute path to all git executablesShawn O. Pearce2007-07-09
* git-gui: Refactor our ui_status_value update techniqueShawn O. Pearce2007-07-08
* git-gui: Unlock the index when cancelling merge dialogShawn O. Pearce2007-07-04
* git-gui: Save geometry before the window layout is damagedShawn O. Pearce2007-06-11
* git-gui: Convert browser, console to "class" formatShawn O. Pearce2007-05-08
* git-gui: Allow shift-{k,j} to select a range of branches to mergeShawn O. Pearce2007-05-08
* git-gui: Use vi-like keys in merge dialoggitgui-0.7.0-rc1Shawn O. Pearce2007-05-07
* git-gui: Include commit id/subject in merge choicesShawn O. Pearce2007-05-07
* git-gui: Show all possible branches for mergeShawn O. Pearce2007-05-07
* git-gui: Move merge support into a namespaceShawn O. Pearce2007-05-07
* git-gui: Move console procs into their own namespaceShawn O. Pearce2007-05-07
* git-gui: Refactor into multiple files to save my sanityShawn O. Pearce2007-05-07
generated by cgit v1.2.1 (git 2.18.0) at 2025-01-09 19:46:51 +0000