summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2010-03-02Merge branch 'ml/color-when'Libravatar Junio C Hamano12-11/+66
2010-03-02Merge branch 'ac/cvsimport-revision-mapping'Libravatar Junio C Hamano3-8/+67
2010-03-02Merge branch 'jc/grep-author-all-match-implicit'Libravatar Junio C Hamano6-10/+57
2010-03-02fallback SSH_ASKPASS when GIT_ASKPASS not setLibravatar Frank Li1-0/+3
2010-03-01Merge branch 'cc/maint-bisect-paths'Libravatar Junio C Hamano2-0/+11
2010-03-01bisect: error out when passing bad path parametersLibravatar Christian Couder2-0/+11
2010-02-28Merge branch 'maint'Libravatar Junio C Hamano5-24/+31
2010-02-28Git 1.7.0.1Libravatar Junio C Hamano3-7/+12
2010-02-28Remove reference to GREP_COLORS from documentationLibravatar Mark Lodato1-3/+1
2010-02-28sha1_name: fix segfault caused by invalid index accessLibravatar Markus Heidelberg1-14/+18
2010-02-26git svn: delay importing SVN::Base until it is neededLibravatar josh robb1-5/+11
2010-02-26git-svn: Fix discarding of extra parents from svn:mergeinfoLibravatar Tuomas Suutari2-2/+2
2010-02-26t9151: Add two new svn:mergeinfo test casesLibravatar Tuomas Suutari3-53/+581
2010-02-26t9151: Fix a few commits in the SVN dumpLibravatar Tuomas Suutari2-38/+74
2010-02-25Merge branch 'maint'Libravatar Junio C Hamano1-0/+1
2010-02-25Merge branch 'maint-1.6.6' into maintLibravatar Junio C Hamano1-0/+1
2010-02-25Windows: redirect f[re]open("/dev/null") to f[re]open("nul")Libravatar Johannes Sixt4-0/+33
2010-02-25t3301-notes: insert a shbang line in ./fake_editor.shLibravatar Johannes Sixt1-0/+1
2010-02-24Merge branch 'maint'Libravatar Junio C Hamano1-1/+1
2010-02-24commit: quote the user name in the exampleLibravatar Matt Kraai1-1/+1
2010-02-24Merge branch 'ml/maint-grep-doc' into maintLibravatar Junio C Hamano1-5/+12
2010-02-23Merge branch 'maint'Libravatar Junio C Hamano3-6/+9
2010-02-23am: remove rebase-apply directory before gcLibravatar Jonathan Nieder1-2/+1
2010-02-23rerere: fix memory leak if rerere images can't be readLibravatar Bert Wesarg1-3/+6
2010-02-23Documentation: mention conflict marker size argument (%L) for merge driverLibravatar Bert Wesarg1-1/+2
2010-02-21Merge branch 'ml/maint-grep-doc'Libravatar Junio C Hamano1-5/+12
2010-02-21Merge branch 'tc/maint-transport-ls-remote-with-void'Libravatar Junio C Hamano2-1/+10
2010-02-21Merge branch 'hm/maint-imap-send-crlf'Libravatar Junio C Hamano1-1/+39
2010-02-21Merge branch 'sp/push-sideband'Libravatar Junio C Hamano10-134/+370
2010-02-21Merge branch 'jc/checkout-detached'Libravatar Junio C Hamano5-12/+46
2010-02-21Merge branch 'jc/maint-fix-test-perm'Libravatar Junio C Hamano2-0/+4
2010-02-21Merge branch 'jn/makefile-script-lib'Libravatar Junio C Hamano3-14/+28
2010-02-21Merge branch 'mv/request-pull-modernize'Libravatar Junio C Hamano1-4/+4
2010-02-20Merge branch 'maint'Libravatar Junio C Hamano3-14/+13
2010-02-20git-p4: fix bug in symlink handlingLibravatar Evan Powers1-3/+2
2010-02-19t1450: fix testcases that were wrongly expecting failureLibravatar Thomas Rast1-8/+8
2010-02-19Documentation: Fix indentation problem in git-commit(1)Libravatar Jacob Helwig1-3/+3
2010-02-19Merge branch 'maint'Libravatar Junio C Hamano7-29/+45
2010-02-19Merge branch 'jk/maint-rmdir-fix' into maintLibravatar Junio C Hamano2-1/+9
2010-02-18rm: fix bug in recursive subdirectory removalLibravatar Jeff King2-1/+9
2010-02-18Add an optional argument for --color optionsLibravatar Mark Lodato12-11/+66
2010-02-18Documentation: describe --thin more accuratelyLibravatar Stephen Boyd5-28/+36
2010-02-17Merge branch 'maint'Libravatar Junio C Hamano10-36/+39
2010-02-17docs: don't talk about $GIT_DIR/refs/ everywhereLibravatar Jeff King10-36/+39
2010-02-17Merge branch 'np/fast-import-idx-v2'Libravatar Junio C Hamano2-95/+84
2010-02-17Update draft release notes to 1.7.1Libravatar Junio C Hamano1-1/+4
2010-02-17Merge branch 'maint'Libravatar Junio C Hamano1-1/+1
2010-02-17Update 1.7.0.1 release notesLibravatar Junio C Hamano1-1/+1
2010-02-17Merge branch 'jk/cherry-pick-reword' into maintLibravatar Junio C Hamano1-23/+19
2010-02-17Merge branch 'jk/grep-double-dash' into maintLibravatar Junio C Hamano2-0/+43