git-gui: Fix missing i18n markup in push/fetch windows
[git] / lib / merge.tcl
2007-09-20  Shawn O. PearceMerge branch 'maint'
2007-09-17  Shawn O. PearceMerge branch 'maint'
2007-09-14  Shawn O. PearceMerge branch 'maint'
2007-09-13  Shawn O. PearceMerge branch 'maint'
2007-09-11  Shawn O. PearceMerge branch 'maint'
2007-09-10  Shawn O. PearceMerge branch 'maint'
2007-09-09  Shawn O. PearceMerge branch 'maint'
2007-09-04  Shawn O. PearceMerge branch 'maint'
2007-09-02  Christian StimmingMark strings for translation.
2007-08-20  Shawn O. Pearcegit-gui: Allow git-merge to use branch names in conflic...
2007-07-30  Shawn O. Pearcegit-gui: Minor refactoring of merge command line in... gitgui-0.8.0
2007-07-29  Shawn O. Pearcegit-gui: Use progress bar while resetting/aborting...
2007-07-29  Christian Stimminggit-gui: Unify wording to say "to stage" instead of...
2007-07-25  Shawn O. Pearcegit-gui: Remove usernames from absolute SSH urls during...
2007-07-25  Shawn O. Pearcegit-gui: Format tracking branch merges as though they...
2007-07-25  Shawn O. Pearcegit-gui: Cleanup bindings within merge dialog
2007-07-25  Shawn O. Pearcegit-gui: Replace merge dialog with our revision picker...
2007-07-19  Shawn O. Pearcegit-gui: Completely remove support for creating octopus...
2007-07-18  Shawn O. Pearcegit-gui: Convert merge dialog to use class system
2007-07-12  Shawn O. PearceMerge branch 'maint'
2007-07-10  Shawn O. PearceMerge branch 'maint'
2007-07-09  Shawn O. Pearcegit-gui: Always use absolute path to all git executables
2007-07-09  Shawn O. Pearcegit-gui: Refactor our ui_status_value update technique
2007-07-04  Shawn O. PearceMerge branch 'maint'
2007-07-04  Shawn O. Pearcegit-gui: Unlock the index when cancelling merge dialog
2007-06-12  Shawn O. PearceMerge branch 'maint'
2007-06-12  Shawn O. Pearcegit-gui: Save geometry before the window layout is...
2007-05-09  Shawn O. Pearcegit-gui: Convert browser, console to "class" format
2007-05-09  Shawn O. Pearcegit-gui: Allow shift-{k,j} to select a range of branche...
2007-05-08  Shawn O. PearceMerge branch 'maint'
2007-05-08  Shawn O. Pearcegit-gui: Use vi-like keys in merge dialog gitgui-0.7.0-rc1
2007-05-08  Shawn O. Pearcegit-gui: Include commit id/subject in merge choices
2007-05-08  Shawn O. Pearcegit-gui: Show all possible branches for merge
2007-05-08  Shawn O. Pearcegit-gui: Move merge support into a namespace
2007-05-08  Shawn O. Pearcegit-gui: Move console procs into their own namespace
2007-05-08  Shawn O. Pearcegit-gui: Refactor into multiple files to save my sanity