summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2011-12-21Git 1.7.8.1v1.7.8.1Junio C Hamano1-4/+25
2011-12-21Merge branch 'jl/submodule-status-failure-report' into maintJunio C Hamano1-2/+2
2011-12-21Merge branch 'tr/userdiff-c-returns-pointer' into maintJunio C Hamano1-1/+1
2011-12-21Merge branch 'bc/maint-apply-check-no-patch' into maintJunio C Hamano3-6/+25
2011-12-21Merge branch 'cn/maint-lf-to-crlf-filter' into maintJunio C Hamano1-14/+40
2011-12-21Merge branch 'jk/maint-upload-archive' into maintJunio C Hamano2-4/+22
2011-12-21clone: the -o option has nothing to do with <branch>Carlos Martín Nieto1-2/+2
2011-12-21builtin/log: remove redundant initializationMichael Schubert1-2/+0
2011-12-21Merge branch 'ms/commit-cc-option-helpstring' into maintJunio C Hamano1-1/+1
2011-12-21builtin/commit: add missing '/' in help messageMichael Schubert1-1/+1
2011-12-20builtin/init-db.c: eliminate -Wformat warning on SolarisÆvar Arnfjörð Bjarmason1-1/+1
2011-12-16lf_to_crlf_filter(): tell the caller we added "\n" when drainingJunio C Hamano1-5/+7
2011-12-13Update draft release notes for 1.7.8.1Junio C Hamano2-1/+18
2011-12-13Merge branch 'jc/maint-pack-object-cycle' into maintJunio C Hamano1-12/+43
2011-12-13Merge branch 'jc/index-pack-reject-dups' into maintJunio C Hamano4-2/+11
2011-12-13Merge branch 'mf/curl-select-fdset' into maintJunio C Hamano2-27/+21
2011-12-13Merge branch 'nd/misc-cleanups' into maintJunio C Hamano10-95/+112
2011-12-13Merge branch 'maint-1.7.7' into maintJunio C Hamano10-48/+101
2011-12-13Git 1.7.7.5v1.7.7.5Junio C Hamano4-3/+21
2011-12-13Merge branch 'ab/clang-lints' into maint-1.7.7Junio C Hamano3-5/+2
2011-12-13Merge branch 'nd/maint-ignore-exclude' into maint-1.7.7Junio C Hamano2-2/+2
2011-12-13Merge branch 'maint-1.7.6' into maint-1.7.7Junio C Hamano4-40/+78
2011-12-13Git 1.7.6.5v1.7.6.5Junio C Hamano4-3/+30
2011-12-13Merge branch 'jk/maint-fetch-status-table' into maint-1.7.6Junio C Hamano1-38/+49
2011-12-13Merge branch 'jc/maint-name-rev-all' into maint-1.7.6Junio C Hamano1-1/+1
2011-12-13Merge branch 'ml/mailmap' into maint-1.7.6Junio C Hamano1-3/+2
2011-12-13blame: don't overflow time bufferJeff King1-1/+1
2011-12-09fetch: create status table using strbufJeff King1-38/+49
2011-12-09Merge branch 'maint-1.7.7' into maintJunio C Hamano4-15/+5
2011-12-09am: don't persist keepcr flagMartin von Zweigbergk1-7/+0
2011-12-09mingw: give waitpid the correct signatureErik Faye-Lund2-2/+2
2011-12-08diff/status: print submodule path when looking for changes failsJens Lehmann1-2/+2
2011-12-08git symbolic-ref: documentation fixMichael Haggerty1-6/+3
2011-12-06userdiff: allow * between cpp funcname wordsThomas Rast1-1/+1
2011-12-05Merge branch 'maint-1.7.7' into maintJunio C Hamano2-2/+1
2011-12-05Merge branch 'maint-1.7.6' into maint-1.7.7Junio C Hamano2-2/+1
2011-12-05stripspace: fix outdated commentJeff King1-2/+0
2011-12-05Add MYMETA.yml to perl/.gitignoreSebastian Morr1-0/+1
2011-12-05builtin/apply.c: report error on failure to recognize inputBrandon Casey2-5/+24
2011-12-05t/t4131-apply-fake-ancestor.sh: fix broken testBrandon Casey1-1/+1
2011-12-05Merge branch 'js/merge-edit-option'Junio C Hamano1-1/+0
2011-12-05Documentation: fix formatting error in merge-options.txtJack Nagel1-1/+0
2011-12-02Git 1.7.8v1.7.8Junio C Hamano3-11/+8
2011-11-28Git 1.7.8-rc4v1.7.8-rc4Junio C Hamano2-2/+2
2011-11-28convert: track state in LF-to-CRLF filterCarlos Martín Nieto1-13/+37
2011-11-28checkout,merge: loosen overwriting untracked file check based on info/excludeNguyễn Thái Ngọc Duy2-2/+2
2011-11-23builtin-reset: Documentation updateVincent van Ravesteijn1-4/+4
2011-11-23builtin-branch: Fix crash on invalid use of --forceVincent van Ravesteijn1-2/+2
2011-11-23revert --abort: do not leave behind useless sequencer-old directoryJonathan Nieder2-0/+9
2011-11-23Fix revert --abort on WindowsJohannes Sixt1-2/+2
2011-11-23revert: do not pass non-literal string as format to git_path()Nguyễn Thái Ngọc Duy1-1/+1
2011-11-22Update 1.7.8 draft release notes in preparation for rc4Junio C Hamano1-1/+1
2011-11-22Merge branch 'jn/revert-quit'Junio C Hamano10-54/+314
2011-11-22revert: remove --reset compatibility optionJonathan Nieder2-5/+2
2011-11-22revert: introduce --abort to cancel a failed cherry-pickJonathan Nieder5-3/+185
2011-11-22revert: write REVERT_HEAD pseudoref during conflicted revertJonathan Nieder4-3/+61
2011-11-22revert: improve error message for cherry-pick during cherry-pickJonathan Nieder1-7/+6
2011-11-22revert: rearrange pick_revisions() for clarityJonathan Nieder1-24/+24
2011-11-22revert: rename --reset option to --quitJonathan Nieder7-25/+49
2011-11-21Merge branch 'jk/maint-1.6.2-upload-archive' into jk/maint-upload-archiveJunio C Hamano2-4/+22
2011-11-21archive: don't let remote clients get unreachable commitsJeff King5-8/+27
2011-11-21Merge branch 'maint'Junio C Hamano1-1/+1
2011-11-21Merge branch 'rr/misc-fixes'Junio C Hamano1-1/+1
2011-11-21convert.c: Fix return type of git_path_check_eol()Ramsay Jones1-1/+1
2011-11-21documentation fix: git difftool uses diff tools, not merge tools.Thomas Hochstein1-1/+1
2011-11-20config.c: Fix a static buffer overwrite bug by avoiding mkpath()Ramsay Jones1-2/+2
2011-11-20t5501-*.sh: Fix url passed to clone in setup testRamsay Jones1-1/+1
2011-11-18Hopefully final update of release notes before 1.7.8 finalJunio C Hamano1-1/+1
2011-11-18Merge branch 'rr/misc-fixes'Junio C Hamano4-13/+5
2011-11-18Makefile: add option to disable automatic dependency generationJonathan Nieder1-7/+24
2011-11-18Sync with 1.7.7.4Junio C Hamano5-49/+81
2011-11-18Git 1.7.7.4v1.7.7.4Junio C Hamano3-2/+16
2011-11-18Merge branch 'jc/maint-name-rev-all' into maintJunio C Hamano1-1/+1
2011-11-18Merge branch 'ml/mailmap' into maintJunio C Hamano1-3/+2
2011-11-18Merge branch 'jn/maint-notes-avoid-va-args' into maintJunio C Hamano1-43/+61
2011-11-18Makefile: add missing header file dependenciesJonathan Nieder1-2/+3
2011-11-17notes merge: eliminate OUTPUT macroJonathan Nieder1-43/+61
2011-11-17do not let git_path clobber errno when reporting errorsJonathan Nieder2-24/+34
2011-11-17Git 1.7.8-rc3v1.7.8-rc3Junio C Hamano2-5/+2
2011-11-16pack-object: tolerate broken packs that have duplicated objectsJunio C Hamano1-12/+43
2011-11-16receive-pack, fetch-pack: reject bogus pack that records objects twiceJunio C Hamano4-2/+11
2011-11-16refs: loosen over-strict "format" checkJunio C Hamano2-10/+17
2011-11-16mailmap: xcalloc mailmap_infoMarc-André Lureau1-3/+2
2011-11-15revert: prettify fatal messagesRamkumar Ramachandra1-5/+5
2011-11-15git-compat-util: don't assume value for undefined variableRamkumar Ramachandra1-1/+1
2011-11-15sha1_file: don't mix enum with intRamkumar Ramachandra1-1/+1
2011-11-15convert: don't mix enum with intRamkumar Ramachandra1-3/+3
2011-11-15http: remove unused function hex()Ramkumar Ramachandra1-8/+0
2011-11-15name-rev --all: do not even attempt to describe non-commit objectJunio C Hamano1-1/+1
2011-11-15Revert "upload-archive: use start_command instead of fork"Junio C Hamano4-31/+55
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-06cast variable in call to free() in builtin/diff.c and submodule.cÆvar Arnfjörð Bjarmason2-2/+2
2011-11-06apply: get rid of useless x < 0 comparison on a size_t typeÆvar Arnfjörð Bjarmason1-3/+0
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: drop "local" member from request structJeff King2-7/+0
2011-11-04http.c: Rely on select instead of tracking whether data was receivedMika Fischer2-16/+1
2011-11-04http.c: Use timeout suggested by curl instead of fixed 50ms timeoutMika Fischer1-2/+18
2011-11-04http.c: Use curl_multi_fdset to select on curl fds instead of just sleepingMika Fischer1-3/+3
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-27unpack_object_header_buffer(): clear the size field upon errorJunio C Hamano1-1/+2
2011-10-27tree_entry_interesting: make use of local pointer "item"Nguyễn Thái Ngọc Duy1-2/+2
2011-10-27tree_entry_interesting(): give meaningful names to return valuesNguyễn Thái Ngọc Duy6-44/+56
2011-10-27read_directory_recursive: reduce one indentation levelNguyễn Thái Ngọc Duy1-25/+25
2011-10-27get_tree_entry(): do not call find_tree_entry() on an empty treeJunio C Hamano1-3/+7
2011-10-27tree-walk.c: do not leak internal structure in tree_entry_len()Nguyễn Thái Ngọc Duy7-20/+20
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