asedeno.scripts.mit.edu Git - git.git/history

]> asedeno.scripts.mit.edu Git - git.git/history - lib/merge.tcl

2010-11-05	Junio C Hamano	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw
2010-09-15	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw
2010-08-02	Junio C Hamano	Merge git://repo.or.cz/git-gui into pt/git-gui	blob \| commitdiff \| raw
2010-02-08	Shawn O. Pearce	Merge branch 'maint'	blob \| commitdiff \| raw
2010-02-07	Junio C Hamano	Merge git://repo.or.cz/git-gui v1.7.0-rc2	blob \| commitdiff \| raw
2010-01-29	Shawn O. Pearce	Merge branch 'maint'	blob \| commitdiff \| raw
2010-01-28	Pat Thoyts	git-gui: use themed tk widgets with Tk 8.5	blob \| commitdiff \| raw
2010-01-24	Junio C Hamano	Merge branch 'maint' of git://git.spearce.org/git-gui...	blob \| commitdiff \| raw
2009-12-09	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw
2009-10-27	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw
2009-05-02	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw
2008-12-18	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw
2008-12-02	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw
2008-12-01	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw
2008-11-16	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw
2008-11-13	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw
2008-11-02	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw
2008-11-02	Junio C Hamano	Merge branch 'maint' of git://repo.or.cz/git-gui into maint	blob \| commitdiff \| raw
2008-10-10	Johannes Sixt	git-gui: Fix switch statement in lib/merge.tcl	blob \| commitdiff \| raw \| diff to current
2008-09-30	Alexander Gavrilov	git-gui: Make Ctrl-T safe to use for conflicting files.	blob \| commitdiff \| raw \| diff to current
2008-09-25	Shawn O. Pearce	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw
2008-09-07	Junio C Hamano	Merge updated git-gui and gitk that call each other	blob \| commitdiff \| raw
2008-09-06	Junio C Hamano	Merge branch 'maint' of git://repo.or.cz/git-gui into maint	blob \| commitdiff \| raw
2008-08-17	Junio C Hamano	Merge git-gui 0.11.0	blob \| commitdiff \| raw
2008-08-06	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw
2008-07-30	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw
2008-07-27	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw
2008-07-15	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw
2008-07-13	Johannes Schindelin	git-gui: MERGE_RR lives in .git/ directly with newer...	blob \| commitdiff \| raw \| diff to current
2008-07-06	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw
2008-05-27	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw
2008-05-15	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw
2008-04-05	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw
2008-04-02	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw
2008-03-16	Junio C Hamano	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw
2008-03-12	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw
2008-03-06	Junio C Hamano	Merge branch 'maint' of git://repo.or.cz/git-gui into maint	blob \| commitdiff \| raw
2008-03-05	Shawn O. Pearce	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-03-01	Junio C Hamano	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw
2008-03-01	Junio C Hamano	Merge branch 'maint' of git://repo.or.cz/git-gui into maint	blob \| commitdiff \| raw
2008-02-28	Shawn O. Pearce	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-02-23	Junio C Hamano	Merge branch 'maint' of git://repo.or.cz/git-gui into maint	blob \| commitdiff \| raw
2008-02-22	Shawn O. Pearce	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-02-21	Shawn O. Pearce	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-02-20	Shawn O. Pearce	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-02-17	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw
2008-02-13	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw
2008-02-12	Shawn O. Pearce	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-02-04	Christian Stimming	git-gui: (i18n) Fix a bunch of still untranslated strings.	blob \| commitdiff \| raw \| diff to current
2008-01-24	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw
2008-01-21	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw
2008-01-21	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw
2008-01-05	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw
2007-12-07	Junio C Hamano	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw
2007-11-21	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw
2007-10-23	Shawn O. Pearce	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-10-21	Shawn O. Pearce	Merge branch 'maint' of git://repo.or.cz/git-gui into maint	blob \| commitdiff \| raw
2007-10-21	Shawn O. Pearce	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-10-10	Shawn O. Pearce	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-10-03	Shawn O. Pearce	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-09-22	Shawn O. Pearce	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-09-20	Shawn O. Pearce	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-09-18	Junio C Hamano	Merge branch 'maint' of git://repo.or.cz/git-gui into maint	blob \| commitdiff \| raw
2007-09-17	Shawn O. Pearce	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-09-14	Shawn O. Pearce	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-09-13	Shawn O. Pearce	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-09-11	Shawn O. Pearce	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-09-10	Shawn O. Pearce	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-09-09	Shawn O. Pearce	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-09-04	Shawn O. Pearce	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-09-02	Christian Stimming	Mark strings for translation.	blob \| commitdiff \| raw \| diff to current
2007-08-27	Junio C Hamano	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw
2007-08-20	Shawn O. Pearce	git-gui: Allow git-merge to use branch names in conflic...	blob \| commitdiff \| raw \| diff to current
2007-08-19	Junio C Hamano	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw
2007-07-30	Junio C Hamano	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw
2007-07-30	Shawn O. Pearce	git-gui: Minor refactoring of merge command line in... gitgui-0.8.0	blob \| commitdiff \| raw \| diff to current
2007-07-29	Shawn O. Pearce	git-gui: Use progress bar while resetting/aborting files	blob \| commitdiff \| raw \| diff to current
2007-07-29	Christian Stimming	git-gui: Unify wording to say "to stage" instead of...	blob \| commitdiff \| raw \| diff to current
2007-07-25	Shawn O. Pearce	git-gui: Remove usernames from absolute SSH urls during...	blob \| commitdiff \| raw \| diff to current
2007-07-25	Shawn O. Pearce	git-gui: Format tracking branch merges as though they...	blob \| commitdiff \| raw \| diff to current
2007-07-25	Shawn O. Pearce	git-gui: Cleanup bindings within merge dialog	blob \| commitdiff \| raw \| diff to current
2007-07-25	Shawn O. Pearce	git-gui: Replace merge dialog with our revision picker...	blob \| commitdiff \| raw \| diff to current
2007-07-19	Shawn O. Pearce	git-gui: Completely remove support for creating octopus...	blob \| commitdiff \| raw \| diff to current
2007-07-18	Shawn O. Pearce	git-gui: Convert merge dialog to use class system	blob \| commitdiff \| raw \| diff to current
2007-07-12	Junio C Hamano	Merge commit 'git-gui/master'	blob \| commitdiff \| raw
2007-07-12	Junio C Hamano	Merge branch 'maint' of git://repo.or.cz/git-gui into maint	blob \| commitdiff \| raw
2007-07-12	Shawn O. Pearce	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-07-10	Shawn O. Pearce	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-07-09	Shawn O. Pearce	git-gui: Always use absolute path to all git executables	blob \| commitdiff \| raw \| diff to current
2007-07-09	Shawn O. Pearce	git-gui: Refactor our ui_status_value update technique	blob \| commitdiff \| raw \| diff to current
2007-07-04	Shawn O. Pearce	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-07-04	Shawn O. Pearce	git-gui: Unlock the index when cancelling merge dialog	blob \| commitdiff \| raw \| diff to current
2007-06-29	Junio C Hamano	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw
2007-06-29	Junio C Hamano	Merge branch 'maint' of git://repo.or.cz/git-gui into maint	blob \| commitdiff \| raw
2007-06-12	Junio C Hamano	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw
2007-06-12	Junio C Hamano	Merge branch 'maint' of git://repo.or.cz/git-gui into maint	blob \| commitdiff \| raw
2007-06-12	Shawn O. Pearce	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-06-12	Shawn O. Pearce	git-gui: Save geometry before the window layout is damaged	blob \| commitdiff \| raw \| diff to current
2007-06-11	Junio C Hamano	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw
2007-06-11	Junio C Hamano	Merge branch 'maint' of git://repo.or.cz/git-gui into maint	blob \| commitdiff \| raw
next

local clone of git.git

RSS Atom