git-gui: allow Ctrl+T to toggle multiple paths
[git/git.git] / lib / merge.tcl
2016-10-20 Pat ThoytsMerge branch 'os/preserve-author' into pu
2016-10-04 Pat ThoytsMerge branch 'dr/ru' into pu
2016-10-04 Pat Thoytsgit-gui: maintain backwards compatibility for merge...
2016-10-03 Pat ThoytsMerge branch 'va/i18n_2' into pu
2016-10-03 Vasco Almeidagit-gui: fix incorrect use of Tcl append command
2016-10-03 Pat ThoytsMerge branch 'pt/non-mouse-usage' into pu
2016-10-03 Pat ThoytsMerge branch 'pt/git4win-mods' into pu
2016-10-03 Pat ThoytsMerge branch 'patches' into pu
2016-10-03 Pat ThoytsMerge branch 'va/i18n' into pu
2016-10-03 Pat ThoytsMerge branch 'rs/use-modern-git-merge-syntax' into pu
2016-09-26 René Scharfegit-gui: stop using deprecated merge syntax
2011-03-25 Pat ThoytsMerge branch 'ss/git-gui-mergetool' gitgui-0.14.0
2011-02-13 Heiko Voigtgit-gui: always default to the last merged branch in...
2010-02-08 Shawn O. PearceMerge branch 'maint'
2010-01-29 Shawn O. PearceMerge branch 'maint'
2010-01-28 Pat Thoytsgit-gui: use themed tk widgets with Tk 8.5
2008-10-10 Johannes Sixtgit-gui: Fix switch statement in lib/merge.tcl
2008-09-30 Alexander Gavrilovgit-gui: Make Ctrl-T safe to use for conflicting files.
2008-07-13 Johannes Schindelingit-gui: MERGE_RR lives in .git/ directly with newer...
2008-03-05 Shawn O. PearceMerge branch 'maint'
2008-02-28 Shawn O. PearceMerge branch 'maint'
2008-02-22 Shawn O. PearceMerge branch 'maint'
2008-02-21 Shawn O. PearceMerge branch 'maint'
2008-02-20 Shawn O. PearceMerge branch 'maint'
2008-02-12 Shawn O. PearceMerge branch 'maint'
2008-02-04 Christian Stimminggit-gui: (i18n) Fix a bunch of still untranslated strings.
2007-10-23 Shawn O. PearceMerge branch 'maint'
2007-10-21 Shawn O. PearceMerge branch 'maint'
2007-10-10 Shawn O. PearceMerge branch 'maint'
2007-10-03 Shawn O. PearceMerge branch 'maint'
2007-09-22 Shawn O. PearceMerge branch 'maint'
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