Andrew's git - gitweb.git/history

[gitweb.git] / lib / merge.tcl

2016-10-03	Merge branch 'pt/git4win-mods' into pu	blob \| diff \| raw
2016-10-03	Merge branch 'patches' into pu	blob \| diff \| raw
2016-10-03	Merge branch 'va/i18n' into pu	blob \| diff \| raw
2016-10-03	Merge branch 'rs/use-modern-git-merge-syntax' into pu	blob \| diff \| raw
2016-09-26	git-gui: stop using deprecated merge syntax	blob \| diff \| raw
2011-03-25	Merge branch 'ss/git-gui-mergetool' gitgui-0.14.0	blob \| diff \| raw \| diff to current
2011-02-13	git-gui: always default to the last merged branch in...	blob \| diff \| raw \| diff to current
2010-02-08	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2010-01-29	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2010-01-28	git-gui: use themed tk widgets with Tk 8.5	blob \| diff \| raw \| diff to current
2008-10-10	git-gui: Fix switch statement in lib/merge.tcl	blob \| diff \| raw \| diff to current
2008-09-30	git-gui: Make Ctrl-T safe to use for conflicting files.	blob \| diff \| raw \| diff to current
2008-07-13	git-gui: MERGE_RR lives in .git/ directly with newer...	blob \| diff \| raw \| diff to current
2008-03-05	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-02-28	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-02-22	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-02-21	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-02-20	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-02-12	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-02-04	git-gui: (i18n) Fix a bunch of still untranslated strings.	blob \| diff \| raw \| diff to current
2007-10-23	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-10-21	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-10-10	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-10-03	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-09-22	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-09-20	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-09-17	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-09-14	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-09-13	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-09-11	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-09-10	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-09-09	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-09-04	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-09-02	Mark strings for translation.	blob \| diff \| raw \| diff to current
2007-08-20	git-gui: Allow git-merge to use branch names in conflic...	blob \| diff \| raw \| diff to current
2007-07-30	git-gui: Minor refactoring of merge command line in... gitgui-0.8.0	blob \| diff \| raw \| diff to current
2007-07-29	git-gui: Use progress bar while resetting/aborting...	blob \| diff \| raw \| diff to current
2007-07-29	git-gui: Unify wording to say "to stage" instead of...	blob \| diff \| raw \| diff to current
2007-07-25	git-gui: Remove usernames from absolute SSH urls during...	blob \| diff \| raw \| diff to current
2007-07-25	git-gui: Format tracking branch merges as though they...	blob \| diff \| raw \| diff to current
2007-07-25	git-gui: Cleanup bindings within merge dialog	blob \| diff \| raw \| diff to current
2007-07-25	git-gui: Replace merge dialog with our revision picker...	blob \| diff \| raw \| diff to current
2007-07-19	git-gui: Completely remove support for creating octopus...	blob \| diff \| raw \| diff to current
2007-07-18	git-gui: Convert merge dialog to use class system	blob \| diff \| raw \| diff to current
2007-07-12	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-07-10	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-07-09	git-gui: Always use absolute path to all git executables	blob \| diff \| raw \| diff to current
2007-07-09	git-gui: Refactor our ui_status_value update technique	blob \| diff \| raw \| diff to current
2007-07-04	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-07-04	git-gui: Unlock the index when cancelling merge dialog	blob \| diff \| raw \| diff to current
2007-06-12	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-06-12	git-gui: Save geometry before the window layout is...	blob \| diff \| raw \| diff to current
2007-05-09	git-gui: Convert browser, console to "class" format	blob \| diff \| raw \| diff to current
2007-05-09	git-gui: Allow shift-{k,j} to select a range of branche...	blob \| diff \| raw \| diff to current
2007-05-08	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-05-08	git-gui: Use vi-like keys in merge dialog gitgui-0.7.0-rc1	blob \| diff \| raw \| diff to current
2007-05-08	git-gui: Include commit id/subject in merge choices	blob \| diff \| raw \| diff to current
2007-05-08	git-gui: Show all possible branches for merge	blob \| diff \| raw \| diff to current
2007-05-08	git-gui: Move merge support into a namespace	blob \| diff \| raw \| diff to current
2007-05-08	git-gui: Move console procs into their own namespace	blob \| diff \| raw \| diff to current
2007-05-08	git-gui: Refactor into multiple files to save my sanity	blob \| diff \| raw \| diff to current