summaryrefslogtreecommitdiff
path: root/git-gui/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rs/git-gui-use-modern-git-merge-syntax' into maintJunio C Hamano2016-10-111-6/+1
|\
| * Merge branch 'rs/use-modern-git-merge-syntax' of git-gui into rs/git-gui-use-...rs/git-gui-use-modern-git-merge-syntaxJunio C Hamano2016-09-261-6/+1
* | Merge branch 'js/commit-gpgsign' of ../git-gui into js/git-gui-commit-gpgsignjs/git-gui-commit-gpgsignJunio C Hamano2016-09-111-0/+3
|/
* Merge tag 'gitgui-0.20.0' of http://repo.or.cz/r/git-guiJunio C Hamano2015-04-183-6/+70
* Merge git://repo.or.cz/git-guiJunio C Hamano2014-06-261-0/+3
* Merge git://repo.or.cz/git-guiJunio C Hamano2013-12-095-6/+16
* Merge tag 'gitgui-0.18.0' of git://repo.or.cz/git-guiJunio C Hamano2013-06-164-7/+18
* Merge tag 'gitgui-0.17.0' of git://repo.or.cz/git-guiJunio C Hamano2012-10-172-1/+3
* Merge branch 'master' of git://repo.or.cz/git-guiJunio C Hamano2011-12-1314-44/+285
* Merge git://repo.or.cz/git-guiJunio C Hamano2011-10-166-7/+137
* Merge git-gui 0.14.0Junio C Hamano2011-03-2610-121/+266
* Merge branch 'master' of git://repo.or.cz/git-guiJunio C Hamano2010-11-052-2/+34
* Merge git://repo.or.cz/git-guiJunio C Hamano2010-09-151-1/+8
* Merge git://repo.or.cz/git-gui into pt/git-guiJunio C Hamano2010-08-027-10/+37
* Merge git://repo.or.cz/git-guiv1.7.0-rc2Junio C Hamano2010-02-0727-505/+753
* Merge branch 'maint' of git://git.spearce.org/git-gui into maintJunio C Hamano2010-01-243-16/+23
* Merge git://repo.or.cz/git-guiJunio C Hamano2009-12-093-13/+32
* Merge git://repo.or.cz/git-guiJunio C Hamano2009-10-272-9/+39
* Merge git://repo.or.cz/git-guiJunio C Hamano2009-05-019-27/+109
* Merge git://repo.or.cz/git-guiJunio C Hamano2008-12-172-7/+5
* Merge git://repo.or.cz/git-guiJunio C Hamano2008-12-021-16/+27
* Merge git://repo.or.cz/git-guiJunio C Hamano2008-11-165-10/+590
* Merge git://repo.or.cz/git-guiJunio C Hamano2008-11-123-8/+30
* Merge git://repo.or.cz/git-guiJunio C Hamano2008-11-0113-115/+726
* Merge git://repo.or.cz/git-guiShawn O. Pearce2008-09-256-71/+395
* Merge updated git-gui and gitk that call each otherJunio C Hamano2008-09-067-29/+641
* Merge branch 'maint' of git://repo.or.cz/git-gui into maintJunio C Hamano2008-09-062-9/+13
* Merge git://repo.or.cz/git-guiJunio C Hamano2008-07-301-4/+14
* Merge git://repo.or.cz/git-guiJunio C Hamano2008-07-273-15/+156
* Merge git://repo.or.cz/git-guiJunio C Hamano2008-07-151-0/+1
* Merge git://repo.or.cz/git-guiJunio C Hamano2008-07-061-0/+87
* Merge git://repo.or.cz/git-guiJunio C Hamano2008-05-261-6/+2
* Merge git://repo.or.cz/git-guiJunio C Hamano2008-05-155-8/+39
* Merge branch 'master' of git://repo.or.cz/git-guiJunio C Hamano2008-03-151-1/+1
* Merge git://repo.or.cz/git-guiJunio C Hamano2008-03-116-10/+35
* Merge branch 'master' of git://repo.or.cz/git-guiJunio C Hamano2008-02-292-16/+62
* Merge branch 'maint'Junio C Hamano2008-02-291-1/+1
|\
| * Merge branch 'maint' of git://repo.or.cz/git-gui into maintJunio C Hamano2008-02-291-1/+1
* | Sync with 1.5.4.3Junio C Hamano2008-02-232-7/+19
|\ \ | |/
| * Merge branch 'maint' of git://repo.or.cz/git-gui into maintJunio C Hamano2008-02-232-7/+19
* | Merge git://repo.or.cz/git-guiJunio C Hamano2008-02-162-4/+2
* | Merge git://repo.or.cz/git-guiJunio C Hamano2008-02-137-15/+423
|/
* Merge git://repo.or.cz/git-guiJunio C Hamano2008-01-231-1/+2
* Merge git://repo.or.cz/git-guiJunio C Hamano2008-01-202-63/+104
* Merge git://repo.or.cz/git-guiJunio C Hamano2008-01-203-29/+27
* Merge git://repo.or.cz/git-guiJunio C Hamano2008-01-042-1/+2
* Merge branch 'master' of git://repo.or.cz/git-guiJunio C Hamano2007-12-062-1/+1
* Merge git://repo.or.cz/git-guiJunio C Hamano2007-11-2128-536/+1798
* Merge branch 'maint' of git://repo.or.cz/git-gui into maintShawn O. Pearce2007-10-203-3/+6
* Merge branch 'maint' of git://repo.or.cz/git-gui into maintJunio C Hamano2007-09-176-27/+224