summaryrefslogtreecommitdiffstats
path: root/git-gui/lib/merge.tcl (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge https://github.com/prati0100/git-guiJunio C Hamano2020-03-201-1/+1
* Merge https://github.com/prati0100/git-guiJunio C Hamano2020-01-081-5/+9
* Merge tag 'gitgui-0.21.0' of git://repo.or.cz/git-guiJunio C Hamano2016-10-201-2/+11
* Merge branch 'rs/use-modern-git-merge-syntax' of git-gui into rs/git-gui-use-...Junio C Hamano2016-09-261-6/+1
* Merge git-gui 0.14.0Junio C Hamano2011-03-261-0/+2
* Merge git://repo.or.cz/git-guiv1.7.0-rc2Junio C Hamano2010-02-081-7/+7
* Merge git://repo.or.cz/git-guiJunio C Hamano2008-11-021-0/+1
* Merge git://repo.or.cz/git-guiJunio C Hamano2008-07-151-0/+1
* Merge git://repo.or.cz/git-guiJunio C Hamano2008-02-131-3/+2
* Merge git://repo.or.cz/git-guiJunio C Hamano2007-11-211-30/+30
* Merge branch 'master' of git://repo.or.cz/git-guiJunio C Hamano2007-08-271-1/+1
* Merge branch 'master' of git://repo.or.cz/git-guiJunio C Hamano2007-07-301-161/+118
* Merge commit 'git-gui/master'Junio C Hamano2007-07-121-16/+20
* Merge branch 'master' of git://repo.or.cz/git-guiJunio C Hamano2007-06-121-2/+3
* Merge branch 'master' of git://repo.or.cz/git-guiJunio C Hamano2007-05-111-1/+4
* Merge branch 'master' of git://repo.or.cz/git-guiShawn O. Pearce2007-05-081-0/+309
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-20 09:27:19 +0100