projects / git / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
The second batch
[git] / lib / merge.tcl
2021-03-04  Junio C HamanoMerge https://github.com/prati0100/git-gui blob | commitdiff | raw
2021-03-01  Junio C HamanoMerge https://github.com/prati0100/git-gui blob | commitdiff | raw
2020-12-18  Junio C HamanoMerge https://github.com/prati0100/git-gui blob | commitdiff | raw
2020-10-17  Junio C HamanoMerge https://github.com/prati0100/git-gui blob | commitdiff | raw
2020-07-20  Junio C HamanoMerge https://github.com/prati0100/git-gui into master blob | commitdiff | raw
2020-05-21  Junio C HamanoMerge https://github.com/prati0100/git-gui blob | commitdiff | raw
2020-03-19  Junio C HamanoMerge https://github.com/prati0100/git-gui blob | commitdiff | raw
2020-03-19  Pratyush YadavMerge branch 'py/remove-tcloo' blob | commitdiff | raw
2020-02-18  Pratyush YadavMerge branch 'py/missing-bracket' blob | commitdiff | raw
2020-02-17  Pratyush Yadavgit-gui: add missing close bracket blob | commitdiff | raw
2020-01-08  Junio C HamanoMerge https://github.com/prati0100/git-gui blob | commitdiff | raw
2019-12-05  Pratyush YadavMerge branch 'jg/revert-untracked' blob | commitdiff | raw | diff to current
2019-12-05  Jonathan Gilbertgit-gui: update status bar to track operations blob | commitdiff | raw | diff to current
2019-11-04  Junio C HamanoMerge https://github.com/prati0100/git-gui blob | commitdiff | raw
2019-09-18  Junio C HamanoMerge branch 'master' of https://github.com/prati0100... blob | commitdiff | raw
2019-08-07  Junio C HamanoMerge branch 'py/call-do-quit-before-exit' of github... blob | commitdiff | raw
2018-03-06  Junio C HamanoMerge branch 'cb/ttk-style' of git-gui into cb/git... blob | commitdiff | raw
2018-03-02  Junio C HamanoMerge branch 'bb/ssh-key-files' of git-gui into bb... blob | commitdiff | raw
2018-03-02  Junio C HamanoMerge branch 'bp/bind-kp-enter' of git-gui into bp... blob | commitdiff | raw
2018-01-09  Junio C HamanoMerge branch 'js/misc-git-gui-stuff' of ../git-gui blob | commitdiff | raw
2017-12-05  Junio C HamanoMerge branch 'ls/no-double-utf8-author-name' of ..... blob | commitdiff | raw
2017-11-22  Junio C HamanoMerge branch 'jn/reproducible-build' of ../git-gui... blob | commitdiff | raw
2017-11-09  Junio C HamanoMerge branch 'tz/fsf-address-update' of ../git-gui... blob | commitdiff | raw
2017-07-25  Junio C HamanoMerge branch 'js/msgfmt-on-windows' of ../git-gui into... blob | commitdiff | raw
2016-10-20  Junio C HamanoMerge tag 'gitgui-0.21.0' of git://repo.or.cz/git-gui blob | commitdiff | raw
2016-10-20  Pat ThoytsMerge branch 'os/preserve-author' into pu blob | commitdiff | raw | diff to current
2016-10-04  Pat ThoytsMerge branch 'dr/ru' into pu blob | commitdiff | raw | diff to current
2016-10-04  Pat Thoytsgit-gui: maintain backwards compatibility for merge... blob | commitdiff | raw | diff to current
2016-10-03  Pat ThoytsMerge branch 'va/i18n_2' into pu blob | commitdiff | raw | diff to current
2016-10-03  Vasco Almeidagit-gui: fix incorrect use of Tcl append command blob | commitdiff | raw | diff to current
2016-10-03  Pat ThoytsMerge branch 'pt/non-mouse-usage' into pu blob | commitdiff | raw | diff to current
2016-10-03  Pat ThoytsMerge branch 'pt/git4win-mods' into pu blob | commitdiff | raw | diff to current
2016-10-03  Pat ThoytsMerge branch 'patches' into pu blob | commitdiff | raw | diff to current
2016-10-03  Pat ThoytsMerge branch 'va/i18n' into pu blob | commitdiff | raw | diff to current
2016-10-03  Pat ThoytsMerge branch 'rs/use-modern-git-merge-syntax' into pu blob | commitdiff | raw | diff to current
2016-09-26  Junio C HamanoMerge branch 'va/i18n' of ../git-gui into va/git-gui... blob | commitdiff | raw
2016-09-26  Junio C HamanoMerge branch 'rs/use-modern-git-merge-syntax' of git... blob | commitdiff | raw
2016-09-26  René Scharfegit-gui: stop using deprecated merge syntax blob | commitdiff | raw | diff to current
2016-09-11  Junio C HamanoMerge branch 'js/commit-gpgsign' of ../git-gui into... blob | commitdiff | raw
2016-09-07  Junio C HamanoMerge branch 'sy/i18n' of git-gui blob | commitdiff | raw
2015-04-19  Junio C HamanoMerge tag 'gitgui-0.20.0' of repo.or.cz/r/git-gui blob | commitdiff | raw
2014-06-26  Junio C HamanoMerge git://repo.or.cz/git-gui blob | commitdiff | raw
2014-05-19  Junio C HamanoMerge branch 'jl/use-vsatisfy-correctly-for-2.0' blob | commitdiff | raw
2014-01-21  Junio C HamanoMerge tag 'gitgui-0.19.0' of repo.or.cz/r/git-gui blob | commitdiff | raw
2013-12-09  Junio C HamanoMerge git://repo.or.cz/git-gui blob | commitdiff | raw
2013-06-17  Junio C HamanoMerge tag 'gitgui-0.18.0' of git://repo.or.cz/git-gui blob | commitdiff | raw
2012-10-17  Junio C HamanoMerge tag 'gitgui-0.17.0' of git://repo.or.cz/git-gui blob | commitdiff | raw
2011-12-14  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui blob | commitdiff | raw
2011-10-16  Junio C HamanoMerge git://repo.or.cz/git-gui blob | commitdiff | raw
2011-03-26  Junio C HamanoMerge git-gui 0.14.0 blob | commitdiff | raw
2011-03-25  Pat ThoytsMerge branch 'ss/git-gui-mergetool' gitgui-0.14.0 blob | commitdiff | raw | diff to current
2011-02-13  Heiko Voigtgit-gui: always default to the last merged branch in... blob | commitdiff | raw | diff to current
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-08  Shawn O. PearceMerge branch 'maint' blob | commitdiff | raw | diff to current
2010-02-07  Junio C HamanoMerge git://repo.or.cz/git-gui v1.7.0-rc2 blob | commitdiff | raw
2010-01-29  Shawn O. PearceMerge branch 'maint' blob | commitdiff | raw | diff to current
2010-01-28  Pat Thoytsgit-gui: use themed tk widgets with Tk 8.5 blob | commitdiff | raw | diff to current
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
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-11-02  Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into... blob | commitdiff | raw
2008-10-10  Johannes Sixtgit-gui: Fix switch statement in lib/merge.tcl blob | commitdiff | raw | diff to current
2008-09-30  Alexander Gavrilovgit-gui: Make Ctrl-T safe to use for conflicting files. blob | commitdiff | raw | diff to current
2008-09-25  Shawn O. PearceMerge git://repo.or.cz/git-gui blob | commitdiff | raw
2008-09-07  Junio C HamanoMerge updated git-gui and gitk that call each other blob | commitdiff | raw
2008-09-06  Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into... blob | commitdiff | raw
2008-08-17  Junio C HamanoMerge git-gui 0.11.0 blob | commitdiff | raw
2008-08-06  Junio C HamanoMerge git://repo.or.cz/git-gui blob | commitdiff | raw
2008-07-30  Junio C HamanoMerge git://repo.or.cz/git-gui blob | commitdiff | raw
2008-07-27  Junio C HamanoMerge git://repo.or.cz/git-gui blob | commitdiff | raw
2008-07-15  Junio C HamanoMerge git://repo.or.cz/git-gui blob | commitdiff | raw
2008-07-13  Johannes Schindelingit-gui: MERGE_RR lives in .git/ directly with newer... blob | commitdiff | raw | diff to current
2008-07-06  Junio C HamanoMerge git://repo.or.cz/git-gui blob | commitdiff | raw
2008-05-27  Junio C HamanoMerge git://repo.or.cz/git-gui blob | commitdiff | raw
2008-05-15  Junio C HamanoMerge git://repo.or.cz/git-gui blob | commitdiff | raw
2008-04-05  Junio C HamanoMerge git://repo.or.cz/git-gui blob | commitdiff | raw
2008-04-02  Junio C HamanoMerge git://repo.or.cz/git-gui blob | commitdiff | raw
2008-03-16  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui blob | commitdiff | raw
2008-03-12  Junio C HamanoMerge git://repo.or.cz/git-gui blob | commitdiff | raw
2008-03-06  Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into... blob | commitdiff | raw
2008-03-05  Shawn O. PearceMerge branch 'maint' blob | commitdiff | raw | diff to current
2008-03-01  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui blob | commitdiff | raw
2008-03-01  Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into... blob | commitdiff | raw
2008-02-28  Shawn O. PearceMerge branch 'maint' blob | commitdiff | raw | diff to current
2008-02-23  Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into... blob | commitdiff | raw
2008-02-22  Shawn O. PearceMerge branch 'maint' blob | commitdiff | raw | diff to current
2008-02-21  Shawn O. PearceMerge branch 'maint' blob | commitdiff | raw | diff to current
2008-02-20  Shawn O. PearceMerge branch 'maint' blob | commitdiff | raw | diff to current
2008-02-17  Junio C HamanoMerge git://repo.or.cz/git-gui blob | commitdiff | raw
2008-02-13  Junio C HamanoMerge git://repo.or.cz/git-gui blob | commitdiff | raw
2008-02-12  Shawn O. PearceMerge branch 'maint' blob | commitdiff | raw | diff to current
next
Unnamed repository; edit this file 'description' to name the repository.