summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2012-04-15merge overwrites unstaged changes in renamed fileLibravatar Clemens Buchacher1-0/+9
2012-04-11Kick off post 1.7.10 cycleLibravatar Junio C Hamano3-2/+31
2012-04-11gitweb: Fix unintended "--no-merges" for regular Atom feedLibravatar Sebastian Pipping1-0/+1
2012-04-10Merge branch 'maint'Libravatar Junio C Hamano2-4/+4
2012-04-10Merge branch 'maint-1.7.9' into maintLibravatar Junio C Hamano0-0/+0
2012-04-10Merge branch 'maint-1.7.8' into maint-1.7.9Libravatar Junio C Hamano2-6/+6
2012-04-10test-subprocess: fix segfault without argumentsLibravatar René Scharfe1-3/+3
2012-04-10submodule: fix prototype of gitmodules_configLibravatar René Scharfe1-1/+1
2012-04-09Fix git-subtree install instructionsLibravatar David A. Greene1-12/+18
2012-04-09Use git-subtree test MakefileLibravatar David A. Greene1-1/+1
2012-04-09Add subtree test MakefileLibravatar David A. Greene1-0/+69
2012-04-09Install git-subtree from contribLibravatar David A. Greene1-20/+21
2012-04-09Use configure settings for git-subtreeLibravatar David A. Greene1-0/+3
2012-04-09Use project config filesLibravatar David A. Greene1-3/+6
2012-04-09Remove unnecessary git-subtree filesLibravatar David A. Greene6-143/+0
2012-04-09Set TEST_DIRECTORYLibravatar David A. Greene1-2/+4
2012-04-09Add 'contrib/subtree/' from commit 'd3a04e06c77d57978bb5230361c64946232cc346'Libravatar David A. Greene15-0/+2196
2012-04-09Merge branch 'jc/maint-verify-objects-remove-pessimism' into maint-1.7.8Libravatar Junio C Hamano1-4/+4
2012-04-09Merge branch 'dw/gitweb-doc-grammo' into maint-1.7.8Libravatar Junio C Hamano1-2/+2
2012-04-09Merge branch 'tr/cache-tree' into maint-1.7.8Libravatar Junio C Hamano10-11/+142
2012-04-09Merge branch 'cb/maint-t5541-make-server-port-portable' into maint-1.7.8Libravatar Junio C Hamano2-4/+33
2012-04-09Merge branch 'cn/maint-rev-list-doc' into maint-1.7.8Libravatar Junio C Hamano1-6/+6
2012-04-09Merge branch 'tr/maint-bundle-boundary' into maint-1.7.8Libravatar Junio C Hamano2-23/+36
2012-04-09Merge branch 'tr/maint-bundle-long-subject' into maint-1.7.8Libravatar Junio C Hamano5-51/+67
2012-04-09Merge branch 'ph/rerere-doc' into maint-1.7.8Libravatar Junio C Hamano1-7/+12
2012-04-06Git 1.7.10Libravatar Junio C Hamano3-11/+19
2012-04-06spec: add missing build dependencyLibravatar Felipe Contreras1-0/+1
2012-04-03Git 1.7.10-rc4Libravatar Junio C Hamano2-8/+8
2012-04-02Merge branch 'pt/gitk'Libravatar Junio C Hamano1-1/+2
2012-04-02Sync with 1.7.9.6Libravatar Junio C Hamano3-6/+17
2012-04-02Git 1.7.9.6Libravatar Junio C Hamano4-4/+18
2012-04-02Merge branch 'jc/maint-merge-autoedit' into maintLibravatar Junio C Hamano2-3/+40
2012-04-02gitk: fix setting font display with new tabbed dialog layout.Libravatar Pat Thoyts1-1/+1
2012-04-02gitk: fix tabbed preferences construction when using tcl 8.4Libravatar Pat Thoyts1-0/+1
2012-04-02Merge git://github.com/git-l10n/git-poLibravatar Junio C Hamano4-19/+7103
2012-04-02l10n: Add the Dutch translation team and initialize nl.poLibravatar Vincent van Ravesteijn2-0/+3497
2012-04-02l10n: Inital Portuguese Portugal language (pt_PT)Libravatar Marco Sousa2-0/+3587
2012-03-30Merge branch 'maint'Libravatar Junio C Hamano1-1/+3
2012-03-30string-list: document that string_list_insert() inserts unique stringsLibravatar Heiko Voigt1-1/+3
2012-03-30l10n: Improve zh_CN translation for Git 1.7.10-rc3Libravatar Jiang Xin1-19/+19
2012-03-28config: remove useless assignmentLibravatar René Scharfe1-2/+0
2012-03-28Git 1.7.10-rc3Libravatar Junio C Hamano2-11/+11
2012-03-28correct a few doubled-word nits in comments and documentationLibravatar Jim Meyering4-4/+4
2012-03-28correct spelling: an URL -> a URLLibravatar Jim Meyering8-9/+9
2012-03-27l10n updates for Git 1.7.10-rc1Libravatar Junio C Hamano4-292/+310
2012-03-27tests: unset COLUMNS inherited from environmentLibravatar Zbigniew Jędrzejewski-Szmek1-1/+1
2012-03-27Add url of Swedish l10n team in TEAMS fileLibravatar Jiang Xin1-0/+1
2012-03-27l10n: Review zh_CN translation for Git 1.7.10-rc1Libravatar Jiang Xin1-250/+252
2012-03-27Update Swedish translation (724t0f0u).Libravatar Peter Krefting1-18/+23
2012-03-26Update draft release notes to 1.7.10Libravatar Junio C Hamano1-21/+7