summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2013-01-25Merge branch 'for-junio' of git://bogomips.org/git-svnLibravatar Junio C Hamano4-26/+25
2013-01-25Update draft release notes to 1.8.2Libravatar Junio C Hamano1-3/+33
2013-01-25Merge branch 'nd/retire-fnmatch'Libravatar Junio C Hamano7-62/+249
2013-01-25Merge branch 'jc/doc-maintainer'Libravatar Junio C Hamano1-91/+256
2013-01-25howto/maintain: document "### match next" convention in jch/pu branchLibravatar Junio C Hamano1-5/+6
2013-01-25git-difftool: use git-mergetool--lib for "--tool-help"Libravatar John Keeping1-48/+7
2013-01-25git-mergetool: don't hardcode 'mergetool' in show_tool_helpLibravatar John Keeping1-2/+4
2013-01-25git-mergetool: remove redundant assignmentLibravatar John Keeping1-1/+0
2013-01-25git-mergetool: move show_tool_help to mergetool--libLibravatar John Keeping2-37/+37
2013-01-25ident: do not drop username when reading from /etc/mailnameLibravatar Jonathan Nieder1-1/+5
2013-01-24push: finishing touches to explain REJECT_ALREADY_EXISTS betterLibravatar Junio C Hamano1-2/+1
2013-01-24git-remote-testpy: call print as a functionLibravatar John Keeping1-14/+14
2013-01-24git-remote-testpy: don't do unbuffered text I/OLibravatar John Keeping1-3/+7
2013-01-24git-remote-testpy: hash bytes explicitlyLibravatar John Keeping1-4/+4
2013-01-24svn-fe: allow svnrdump_sim.py to run with Python 3Libravatar John Keeping1-2/+2
2013-01-24git_remote_helpers: use 2to3 if building with Python 3Libravatar John Keeping1-0/+10
2013-01-24git_remote_helpers: force rebuild if python version changesLibravatar John Keeping2-1/+8
2013-01-24t9902: protect test from stray build artifactsLibravatar Junio C Hamano2-2/+34
2013-01-24push: introduce REJECT_FETCH_FIRST and REJECT_NEEDS_FORCELibravatar Junio C Hamano11-4/+93
2013-01-24push: further simplify the logic to assign rejection reasonLibravatar Junio C Hamano1-16/+11
2013-01-24push: further clean up fields of "struct ref"Libravatar Junio C Hamano3-14/+8
2013-01-24t7102 (reset): don't hardcode SHA-1 in expected outputsLibravatar Alexey Shumkin1-20/+21
2013-01-24git-cvsimport.txt: cvsps-2 is deprecatedLibravatar John Keeping1-0/+6
2013-01-24git-svn: Simplify calculation of GIT_DIRLibravatar Barry Wardell2-23/+22
2013-01-24git-svn: cleanup sprintf usage for uppercasing hexLibravatar Eric Wong2-3/+3
2013-01-23Merge branch 'as/pre-push-hook'Libravatar Junio C Hamano10-20/+302
2013-01-23Merge branch 'ch/add-auto-submitted-in-sample-post-receive-email'Libravatar Junio C Hamano1-0/+1
2013-01-23Merge branch 'as/check-ignore'Libravatar Junio C Hamano20-119/+1251
2013-01-23Merge branch 'rs/clarify-entry-cmp-sslice'Libravatar Junio C Hamano1-6/+4
2013-01-23Merge branch 'jk/suppress-clang-warning'Libravatar Junio C Hamano3-3/+3
2013-01-23Merge branch 'cr/push-force-tag-update'Libravatar Junio C Hamano3-58/+7
2013-01-23Merge branch 'mh/imap-send-shrinkage'Libravatar Junio C Hamano1-253/+65
2013-01-23Merge branch 'mo/cvs-server-updates'Libravatar Junio C Hamano3-317/+2198
2013-01-23Merge branch 'jc/makefile-perl-python-path-doc'Libravatar Junio C Hamano1-0/+5
2013-01-23reflog: use parse_config_key in config callbackLibravatar Jeff King1-6/+7
2013-01-23help: use parse_config_key for man configLibravatar Jeff King1-7/+7
2013-01-23submodule: simplify memory handling in config parsingLibravatar Jeff King1-16/+14
2013-01-23submodule: use parse_config_key when parsing configLibravatar Jeff King1-9/+10
2013-01-23userdiff: drop parse_driver functionLibravatar Jeff King1-29/+21
2013-01-23convert some config callbacks to parse_config_keyLibravatar Jeff King3-28/+13
2013-01-23archive-tar: use parse_config_key when parsing configLibravatar Jeff King2-10/+3
2013-01-23config: add helper function for parsing key namesLibravatar Jeff King2-0/+48
2013-01-23Merge git://ozlabs.org/~paulus/gitkLibravatar Junio C Hamano2-365/+504
2013-01-22Merge branch 'jc/merge-blobs'Libravatar Junio C Hamano1-1/+1
2013-01-22Makefile: Replace merge-file.h with merge-blobs.h in LIB_HLibravatar Ramsay Jones1-1/+1
2013-01-22Update draft release notes to 1.8.2Libravatar Junio C Hamano1-2/+37
2013-01-22Merge branch 'mz/reset-misc'Libravatar Junio C Hamano5-171/+214
2013-01-22Merge branch 'nd/fix-directory-attrs-off-by-one'Libravatar Junio C Hamano1-20/+18
2013-01-22Enable minimal stat checkingLibravatar Robin Rosenberg5-10/+28
2013-01-21Merge branch 'pw/p4-branch-fixes'Libravatar Junio C Hamano4-58/+253