summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2011-11-12Git 1.7.8-rc2v1.7.8-rc2Junio C Hamano2-2/+2
2011-11-11Merge branch 'ly/mktree-using-strbuf'Junio C Hamano1-0/+1
2011-11-10Merge "Move 'builtin-*' into a 'builtin/' subdirectory"Junio C Hamano943-17539/+77997
2011-11-10Merge 'build-in git-mktree'Junio C Hamano1366-45469/+172869
2011-11-10mktree: fix a memory leak in write_tree()Liu Yuan1-0/+1
2011-11-09Merge branch 'sn/complete-bash-wo-process-subst'Junio C Hamano1-1/+1
2011-11-09completion: don't leak variable from the prompt into environmentSZEDER Gábor1-1/+1
2011-11-08Update draft release notes to 1.7.8Junio C Hamano1-14/+5
2011-11-08Merge branch 'jc/remote-setbranches-usage-fix'Junio C Hamano1-1/+1
2011-11-08Merge branch 'fc/remote-seturl-usage-fix'Junio C Hamano1-1/+1
2011-11-08Sync with 1.7.7.3Junio C Hamano5-50/+67
2011-11-08Git 1.7.7.3v1.7.7.3Junio C Hamano3-2/+21
2011-11-08Merge branch 'jc/maint-remove-renamed-ref' into maintJunio C Hamano1-8/+0
2011-11-08Merge branch 'jm/maint-gitweb-filter-forks-fix' into maintJunio C Hamano1-1/+1
2011-11-08Merge branch 'dm/pack-objects-update' into maintJunio C Hamano1-19/+55
2011-11-08docs: Update install-doc-quickJunio C Hamano3-50/+46
2011-11-08docs: don't mention --quiet or --exit-code in git-log(1)Jeff King1-0/+2
2011-11-07Git 1.7.8-rc1v1.7.8-rc1Junio C Hamano2-2/+6
2011-11-07Merge branch 'ss/blame-textconv-fake-working-tree'Junio C Hamano1-4/+3
2011-11-07blame.c: Properly initialize strbuf after calling textconv_object(), againSebastian Schuberth1-4/+3
2011-11-06Merge branch 'ab/i18n-test-fix'Junio C Hamano2-3/+3
2011-11-06Merge branch 'sn/http-auth-with-netrc-fix'Junio C Hamano1-4/+3
2011-11-06Merge branch 'pw/p4-appledouble-fix'Junio C Hamano2-0/+44
2011-11-06remote: fix remote set-url usageFelipe Contreras1-1/+1
2011-11-06remote: fix set-branches usageJunio C Hamano1-1/+1
2011-11-05git-p4: ignore apple filetypePete Wyckoff2-0/+44
2011-11-05t/t7508-status.sh: use test_i18ncmpÆvar Arnfjörð Bjarmason1-2/+2
2011-11-05t/t6030-bisect-porcelain.sh: use test_i18ngrepÆvar Arnfjörð Bjarmason1-1/+1
2011-11-04http: don't always prompt for passwordStefan Naewe1-4/+3
2011-11-03receive-pack: do not expect object 0{40} to existJunio C Hamano1-6/+11
2011-11-02t3200: add test case for 'branch -m'Stefan Naewe1-0/+5
2011-11-02branch -m: handle no arg properlyTay Ray Chuan1-5/+8
2011-11-01Update draft release notes to 1.7.8Junio C Hamano1-55/+11
2011-11-01Sync with 1.7.7.2Junio C Hamano2-1/+45
2011-11-01Git 1.7.7.2v1.7.7.2Junio C Hamano2-1/+45
2011-11-01Merge branch 'rs/maint-estimate-cache-size' into maintJunio C Hamano1-1/+1
2011-11-01Merge branch 'md/smtp-tls-hello-again' into maintJunio C Hamano1-1/+1
2011-11-01Merge branch 'jk/pull-rebase-with-work-tree' into maintJunio C Hamano2-2/+2
2011-11-01Merge branch 'jc/maint-diffstat-numstat-context' into maintJunio C Hamano1-0/+2
2011-11-01Merge branch 'js/bisect-no-checkout' into maintJunio C Hamano1-1/+2
2011-11-01Merge branch 'bc/attr-ignore-case' into maintJunio C Hamano11-36/+92
2011-11-01Merge branch 'cn/fetch-prune' into maintJunio C Hamano5-55/+137
2011-11-01Merge branch 'sp/smart-http-failure' into maintJunio C Hamano1-1/+8
2011-11-01Merge jn/maint-http-error-messageJunio C Hamano1-2/+7
2011-11-01Merge branch 'jk/name-hash-dirent'Junio C Hamano1-1/+1
2011-11-01name-hash.c: always initialize dir_next pointerJohannes Sixt1-1/+1
2011-11-01Merge branch 'ss/blame-textconv-fake-working-tree'Junio C Hamano2-1/+14
2011-11-01Merge branch 'ef/mingw-upload-archive'Junio C Hamano7-64/+49
2011-11-01Merge branch 'dm/pack-objects-update'Junio C Hamano1-19/+55
2011-11-01Merge branch 'nd/pretty-commit-log-message'Junio C Hamano1-4/+6
2011-11-01svn: Quote repository root in regex matchTed Percival1-2/+2
2011-11-01mingw: poll.h is no longer in sys/Erik Faye-Lund1-1/+1
2011-10-31t7511: avoid use of reserved filename on Windows.Pat Thoyts1-1/+1
2011-10-30Git 1.7.8-rc0v1.7.8-rc0Junio C Hamano2-2/+2
2011-10-30Merge branch 'jk/git-tricks'Junio C Hamano5-0/+355
2011-10-30upload-archive: use start_command instead of forkErik Faye-Lund4-55/+31
2011-10-30compat/win32/poll.c: upgrade from upstreamErik Faye-Lund1-6/+13
2011-10-30mingw: move poll out of sys-folderErik Faye-Lund3-2/+4
2011-10-28(squash) test for previousJunio C Hamano1-0/+11
2011-10-28blame.c: Properly initialize strbuf after calling, textconv_object()Sebastian Schuberth1-1/+3
2011-10-27Update draft release notes to 1.7.8Junio C Hamano1-3/+1
2011-10-27Merge branch 'sn/complete-bash-wo-process-subst'Junio C Hamano1-1/+2
2011-10-27Merge branch 'rj/gitweb-clean-js'Junio C Hamano1-1/+3
2011-10-27Merge branch 'js/grep-mutex'Junio C Hamano1-11/+26
2011-10-27Merge branch 'maint'Junio C Hamano3-5/+55
2011-10-27Merge branch 'rs/maint-estimate-cache-size' into maintJunio C Hamano2-3/+53
2011-10-27clone: Quote user supplied path in a single quote pairRichard Hartmann1-2/+2
2011-10-26Merge branch 'maint'Junio C Hamano1-2/+6
2011-10-26Update draft release notes to 1.7.8Junio C Hamano1-1/+17
2011-10-26Merge branch 'tc/submodule-clone-name-detection'Junio C Hamano1-4/+4
2011-10-26Merge branch 'lh/gitweb-site-html-head'Junio C Hamano5-0/+17
2011-10-26Merge branch 'mm/mediawiki-author-fix'Junio C Hamano1-0/+4
2011-10-26Merge branch 'jn/libperl-git-config'Junio C Hamano3-65/+33
2011-10-26Merge branch 'jm/maint-gitweb-filter-forks-fix'Junio C Hamano1-1/+1
2011-10-26Merge branch 'cn/fetch-prune'Junio C Hamano5-55/+137
2011-10-26Merge branch 'jn/gitweb-highlite-sanitise' into maintJunio C Hamano1-1/+13
2011-10-26Merge branch 'jk/argv-array' into maintJunio C Hamano11-107/+261
2011-10-26Merge branch 'jc/run-receive-hook-cleanup' into maintJunio C Hamano1-19/+52
2011-10-26Merge branch 'cn/eradicate-working-copy' into maintJunio C Hamano4-6/+6
2011-10-26Merge branch 'maint-1.7.6' into maintJunio C Hamano10-93/+166
2011-10-26Merge branch 'mh/maint-notes-merge-pathbuf-fix' into maint-1.7.6Junio C Hamano1-1/+2
2011-10-26Merge branch 'ps/gitweb-js-with-lineno' into maint-1.7.6Junio C Hamano1-4/+4
2011-10-26Merge branch 'jm/mergetool-pathspec' into maint-1.7.6Junio C Hamano3-70/+71
2011-10-26Merge branch 'mz/remote-rename' into maint-1.7.6Junio C Hamano2-7/+52
2011-10-26Merge branch 'rj/maint-t9159-svn-rev-notation' into maint-1.7.6Junio C Hamano1-0/+8
2011-10-26Merge branch 'hl/iso8601-more-zone-formats' into maint-1.7.6Junio C Hamano2-11/+29
2011-10-26Merge branch 'maint-1.7.6' into maintJunio C Hamano7-32/+46
2011-10-26Merge branch 'tr/doc-note-rewrite' into maint-1.7.6Junio C Hamano1-1/+2
2011-10-26Merge branch 'nd/sparse-doc' into maint-1.7.6Junio C Hamano1-2/+2
2011-10-26Merge branch 'mg/maint-doc-sparse-checkout' into maint-1.7.6Junio C Hamano4-25/+31
2011-10-26Merge branch 'maint-1.7.5' into maint-1.7.6Junio C Hamano3-5/+12
2011-10-26Merge branch 'maint-1.7.4' into maint-1.7.5Junio C Hamano3-5/+12
2011-10-26Merge branch 'maint-1.7.3' into maint-1.7.4Junio C Hamano3-5/+12
2011-10-26Merge branch 'sn/doc-update-index-assume-unchanged' into maint-1.7.3Junio C Hamano1-2/+5
2011-10-26read-cache.c: fix index memory allocationRené Scharfe2-3/+53
2011-10-26make the sample pre-commit hook script reject names with newlines, tooJim Meyering1-2/+6
2011-10-26completion: fix issue with process substitution not working on Git for WindowsStefan Naewe1-1/+2
2011-10-26gitweb/Makefile: Remove static/gitweb.js in the clean targetRamsay Jones1-1/+3
2011-10-26builtin/grep: simplify lock_and_read_sha1_file()Junio C Hamano1-7/+3
2011-10-26builtin/grep: make lock/unlock into static inline functionsJunio C Hamano1-5/+23
2011-10-26git grep: be careful to use mutexes only when they are initializedJohannes Schindelin1-4/+5
2011-10-23Merge branch 'maint'Junio C Hamano1-1/+1
2011-10-23Merge branch 'maint-1.7.3' into maintJunio C Hamano1-1/+1
2011-10-23Reindent closing bracket using tab instead of spacesNguyễn Thái Ngọc Duy1-1/+1
2011-10-23Merge branch 'maint'Junio C Hamano2-3/+5
2011-10-23Git 1.7.7.1v1.7.7.1Junio C Hamano2-2/+3
2011-10-23pretty.c: use original commit message if reencoding failsNguyễn Thái Ngọc Duy1-1/+4
2011-10-23pretty.c: free get_header() return valueNguyễn Thái Ngọc Duy1-4/+3
2011-10-23RelNotes/1.7.7.1: setgid bit patch is about fixing "git init" via Makefile se...Jonathan Nieder1-2/+3
2011-10-21Update draft release notes to 1.7.8Junio C Hamano1-2/+21
2011-10-21Merge branch 'po/insn-editor'Junio C Hamano2-1/+20
2011-10-21Merge branch 'jc/broken-ref-dwim-fix'Junio C Hamano3-100/+104
2011-10-21Merge branch 'mh/ref-api'Junio C Hamano2-28/+39
2011-10-21Merge branch 'jc/match-refs-clarify'Junio C Hamano6-15/+18
2011-10-21Merge branch 'jc/make-tags'Junio C Hamano1-3/+7
2011-10-21Merge branch 'ss/inet-ntop'Junio C Hamano1-0/+2
2011-10-21Merge branch 'jc/maint-remove-renamed-ref'Junio C Hamano1-8/+0
2011-10-21Merge branch 'pw/p4-update'Junio C Hamano6-423/+919
2011-10-21Merge branch 'cn/doc-config-bare-subsection'Junio C Hamano1-3/+4
2011-10-21Merge branch 'jk/maint-pack-objects-compete-with-delete'Junio C Hamano3-2/+7
2011-10-21Merge branch 'jk/daemon-msgs'Junio C Hamano2-8/+31
2011-10-21Merge branch 'sc/difftool-skip'Junio C Hamano2-4/+48
2011-10-21Merge branch 'jc/unseekable-bundle'Junio C Hamano3-59/+90
2011-10-21Merge branch 'ph/transport-with-gitfile'Junio C Hamano5-20/+58
2011-10-21gitweb: fix regression when filtering out forksJulien Muchembled1-1/+1
2011-10-21Add simple test for Git::config_path() in t/t9700-perl-git.shJakub Narebski2-1/+9
2011-10-21completion: match ctags symbol names in grep patternsJeff King1-0/+13
2011-10-21contrib: add git-jump scriptJeff King2-0/+161
2011-10-21Sync with maintJunio C Hamano2-24/+20
2011-10-21Almost ready for 1.7.7.1Junio C Hamano1-0/+20
2011-10-21Merge branch 'nd/maint-autofix-tag-in-head' into maintJunio C Hamano7-65/+93
2011-10-21Merge branch 'jc/apply-blank-at-eof-fix' into maintJunio C Hamano1-2/+9
2011-10-21Merge branch 'jn/no-g-plus-s-on-bsd' into maintJunio C Hamano1-0/+1
2011-10-21Merge branch 'rs/diff-cleanup-records-fix' into maintJunio C Hamano3-3/+15
2011-10-21Merge branch 'il/archive-err-signal' into maintJunio C Hamano1-0/+2
2011-10-21Merge branch 'js/maint-merge-one-file-osx-expr' into maintJunio C Hamano1-1/+1
2011-10-21Merge branch 'jm/maint-apply-detects-corrupt-patch-header' into maintJunio C Hamano2-0/+46
2011-10-21Merge branch 'jc/checkout-from-tree-keep-local-changes' into maintJunio C Hamano2-1/+47
2011-10-21Merge branch 'mm/maint-config-explicit-bool-display' into maintJunio C Hamano2-7/+19
2011-10-21gitweb: provide a way to customize html headersLénaïc Huard5-0/+17
2011-10-21submodule::module_clone(): silence die() message from module_name()Tay Ray Chuan1-1/+1
2011-10-21submodule: whitespace fixTay Ray Chuan1-3/+3
2011-10-20pack-objects: don't traverse objects unnecessarilyDan McGee1-6/+12
2011-10-20tests: add missing executable bitsJeff King2-0/+0
2011-10-20git-remote-mediawiki: don't include HTTP login/password in authorMatthieu Moy1-0/+4
2011-10-19resolve_ref(): report breakage to the caller without warningJunio C Hamano1-7/+11
2011-10-19resolve_ref(): expose REF_ISBROKEN flagJunio C Hamano2-9/+9
2011-10-19Update draft release notes to 1.7.8Junio C Hamano1-2/+22
2011-10-19t/t3000-ls-files-others.sh: use $SHELL_PATH to run git-new-workdir scriptBrandon Casey1-1/+1
2011-10-19Merge branch 'js/merge-edit-option'Junio C Hamano3-39/+99
2011-10-19Merge branch 'rs/diff-whole-function'Junio C Hamano6-16/+175
2011-10-19Merge branch 'rs/pickaxe'Junio C Hamano1-108/+70
2011-10-19Merge branch 'js/no-cherry-pick-head-after-punted'Junio C Hamano2-7/+31
2011-10-19Merge branch 'bk/submodule-in-recursive-merge'Junio C Hamano4-4/+61
2011-10-19Merge branch 'jm/maint-apply-detects-corrupt-patch-header'Junio C Hamano2-0/+46
2011-10-19Merge branch 'jk/config-test-cleanup'Junio C Hamano1-12/+7
2011-10-19t1300: attempting to remove a non-existent .git/config is not an errorJohannes Sixt1-12/+7
2011-10-18Merge branch 'js/log-show-children'Junio C Hamano1-0/+12
2011-10-18Merge branch 'cb/httpd-test-fix-port'Junio C Hamano1-1/+1
2011-10-18Merge branch 'jn/gitweb-manpages'Junio C Hamano9-479/+1649
2011-10-18Merge branch 'pt/mingw-misc-fixes'Junio C Hamano8-29/+41
2011-10-18Merge branch 'md/smtp-tls-hello-again'Junio C Hamano1-1/+1
2011-10-18Merge branch 'maint'Junio C Hamano1-1/+0
2011-10-18strbuf.c: remove unnecessary strbuf_grow() from strbuf_getwholeline()Brandon Casey1-1/+0
2011-10-18libperl-git: refactor Git::config_*Junio C Hamano1-64/+24
2011-10-18inet_ntop.c: Work around GCC 4.6's detection of uninitialized variablesSebastian Schuberth1-0/+2
2011-10-18Makefile: ask "ls-files" to list source files if availableJunio C Hamano1-3/+7
2011-10-18pack-objects: rewrite add_descendants_to_write_order() iterativelyDan McGee1-7/+37
2011-10-18pack-objects: use unsigned int for counter and offset valuesDan McGee1-6/+6
2011-10-18pack-objects: mark add_to_write_order() as inlineDan McGee1-1/+1
2011-10-18contrib: add diff highlight scriptJeff King2-0/+181
2011-10-17Update draft release notes to 1.7.8Junio C Hamano1-1/+37
2011-10-17Merge branch 'jk/http-auth'Junio C Hamano9-69/+130
2011-10-17Merge branch 'js/check-ref-format-test-mingw'Junio C Hamano1-36/+52
2011-10-17Merge branch 'jk/pull-rebase-with-work-tree'Junio C Hamano2-2/+2
2011-10-17Merge branch 'jk/config-test-cleanup'Junio C Hamano1-83/+120
2011-10-17Merge branch 'bc/attr-ignore-case'Junio C Hamano10-34/+90
2011-10-17Merge branch 'sg/completion'Junio C Hamano1-18/+6
2011-10-17Merge branch 'mm/maint-config-explicit-bool-display'Junio C Hamano2-7/+19
2011-10-17Merge branch 'tc/fetch-leak'Junio C Hamano1-4/+9
2011-10-17Merge branch 'jk/name-hash-dirent'Junio C Hamano2-7/+9
2011-10-17Merge branch 'ef/mingw-syslog'Junio C Hamano1-12/+18
2011-10-17Merge branch 'tm/completion-push-set-upstream'Junio C Hamano1-1/+1
2011-10-17Merge branch 'tm/completion-commit-fixup-squash'Junio C Hamano1-7/+4
2011-10-17Merge branch 'ph/push-to-delete-nothing'Junio C Hamano2-8/+215
2011-10-17Merge branch 'jc/checkout-from-tree-keep-local-changes'Junio C Hamano2-1/+47
2011-10-17Merge branch 'js/bisect-no-checkout'Junio C Hamano1-1/+2
2011-10-17git-p4: stop ignoring apple filetypePete Wyckoff1-5/+0
2011-10-17git-p4: handle files with shell metacharactersLuke Diamand2-77/+187
2011-10-17git-p4: recognize all p4 filetypesPete Wyckoff1-19/+52
2011-10-17git-p4: keyword flattening fixesPete Wyckoff1-2/+6
2011-10-17git-p4: handle utf16 filetype properlyPete Wyckoff2-0/+119
2011-10-17git-p4 tests: refactor and cleanupPete Wyckoff3-324/+559
2011-10-17"rebase -i": support special-purpose editor to edit insn sheetPeter Oberndorfer2-1/+20
2011-10-17use test number as port numberClemens Buchacher1-1/+1
2011-10-17resolve_gitlink_packed_ref(): fix mismergeJunio C Hamano2-1/+30
2011-10-16clear_ref_cache(): inline functionMichael Haggerty1-7/+3
2011-10-16write_ref_sha1(): only invalidate the loose ref cacheMichael Haggerty1-1/+1
2011-10-16clear_ref_cache(): extract two new functionsMichael Haggerty1-4/+15
2011-10-16clear_ref_cache(): rename parameterMichael Haggerty1-6/+6