summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2010-01-19Merge branch 'maint'Libravatar Junio C Hamano1-3/+5
2010-01-19Makefile: honor NO_CURL when setting REMOTE_CURL_* variablesLibravatar Johannes Sixt1-10/+6
2010-01-19ident.c: replace fprintf with fputs to suppress compiler warningLibravatar Tarmigan Casebolt1-1/+1
2010-01-19rm: only refresh entries that we may touchLibravatar Nguyễn Thái Ngọc Duy1-1/+2
2010-01-19bisect: fix singular/plural grammar nitLibravatar David Ripton1-3/+5
2010-01-19cvsimport: standarize system() calls to external git toolsLibravatar Ben Walton1-5/+5
2010-01-19cvsimport: standarize open() calls to external git toolsLibravatar Ben Walton1-4/+4
2010-01-19cvsimport: modernize callouts to git subcommandsLibravatar Ben Walton1-32/+32
2010-01-18Merge branch 'maint-1.6.4' into maint-1.6.5Libravatar Junio C Hamano8-43/+47
2010-01-18Merge branch 'maint-1.6.3' into maint-1.6.4Libravatar Junio C Hamano8-43/+47
2010-01-18Merge branch 'maint-1.6.2' into maint-1.6.3Libravatar Junio C Hamano8-43/+47
2010-01-18Merge commit 'v1.6.4.4-8-g8de6518' into maint-1.6.4Libravatar Junio C Hamano1-1/+5
2010-01-18Fix mis-backport of t7002Libravatar Junio C Hamano1-1/+5
2010-01-18Update draft release notes to 1.7.0Libravatar Junio C Hamano1-1/+16
2010-01-18Merge branch 'maint'Libravatar Junio C Hamano3-6/+22
2010-01-18Update draft release notes to 1.6.6.1Libravatar Junio C Hamano1-1/+16
2010-01-18Merge branch 'dp/maint-1.6.5-fast-import-non-commit-tag' into maintLibravatar Junio C Hamano1-5/+5
2010-01-18Merge branch 'jc/rerere'Libravatar Junio C Hamano12-18/+77
2010-01-18Merge branch 'pc/uninteresting-submodule-disappear-upon-switch-branches'Libravatar Junio C Hamano2-2/+19
2010-01-18Merge branch 'nd/include-termios-for-osol'Libravatar Junio C Hamano1-0/+1
2010-01-18Merge branch 'js/windows'Libravatar Junio C Hamano8-133/+329
2010-01-18builtin-apply.c: fix the --- and +++ header filename consistency checkLibravatar Andreas Gruenbacher2-1/+39
2010-01-18Replace parse_blob() with an explanatory commentLibravatar Daniel Barkalow2-22/+8
2010-01-18Merge branch 'jm/maint-1.6.5-grep-NUL-terminate' into maintLibravatar Junio C Hamano1-0/+1
2010-01-18grep: NUL terminate input from a fileLibravatar Jim Meyering1-0/+1
2010-01-18builtin-apply.c: Skip filenames without enough componentsLibravatar Andreas Gruenbacher2-2/+14
2010-01-17symlinks.c: remove unused functionsLibravatar Junio C Hamano2-33/+0
2010-01-17object.c: remove unused functionsLibravatar Junio C Hamano2-26/+0
2010-01-17Document that merge strategies can now take their own optionsLibravatar Junio C Hamano2-1/+33
2010-01-17Extend merge-subtree tests to test -Xsubtree=dir.Libravatar Avery Pennarun1-1/+46
2010-01-17Make "subtree" part more orthogonal to the rest of merge-recursive.Libravatar Junio C Hamano6-18/+91
2010-01-17pull: Fix parsing of -X<option>Libravatar Junio C Hamano1-7/+14
2010-01-17Teach git-pull to pass -X<option> to git-mergeLibravatar Avery Pennarun2-2/+23
2010-01-17git merge -X<option>Libravatar Avery Pennarun11-26/+162
2010-01-17Update draft release notes to 1.7.0Libravatar Junio C Hamano1-1/+38
2010-01-17Merge branch 'tc/test-locate-httpd'Libravatar Junio C Hamano1-6/+24
2010-01-17Merge branch 'jh/commit-status'Libravatar Junio C Hamano4-3/+134
2010-01-17Merge branch 'jn/makefile'Libravatar Junio C Hamano2-34/+26
2010-01-17Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge'Libravatar Junio C Hamano2-1/+58
2010-01-17Merge branch 'tc/clone-v-progress'Libravatar Junio C Hamano6-7/+20
2010-01-17Merge branch 'tc/smart-http-restrict'Libravatar Junio C Hamano7-260/+362
2010-01-17Merge branch 'jk/run-command-use-shell'Libravatar Junio C Hamano11-35/+69
2010-01-17Merge branch 'sr/gfi-options'Libravatar Junio C Hamano3-86/+462
2010-01-17Update COPYING with GPLv2 with new FSF addressLibravatar Junio C Hamano1-13/+12
2010-01-17user_ident_sufficiently_given(): refactor the logic to be usable from elsewhereLibravatar Junio C Hamano3-2/+8
2010-01-17user_ident_sufficiently_given(): refactor the logic to be usable from elsewhereLibravatar Junio C Hamano3-1/+11
2010-01-17rerere: honor conflict-marker-size attributeLibravatar Junio C Hamano3-2/+20
2010-01-17rerere: prepare for customizable conflict marker lengthLibravatar Junio C Hamano1-10/+44
2010-01-17commit.c::print_summary: do not release the format string too earlyLibravatar Junio C Hamano1-1/+1
2010-01-16conflict-marker-size: new attributeLibravatar Junio C Hamano1-25/+34