summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2013-02-07Update draft release notes to 1.8.2Libravatar Junio C Hamano1-5/+15
2013-02-07Sync with 1.8.1.3Libravatar Junio C Hamano2-1/+22
2013-02-07Git 1.8.1.3Libravatar Junio C Hamano3-2/+23
2013-02-07Merge branch 'mz/pick-unborn' into maintLibravatar Junio C Hamano10-48/+44
2013-02-07Merge branch 'nd/fix-perf-parameters-in-tests' into maintLibravatar Junio C Hamano1-1/+1
2013-02-07Merge branch 'jc/do-not-let-random-file-interfere-with-completion-tests' into...Libravatar Junio C Hamano2-2/+34
2013-02-07Merge branch 'ft/transport-report-segv' into maintLibravatar Junio C Hamano1-1/+1
2013-02-07Merge branch 'sb/gpg-plug-fd-leak' into maintLibravatar Junio C Hamano1-1/+3
2013-02-07Merge branch 'jc/fake-ancestor-with-non-blobs' into maintLibravatar Junio C Hamano3-17/+45
2013-02-07Merge branch 'jn/auto-depend-workaround-buggy-ccache' into maintLibravatar Junio C Hamano1-2/+3
2013-02-07Merge branch 'da/mergetool-docs'Libravatar Junio C Hamano5-72/+159
2013-02-07Merge branch 'ss/mergetools-tortoise'Libravatar Junio C Hamano1-4/+21
2013-02-07Merge branch 'jk/mergetool'Libravatar Junio C Hamano8-133/+100
2013-02-07Merge branch 'jk/doc-makefile-cleanup'Libravatar Junio C Hamano1-9/+30
2013-02-07Merge branch 'jk/remote-helpers-doc'Libravatar Junio C Hamano5-7/+23
2013-02-07Merge branch 'sb/run-command-fd-error-reporting'Libravatar Junio C Hamano1-2/+6
2013-02-07Merge branch 'nd/branch-error-cases'Libravatar Junio C Hamano4-21/+64
2013-02-07Merge branch 'sb/gpg-i18n'Libravatar Junio C Hamano1-3/+3
2013-02-07Merge branch 'jk/python-styles'Libravatar Junio C Hamano1-0/+14
2013-02-07Merge branch 'ab/gitweb-use-same-scheme'Libravatar Junio C Hamano1-2/+2
2013-02-05Update draft release notes to 1.8.2Libravatar Junio C Hamano1-0/+24
2013-02-05Merge branch 'jn/auto-depend-workaround-buggy-ccache'Libravatar Junio C Hamano1-2/+3
2013-02-05Merge branch 'ta/doc-no-small-caps'Libravatar Junio C Hamano137-959/+982
2013-02-05Merge branch 'jc/fake-ancestor-with-non-blobs'Libravatar Junio C Hamano3-17/+45
2013-02-05Merge branch 'sb/gpg-plug-fd-leak'Libravatar Junio C Hamano1-1/+3
2013-02-05Merge branch 'ft/transport-report-segv'Libravatar Junio C Hamano1-1/+1
2013-02-04Update draft release notes to 1.8.2Libravatar Junio C Hamano1-9/+25
2013-02-04Merge branch 'maint'Libravatar Junio C Hamano1-0/+28
2013-02-04Merge branch 'jk/remote-helpers-in-python-3'Libravatar Junio C Hamano6-29/+69
2013-02-04Merge branch 'pw/git-p4-on-cygwin'Libravatar Junio C Hamano10-105/+332
2013-02-04Merge branch 'jk/read-commit-buffer-data-after-free'Libravatar Junio C Hamano5-53/+85
2013-02-04Merge branch 'mm/add-u-A-sans-pathspec'Libravatar Junio C Hamano2-4/+47
2013-02-04Merge branch 'jc/push-reject-reasons'Libravatar Junio C Hamano11-30/+107
2013-02-04Merge branch 'jk/config-parsing-cleanup'Libravatar Junio C Hamano10-99/+117
2013-02-04Merge branch 'jc/custom-comment-char'Libravatar Junio C Hamano20-78/+284
2013-02-04Start preparing for 1.8.1.3Libravatar Junio C Hamano2-1/+29
2013-02-04Merge branch 'bc/git-p4-for-python-2.4' into maintLibravatar Junio C Hamano3-11/+35
2013-02-04Merge branch 'nd/edit-branch-desc-while-detached' into maintLibravatar Junio C Hamano1-4/+4
2013-02-04Merge branch 'jn/do-not-drop-username-when-reading-from-etc-mailname' into maintLibravatar Junio C Hamano1-1/+5
2013-02-04Merge branch 'jk/cvsimport-does-not-work-with-cvsps3' into maintLibravatar Junio C Hamano1-0/+6
2013-02-04Merge branch 'dl/am-hg-locale' into maintLibravatar Junio C Hamano1-1/+1
2013-02-04Merge branch 'jc/help' into maintLibravatar Junio C Hamano2-18/+17
2013-02-04Merge branch 'jc/merge-blobs' into maintLibravatar Junio C Hamano8-51/+118
2013-02-04Merge branch 'jc/doc-maintainer' into maintLibravatar Junio C Hamano1-91/+256
2013-02-04Merge branch 'bc/fix-array-syntax-for-3.0-in-completion-bash' into maintLibravatar Junio C Hamano1-1/+1
2013-02-02doc: generate a list of valid merge toolsLibravatar David Aguilar5-15/+36
2013-02-02mergetool--lib: list user configured tools in '--tool-help'Libravatar John Keeping1-1/+40
2013-02-02mergetool--lib: add functions for finding available toolsLibravatar David Aguilar1-36/+65
2013-02-01Makefile: explicitly set target name for autogenerated dependenciesLibravatar Jonathan Nieder1-2/+3
2013-02-01mergetools: teach tortoisemerge to handle filenames with SP correctlyLibravatar Sven Strickroth1-3/+11