summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2009-11-22Git v1.6.6-rc0v1.6.6-rc0Junio C Hamano1-1/+22
2009-11-22Merge branch 'maint'Junio C Hamano2-6/+0
2009-11-22Merge git://git.bogomips.org/git-svnJunio C Hamano2-0/+28
2009-11-22git svn: strip leading path when making empty dirsEric Wong2-0/+26
2009-11-22Merge branch 'th/maint-remote-update-help-string'Junio C Hamano1-1/+1
2009-11-22Merge branch 'jn/faster-completion-startup'Junio C Hamano1-35/+41
2009-11-22Merge branch 'rj/maint-t9700'Junio C Hamano1-1/+1
2009-11-22Merge branch 'ls/maint-mailinfo-no-inbody'Junio C Hamano16-5/+122
2009-11-22Merge branch 'mo/maint-crlf-doc'Junio C Hamano1-3/+4
2009-11-22Merge branch 'th/remote-usage'Junio C Hamano2-21/+52
2009-11-22Merge branch 'pb/maint-use-custom-perl'Junio C Hamano4-4/+5
2009-11-22Merge branch 'mm/config-pathname-tilde-expand'Junio C Hamano5-37/+69
2009-11-22Merge branch 'bc/grep-i-F'Junio C Hamano4-6/+27
2009-11-22Merge branch 'jk/maint-break-rename-reduce-memory'Junio C Hamano2-3/+10
2009-11-22Merge branch 'tc/format-attribute'Junio C Hamano10-3/+22
2009-11-22Merge branch 'tr/maint-merge-ours-clarification' (early part)Junio C Hamano2-5/+16
2009-11-22log --format: document %wRené Scharfe1-0/+4
2009-11-22strbuf_add_wrapped_text(): factor out strbuf_add_indented_text()René Scharfe2-9/+38
2009-11-22grep: unset GREP_OPTIONS before spawning external grepRené Scharfe2-0/+9
2009-11-22User Manual: Write "Git" instead of "GIT"Björn Gustavsson1-2/+2
2009-11-22Fix truncated usage messagesBjörn Gustavsson1-1/+1
2009-11-22git svn: always reuse existing remotes on fetchEric Wong1-0/+2
2009-11-21Documentation: avoid xmlto input errorJunio C Hamano1-3/+3
2009-11-20Merge branch 'jc/fix-tree-walk' (early part)Junio C Hamano2-14/+14
2009-11-20Merge branch 'jh/notes' (early part)Junio C Hamano20-10/+1408
2009-11-20Merge branch 'sp/smart-http'Junio C Hamano35-283/+2937
2009-11-20Merge branch 'bw/autoconf-more'Junio C Hamano1-0/+43
2009-11-20Merge branch 'jn/editor-pager'Junio C Hamano19-69/+178
2009-11-20Merge branch 'rj/cygwin-msvc'Junio C Hamano4-16/+21
2009-11-20Merge branch 'rj/maint-simplify-cygwin-makefile'Junio C Hamano1-4/+2
2009-11-20Merge branch 'bg/format-patch-doc-update'Junio C Hamano4-50/+99
2009-11-20Merge branch 'tr/filter-branch'Junio C Hamano3-13/+58
2009-11-20Merge branch 'sc/protocol-doc'Junio C Hamano3-41/+777
2009-11-20Merge branch 'jl/submodule-add-noname'Junio C Hamano3-3/+28
2009-11-20Merge branch 'sb/ls-tree-parseopt'Junio C Hamano2-62/+127
2009-11-20Merge branch 'rg/doc-workflow'Junio C Hamano1-0/+115
2009-11-20Merge branch 'jn/gitweb-log-history'Junio C Hamano1-159/+110
2009-11-20Merge branch 'jn/help-everywhere'Junio C Hamano32-41/+147
2009-11-20Merge branch 'jp/fetch-cull-many-refs'Junio C Hamano3-22/+49
2009-11-20Add branch management for releases to gitworkflowsRaman Gupta1-0/+115
2009-11-20git am/mailinfo: Don't look at in-body headers when rebasingLukas Sandström16-5/+122
2009-11-20git remote: Separate usage strings for subcommandsTim Henigan2-21/+52
2009-11-20diffcore-rename: reduce memory footprint by freeing blob data earlyJunio C Hamano1-2/+5
2009-11-20describe: do not use unannotated tag even if exact matchThomas Rast2-1/+7
2009-11-20submodule.c: Squelch a "use before assignment" warningDavid Aguilar1-1/+1
2009-11-19Documentation: undocument gc'd function graph_release()Greg Price2-6/+0
2009-11-19t9700-perl-git.sh: Fix a test failure on CygwinRamsay Jones1-1/+1
2009-11-19expand_user_path: expand ~ to $HOME, not to the actual homedir.Matthieu Moy2-8/+14
2009-11-17Merge branch 'np/maint-sideband-favor-status'Junio C Hamano2-23/+23
2009-11-17Merge branch 'sb/tutorial-test'Junio C Hamano2-71/+169
2009-11-17Merge branch 'ef/msys-imap'Junio C Hamano5-180/+81
2009-11-17ls-tree: migrate to parse-optionsStephen Boyd1-60/+40
2009-11-17Expand ~ and ~user in core.excludesfile, commit.templateMatthieu Moy5-37/+63
2009-11-17Speed up bash completion loadingJonathan Nieder1-35/+41
2009-11-17Merge git://git.bogomips.org/git-svnJunio C Hamano8-65/+545
2009-11-17Make sure $PERL_PATH is defined when the test suite is run.Philippe Bruhat (BooK)4-4/+5
2009-11-16Document git-svn's first-parent ruleThomas Rast1-0/+10
2009-11-16core.autocrlf documentation: mention the crlf attributeMatthew Ogilvie1-3/+4
2009-11-16rebase docs: clarify --merge and --strategyThomas Rast1-3/+13
2009-11-16t3101: test more ls-tree optionsStephen Boyd1-2/+87
2009-11-16grep: Allow case insensitive search of fixed-stringsBrian Collins4-6/+27
2009-11-16diffcore-break: save cnt_data for other phasesJeff King1-3/+3
2009-11-16diffcore-break: free filespec data as we goJeff King1-0/+4
2009-11-16Update draft release notes to 1.6.6Junio C Hamano1-27/+27
2009-11-16Sync with 1.6.5.3Junio C Hamano3-2/+69
2009-11-16Git 1.6.5.3v1.6.5.3Junio C Hamano4-3/+67
2009-11-16Merge branch 'bs/maint-pre-commit-hook-sample' into maintJunio C Hamano1-9/+9
2009-11-16Merge branch 'jk/maint-add-p-empty' into maintJunio C Hamano2-5/+30
2009-11-16Merge branch 'js/maint-diff-color-words' into maintJunio C Hamano2-8/+32
2009-11-15Merge branch 'tz/maint-rpm' into maintJunio C Hamano1-1/+4
2009-11-15Merge branch 'jk/maint-format-patch-p-suppress-stat' into maintJunio C Hamano2-2/+28
2009-11-15Merge branch 'pb/maint-gitweb-blob-lineno' into maintJunio C Hamano1-1/+2
2009-11-15Merge branch 'jk/maint-1.6.3-ls-files-i' into maintJunio C Hamano3-2/+20
2009-11-15Merge branch 'vl/maint-openssl-signature-change' into maintJunio C Hamano1-0/+4
2009-11-15Merge branch 'jk/maint-push-config' into maintJunio C Hamano1-2/+1
2009-11-15Merge branch 'sr/blame-incomplete' into maintJunio C Hamano1-0/+6
2009-11-15Merge branch 'jc/maint-blank-at-eof' into maintJunio C Hamano8-173/+437
2009-11-15http-backend: Let gcc check the format of more printf-type functions.Tarmigan Casebolt1-0/+3
2009-11-15http-backend: Fix access beyond end of string.Tarmigan Casebolt1-3/+4
2009-11-15git svn: attempt to create empty dirs on clone+rebaseEric Wong4-2/+139
2009-11-15Check the format of more printf-type functionsTarmigan Casebolt10-3/+22
2009-11-15Merge branch 'maint'Junio C Hamano0-0/+0
2009-11-15Merge branch 'bs/maint-pre-commit-hook-sample'Junio C Hamano1-9/+9
2009-11-15Merge branch 'js/maint-diff-color-words'Junio C Hamano2-8/+32
2009-11-15Merge branch 'rs/pretty-wrap'Junio C Hamano1-0/+57
2009-11-15Merge branch 'js/log-rewrap'Junio C Hamano2-9/+53
2009-11-15Merge branch 'fc/doc-fast-forward'Junio C Hamano35-73/+73
2009-11-15Merge branch 'sc/difftool-p4merge'Junio C Hamano5-6/+19
2009-11-15Merge branch 'jk/maint-add-p-empty'Junio C Hamano2-5/+30
2009-11-15Merge branch 'lt/revision-bisect'Junio C Hamano4-1/+32
2009-11-15Merge branch 'jc/maint-1.6.3-graft-trailing-space' into maintJunio C Hamano1-2/+2
2009-11-15Merge branch 'tr/maint-roff-quote' into maintJunio C Hamano3-0/+28
2009-11-15Merge branch 'ja/fetch-doc' into maintJunio C Hamano3-67/+76
2009-11-15Merge branch 'cb/doc-fetch-pull-merge' into maintJunio C Hamano3-45/+66
2009-11-15Merge branch 'jk/maint-cvsimport-pathname' into maintJunio C Hamano1-3/+14
2009-11-15Merge branch 'jc/receive-pack-auto' into maintJunio C Hamano3-4/+36
2009-11-15Merge branch 'gb/maint-gitweb-esc-param' into maintJunio C Hamano1-2/+1
2009-11-15Merge branch 'jn/gitweb-patch' into maintJunio C Hamano1-3/+3
2009-11-15Documentation: clarify 'ours' merge strategyThomas Rast1-2/+3
2009-11-15Update 'git remote update' usage string to match man page.Tim Henigan1-1/+1
2009-11-15Merge branch 'maint'Junio C Hamano1-4/+4
2009-11-14remote: fix use-after-free error detected by glibc in ref_remove_duplicatesJulian Phillips2-0/+13
2009-11-14Makefile: Ensure rpm packages can be read by older rpm versionsTodd Zullinger1-1/+4
2009-11-14bash: add the merge option --ff-onlyBjörn Gustavsson1-1/+1
2009-11-14gitweb: Make 'history' view (re)use git_log_generic()Jakub Narebski1-89/+57
2009-11-14gitweb: Refactor common parts of 'log' and 'shortlog' viewsJakub Narebski1-52/+20
2009-11-14gitweb: Refactor 'log' action generation, adding git_log_body()Jakub Narebski1-33/+48
2009-11-14git svn: add authorsfile test case for ~/.gitconfigEric Wong1-0/+23
2009-11-14git svn: read global+system config for clone+initEric Wong1-3/+2
2009-11-14git svn: handle SVN merges from revisions past the tip of the branchToby Allsopp4-60/+371
2009-11-14git-add.txt: fix formatting of --patch sectionStephen Boyd1-4/+4
2009-11-13http-backend: Fix bad treatment of uintmax_t in Content-LengthShawn O. Pearce1-6/+3
2009-11-13give priority to progress messagesNicolas Pitre2-23/+23
2009-11-13Provide a build time default-pager settingJunio C Hamano2-1/+16
2009-11-13Provide a build time default-editor settingJonathan Nieder3-13/+47
2009-11-13am -i, git-svn: use "git var GIT_PAGER"Jonathan Nieder2-5/+6
2009-11-13add -i, send-email, svn, p4, etc: use "git var GIT_EDITOR"Jonathan Nieder8-29/+16
2009-11-13Teach git var about GIT_PAGERJonathan Nieder4-3/+32
2009-11-13Teach git var about GIT_EDITORJonathan Nieder4-3/+36
2009-11-13Suppress warnings from "git var -l"Jonathan Nieder2-2/+2
2009-11-13Do not use VISUAL editor on dumb terminalsJonathan Nieder4-14/+24
2009-11-13Update packfile transfer protocol documentationScott Chacon3-41/+777
2009-11-13filter-branch: nearest-ancestor rewriting outside subdir filterThomas Rast3-6/+43
2009-11-13filter-branch: stop special-casing $filter_subdir argumentThomas Rast1-7/+15
2009-11-10Merge branch 'maint'Junio C Hamano0-0/+0
2009-11-10check-ref-format -h: it does not know the --print option yetJunio C Hamano1-1/+1
2009-11-10git-describe.txt: formatting fixJunio C Hamano1-0/+1
2009-11-10Merge branch 'maint'Junio C Hamano2-2/+5
2009-11-10Merge branch 'jk/maint-format-patch-p-suppress-stat'Junio C Hamano2-2/+28
2009-11-10Merge branch 'pb/maint-gitweb-blob-lineno'Junio C Hamano1-1/+2
2009-11-10Merge branch 'tr/describe-advice'Junio C Hamano1-4/+12
2009-11-10Merge branch 'jk/maint-1.6.3-ls-files-i'Junio C Hamano3-2/+20
2009-11-10Merge branch 'bg/merge-ff-only'Junio C Hamano4-3/+61
2009-11-10Merge branch 'vl/maint-openssl-signature-change'Junio C Hamano1-0/+4
2009-11-10Merge branch 'jk/maint-push-config'Junio C Hamano1-2/+1
2009-11-10Merge branch 'jk/gitignore-anchored'Junio C Hamano1-177/+177
2009-11-10Merge branch 'jp/dirty-describe'Junio C Hamano3-1/+44
2009-11-10Merge branch 'sr/blame-incomplete'Junio C Hamano1-0/+6
2009-11-10diff --no-index: make the usage string less scaryJonathan Nieder1-2/+2
2009-11-10merge-{recursive,subtree}: use usagef() to print usageJonathan Nieder1-1/+1
2009-11-10Introduce usagef() that takes a printf-style formatJonathan Nieder2-4/+14
2009-11-10Let 'git <command> -h' show usage without a git dirJonathan Nieder8-15/+36
2009-11-10Show usage string for 'git http-push -h'Jonathan Nieder1-2/+4
2009-11-10format-patch: Add "--no-stat" as a synonym for "-p"Björn Gustavsson2-2/+4
2009-11-10format-patch documentation: Fix formattingBjörn Gustavsson2-41/+41
2009-11-10format-patch documentation: Remove diff options that are not usefulBjörn Gustavsson1-2/+12
2009-11-10format-patch: Always generate a patchBjörn Gustavsson3-10/+47
2009-11-10Let 'git http-fetch -h' show usage outside any git repositoryJonathan Nieder1-6/+12
2009-11-10Merge branch 'jn/maint-http-fetch-mingw' into jn/help-everywhereJunio C Hamano3-3/+7
2009-11-10Show usage string for 'git stripspace -h'Jonathan Nieder1-1/+3
2009-11-10Show usage string for 'git unpack-file -h'Jonathan Nieder1-1/+1
2009-11-10Show usage string for 'git show-index -h'Jonathan Nieder1-0/+5
2009-11-10Show usage string for 'git rev-parse -h'Jonathan Nieder1-0/+10
2009-11-10Show usage string for 'git merge-one-file -h'Jonathan Nieder1-0/+12
2009-11-10Show usage string for 'git mailsplit -h'Jonathan Nieder1-0/+2
2009-11-10Show usage string for 'git imap-send -h'Jonathan Nieder1-0/+5
2009-11-10Show usage string for 'git get-tar-commit-id -h'Jonathan Nieder1-0/+6
2009-11-10Show usage string for 'git fast-import -h'Jonathan Nieder1-0/+3
2009-11-10Show usage string for 'git check-ref-format -h'Jonathan Nieder1-0/+3
2009-11-10http-fetch: add missing initialization of argv0_pathJonathan Nieder1-1/+2
2009-11-10merge: do not setup worktree twiceJonathan Nieder1-1/+0
2009-11-10check-ref-format: update usage stringJonathan Nieder1-1/+5
2009-11-10git-update-index.txt: Document the --really-refresh option.Štěpán Němec1-1/+5
2009-11-09Show usage string for 'git show-ref -h'Jonathan Nieder2-4/+9
2009-11-09Show usage string for 'git merge-ours -h'Jonathan Nieder1-0/+6
2009-11-09Show usage string for 'git commit-tree -h'Jonathan Nieder1-1/+1
2009-11-09Show usage string for 'git cherry -h'Jonathan Nieder1-0/+3
2009-11-09Show usage string for 'git grep -h'Jonathan Nieder1-0/+7
2009-11-09Retire fetch--tool helper to contrib/examplesJonathan Nieder4-3/+0
2009-11-09t5551-http-fetch: Work around broken Accept header in libcurlShawn O. Pearce1-0/+3
2009-11-09t5551-http-fetch: Work around some libcurl versionsShawn O. Pearce1-4/+4
2009-11-09http-backend: Protect GIT_PROJECT_ROOT from /../ requestsShawn O. Pearce5-48/+86
2009-11-09Git-aware CGI to provide dumb HTTP transportShawn O. Pearce1-5/+5
2009-11-08Merge branch 'maint'Junio C Hamano1-0/+1
2009-11-08MSVC: Add support for building with NO_MMAPRamsay Jones3-13/+13
2009-11-08Makefile: keep MSVC and Cygwin configuration separateRamsay Jones1-3/+8
2009-11-08Makefile: merge two Cygwin configuration sections into oneRamsay Jones1-4/+2
2009-11-08Add intermediate build products to .gitignoreJonathan Nieder1-0/+1
2009-11-08format-patch: make "-p" suppress diffstatJeff King2-2/+28
2009-11-08log --format: don't ignore %w() at the start of format stringRené Scharfe1-1/+1
2009-11-06pre-commit.sample: Diff against the empty tree when HEAD is invalidBjörn Steinbrink1-9/+9
2009-11-06Merge branch 'jc/commit-s-subject-is-not-a-footer'Junio C Hamano2-1/+10
2009-11-06builtin-commit.c: fix logic to omit empty line before existing footersJunio C Hamano2-1/+10
2009-11-06t1200: prepare for merging with Fast-forward bikesheddingJunio C Hamano1-2/+3
2009-11-06t1200: further modernize test script styleJunio C Hamano1-18/+18
2009-11-06t1200: Make documentation and test agreeStephen Boyd2-19/+98
2009-11-06t1200: cleanup and modernize test styleStephen Boyd1-58/+76
2009-11-06gitweb: Fix blob linenr links in pathinfo modePetr Baudis1-1/+2
2009-11-05pack-objects: move thread autodetection closer to relevant codeNicolas Pitre1-5/+2
2009-11-04http-backend: Test configuration optionsShawn O. Pearce1-0/+229
2009-11-04http-backend: Use http.getanyfile to disable dumb HTTP servingShawn O. Pearce2-6/+36
2009-11-04test smart http fetch and pushShawn O. Pearce5-2/+219
2009-11-04http tests: use /dumb/ URL prefixShawn O. Pearce3-8/+13
2009-11-04set httpd port before sourcing lib-httpdClemens Buchacher1-4/+3
2009-11-04t5540-http-push: remove redundant fetchesTay Ray Chuan1-2/+0
2009-11-04Smart HTTP fetch: gzip requestsShawn O. Pearce1-0/+50
2009-11-04Smart fetch over HTTP: client sideShawn O. Pearce3-22/+160
2009-11-04Smart push over HTTP: client sideShawn O. Pearce8-15/+374
2009-11-04Discover refs via smart HTTP server when availableShawn O. Pearce1-17/+131
2009-11-04http-backend: more explict LocationMatchMark Lodato1-1/+1