]> asedeno.scripts.mit.edu Git - git.git/history - lib/mergetool.tcl
projects / git.git / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
Merge branch 'maint'
[git.git] / lib / mergetool.tcl
2010-11-05 Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui blob | commitdiff | raw
2010-09-15 Junio C HamanoMerge git://repo.or.cz/git-gui blob | commitdiff | raw
2010-08-02 Junio C HamanoMerge git://repo.or.cz/git-gui into pt/git-gui blob | commitdiff | raw
2010-02-07 Junio C HamanoMerge git://repo.or.cz/git-gui v1.7.0-rc2 blob | commitdiff | raw
2010-01-24 Junio C HamanoMerge branch 'maint' of git://git.spearce.org/git-gui... blob | commitdiff | raw
2009-12-09 Junio C HamanoMerge git://repo.or.cz/git-gui blob | commitdiff | raw
2009-10-27 Junio C HamanoMerge git://repo.or.cz/git-gui blob | commitdiff | raw
2009-05-02 Junio C HamanoMerge git://repo.or.cz/git-gui blob | commitdiff | raw
2009-04-08 Shawn O. PearceMerge branch 'maint' blob | commitdiff | raw
2009-04-08 Ferry Hubertsgit-gui: Ensure consistent usage of mergetool.keepBackup blob | commitdiff | raw
2009-03-20 Shawn O. PearceMerge branch 'maint' blob | commitdiff | raw | diff to current
2009-03-20 Jens Lehmanngit-gui: Fix merge conflict display error when filename... blob | commitdiff | raw | diff to current
2008-12-18 Junio C HamanoMerge git://repo.or.cz/git-gui blob | commitdiff | raw
2008-12-02 Junio C HamanoMerge git://repo.or.cz/git-gui blob | commitdiff | raw
2008-12-01 Junio C HamanoMerge git://repo.or.cz/git-gui blob | commitdiff | raw
2008-11-16 Junio C HamanoMerge git://repo.or.cz/git-gui blob | commitdiff | raw
2008-11-13 Junio C HamanoMerge git://repo.or.cz/git-gui blob | commitdiff | raw
2008-11-02 Junio C HamanoMerge git://repo.or.cz/git-gui blob | commitdiff | raw
2008-09-30 Alexander Gavrilovgit-gui: Make Ctrl-T safe to use for conflicting files. blob | commitdiff | raw | diff to current
2008-09-30 Johannes Sixtgit-gui: Do not automatically stage file after merge... blob | commitdiff | raw | diff to current
2008-09-26 Shawn O. PearceMerge branch 'maint' blob | commitdiff | raw | diff to current
2008-09-25 Shawn O. PearceMerge git://repo.or.cz/git-gui blob | commitdiff | raw
2008-09-24 Alexander Gavrilovgit-gui: Reenable staging unmerged files by clicking... blob | commitdiff | raw | diff to current
2008-09-12 Christian Stimminggit-gui: I18n fix sentence parts into full sentences... blob | commitdiff | raw | diff to current
2008-09-12 Alexander Gavrilovgit-gui: Restore ability to Stage Working Copy for... blob | commitdiff | raw | diff to current
2008-09-07 Junio C HamanoMerge updated git-gui and gitk that call each other blob | commitdiff | raw
2008-09-05 Shawn O. PearceMerge branch 'maint' blob | commitdiff | raw | diff to current
2008-09-05 Alexander Gavrilovgit-gui: Reimplement and enhance auto-selection of diffs. blob | commitdiff | raw | diff to current
2008-09-05 Alexander Gavrilovgit-gui: Support more merge tools. blob | commitdiff | raw | diff to current
2008-09-05 Alexander Gavrilovgit-gui: Support calling merge tools. blob | commitdiff | raw | diff to current
2008-09-05 Alexander Gavrilovgit-gui: Support resolving conflicts via the diff conte... blob | commitdiff | raw | diff to current
local clone of git.git