summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2015-09-28Git 2.4.10v2.4.10Junio C Hamano4-3/+22
2015-09-28Sync with 2.3.10Junio C Hamano27-28/+446
2015-09-28Git 2.3.10v2.3.10Junio C Hamano4-3/+22
2015-09-28Merge branch 'jk/xdiff-memory-limits' into maint-2.3Junio C Hamano11-26/+57
2015-09-28merge-file: enforce MAX_XDIFF_SIZE on incoming filesJeff King1-1/+2
2015-09-28xdiff: reject files larger than ~1GBJeff King3-1/+14
2015-09-28react to errors in xdi_diffJeff King7-24/+41
2015-09-28Merge branch 'jk/transfer-limit-redirection' into maint-2.3Junio C Hamano6-15/+78
2015-09-28Merge branch 'jk/transfer-limit-protocol' into maint-2.3Junio C Hamano13-1/+306
2015-09-25http: limit redirection depthBlake Burkhart3-0/+8
2015-09-25http: limit redirection to protocol-whitelistBlake Burkhart4-5/+27
2015-09-25transport: refactor protocol whitelist codeJeff King2-10/+43
2015-09-23submodule: allow only certain protocols for submodule fetchesJeff King2-0/+52
2015-09-23transport: add a protocol-whitelist environment variableJeff King11-1/+254
2015-09-04Git 2.4.9v2.4.9Junio C Hamano4-3/+13
2015-09-04Sync with 2.3.9Junio C Hamano7-26/+49
2015-09-04Git 2.3.9v2.3.9Junio C Hamano4-3/+13
2015-09-04Sync with 2.2.3Junio C Hamano6-25/+38
2015-09-04Git 2.2.3v2.2.3Junio C Hamano4-3/+13
2015-09-04Merge branch 'jk/long-paths' into maint-2.2Junio C Hamano4-24/+27
2015-09-04show-branch: use a strbuf for reflog descriptionsJeff King1-2/+4
2015-09-04read_info_alternates: handle paths larger than PATH_MAXJeff King1-6/+3
2015-09-04notes: use a strbuf in add_non_noteJeff King1-9/+10
2015-09-04verify_absent: allow filenames longer than PATH_MAXJeff King1-7/+10
2015-08-03Git 2.4.8v2.4.8Junio C Hamano4-5/+25
2015-08-03Merge branch 'js/rebase-i-clean-up-upon-continue-to-skip' into maintJunio C Hamano2-1/+26
2015-08-03Merge branch 'ss/clone-guess-dir-name-simplify' into maintJunio C Hamano1-13/+6
2015-08-03Merge branch 'sg/completion-commit-cleanup' into maintJunio C Hamano1-1/+1
2015-08-03Merge branch 'pt/am-abort-fix' into maintJunio C Hamano2-8/+104
2015-08-03Merge branch 'mh/reporting-broken-refs-from-for-each-ref' into maintJunio C Hamano3-7/+83
2015-08-03Merge branch 'sg/commit-cleanup-scissors' into maintJunio C Hamano2-5/+28
2015-07-27Git 2.4.7v2.4.7Junio C Hamano4-3/+57
2015-07-27Merge branch 'jk/pretty-encoding-doc' into maintJunio C Hamano1-1/+4
2015-07-27Merge branch 'tb/checkout-doc' into maintJunio C Hamano1-1/+5
2015-07-27Merge branch 'ls/hint-rev-list-count' into maintJunio C Hamano2-0/+2
2015-07-27Merge branch 'mm/branch-doc-updates' into maintJunio C Hamano1-2/+6
2015-07-27Merge branch 'jc/fsck-retire-require-eoh' into maintJunio C Hamano1-4/+13
2015-07-27Merge branch 'et/http-proxyauth' into maintJunio C Hamano1-2/+2
2015-07-27Merge branch 'jc/unexport-git-pager-in-use-in-pager' into maintJunio C Hamano1-0/+1
2015-07-27Merge branch 'mh/strbuf-read-file-returns-ssize-t' into maintJunio C Hamano2-3/+4
2015-07-27Merge branch 'kb/config-unmap-before-renaming' into maintJunio C Hamano1-0/+3
2015-07-27Merge branch 'jk/rev-list-no-bitmap-while-pruning' into maintJunio C Hamano2-1/+7
2015-07-27Merge branch 'rh/test-color-avoid-terminfo-in-original-home' into maintJunio C Hamano1-52/+47
2015-07-27Merge branch 'jk/fix-refresh-utime' into maintJunio C Hamano1-1/+9
2015-07-27Merge branch 'cb/rebase-am-exit-code' into maintJunio C Hamano1-1/+1
2015-07-27Merge branch 'jk/index-pack-reduce-recheck' into maintJunio C Hamano3-3/+14
2015-07-15Git 2.4.6v2.4.6Junio C Hamano4-3/+27
2015-07-15Merge branch 'mm/describe-doc' into maintJunio C Hamano1-1/+1
2015-07-15Merge branch 'jc/prompt-document-ps1-state-separator' into maintJunio C Hamano1-0/+4
2015-07-15Merge branch 'es/osx-header-pollutes-mask-macro' into maintJunio C Hamano4-29/+29
2015-07-15Merge branch 'es/utf8-stupid-compiler-workaround' into maintJunio C Hamano1-1/+3
2015-07-15Merge branch 'fk/doc-format-patch-vn' into maintJunio C Hamano1-1/+1
2015-07-15Merge branch 'pt/t0302-needs-sanity' into maintJunio C Hamano1-1/+1
2015-07-15Merge branch 'me/fetch-into-shallow-safety' into maintJunio C Hamano1-1/+1
2015-07-15Merge branch 'mh/fsck-reflog-entries' into maintJunio C Hamano1-14/+20
2015-07-15Merge branch 'af/tcsh-completion-noclobber' into maintJunio C Hamano1-1/+1
2015-07-15Merge branch 'pa/auto-gc-mac-osx' into maintJunio C Hamano1-1/+1
2015-07-15Merge branch 'jc/do-not-feed-tags-to-clear-commit-marks' into maintJunio C Hamano2-6/+14
2015-07-09clone: simplify string handling in guess_dir_name()Sebastian Schuberth1-13/+6
2015-07-08check_and_freshen_file: fix reversed success-checkJeff King1-1/+9
2015-07-08rebase: return non-zero error code if format-patch failsClemens Buchacher1-1/+1
2015-07-06Documentation/branch: document -M and -D in terms of --forceMatthieu Moy1-2/+2
2015-07-06Documentation/branch: document -d --force and -m --forceMatthieu Moy1-0/+4
2015-07-03strbuf: strbuf_read_file() should return ssize_tMichael Haggerty2-3/+4
2015-07-03pager: do not leak "GIT_PAGER_IN_USE" to the pagerJunio C Hamano1-0/+1
2015-07-01rev-list: disable --use-bitmap-index when pruning commitsJeff King2-1/+7
2015-07-01rev-list: add --count to usage guideLawrence Siebert2-0/+2
2015-06-30config.c: fix writing config files on Windows network sharesKarsten Blees1-0/+3
2015-06-29rebase -i: do not leave a CHERRY_PICK_HEAD file behindJohannes Schindelin2-2/+6
2015-06-29t3404: demonstrate CHERRY_PICK_HEAD bugJohannes Schindelin1-0/+21
2015-06-29http: always use any proxy auth method availableEnrique Tobis1-2/+2
2015-06-28fsck: it is OK for a tag and a commit to lack the bodyJunio C Hamano1-4/+13
2015-06-25Merge branch 'jk/stash-require-clean-index' into maintJunio C Hamano2-9/+0
2015-06-25Merge branch 'cb/array-size' into maintJunio C Hamano1-5/+3
2015-06-25Git 2.4.5v2.4.5Junio C Hamano4-3/+32
2015-06-25Merge branch 'sg/merge-summary-config' into maintJunio C Hamano3-16/+12
2015-06-25Merge branch 'jk/make-fix-dependencies' into maintJunio C Hamano1-24/+25
2015-06-25Merge branch 'sb/pack-protocol-mention-smart-http' into maintJunio C Hamano1-3/+3
2015-06-25Merge branch 'jk/die-on-bogus-worktree-late' into maintJunio C Hamano2-10/+26
2015-06-25Merge branch 'pt/pull-tags-error-diag' into maintJunio C Hamano1-9/+0
2015-06-25Merge branch 'jk/color-diff-plain-is-context' into maintJunio C Hamano5-22/+23
2015-06-25Merge branch 'jk/diagnose-config-mmap-failure' into maintJunio C Hamano4-11/+29
2015-06-25Merge branch 'jk/squelch-missing-link-warning-for-unreachable' into maintJunio C Hamano7-9/+34
2015-06-25Merge branch 'mm/rebase-i-post-rewrite-exec' into maintJunio C Hamano2-41/+58
2015-06-24Fix definition of ARRAY_SIZE for non-gcc buildsCharles Bailey1-5/+3
2015-06-17test-lib.sh: fix color support when tput needs ~/.terminfoRichard Hansen1-29/+28
2015-06-17docs: clarify that --encoding can produce invalid sequencesJeff King1-1/+4
2015-06-17git-checkout.txt: document "git checkout <pathspec>" betterTorsten Bögershausen1-1/+5
2015-06-17Revert "test-lib.sh: do tests for color support after changing HOME"Richard Hansen1-47/+43
2015-06-17fetch-pack: check for shallow if depth givenMike Edgar1-1/+1
2015-06-16Git 2.4.4v2.4.4Junio C Hamano4-3/+39
2015-06-16Merge branch 'jk/clone-dissociate' into maintJunio C Hamano1-13/+4
2015-06-16Merge branch 'sb/submodule-doc-intro' into maintJunio C Hamano1-28/+22
2015-06-16Merge branch 'sb/glossary-submodule' into maintJunio C Hamano1-0/+16
2015-06-16Merge branch 'ah/usage-strings' into maintJunio C Hamano2-2/+2
2015-06-16Merge branch 'mc/commit-doc-grammofix' into maintJunio C Hamano1-1/+1
2015-06-16Merge branch 'rs/janitorial' into maintJunio C Hamano7-26/+9
2015-06-16Merge branch 'sb/test-bitmap-free-at-end' into maintJunio C Hamano1-1/+1
2015-06-16Merge branch 'dt/clean-pathspec-filter-then-lstat' into maintJunio C Hamano1-3/+3
2015-06-16Merge branch 'jk/http-backend-deadlock' into maintJunio C Hamano3-29/+139
2015-06-16Merge branch 'jh/filter-empty-contents' into maintJunio C Hamano2-1/+27
2015-06-16Merge branch 'jk/stash-options' into maintJunio C Hamano2-1/+20
2015-06-16Merge branch 'mm/log-format-raw-doc' into maintJunio C Hamano2-2/+14
2015-06-16Merge branch 'ep/do-not-feed-a-pointer-to-array-size' into maintJunio C Hamano1-1/+53
2015-06-16Documentation/describe: improve one-line summaryMatthieu Moy1-1/+1
2015-06-15Revert "stash: require a clean index to apply"Jeff King2-9/+0
2015-06-14Merge tag 'l10n-2.4-maint-de-updates' of git://github.com/git-l10n/git-po int...Junio C Hamano1-5/+5
2015-06-12hooks/pre-auto-gc: adjust power checking for newer OS XPanagiotis Astithas1-1/+1
2015-06-12t0302: "unreadable" test needs SANITY prereqPaul Tan1-1/+1
2015-06-12l10n: de.po: translation fix for fall-back to 3way mergeMichael J Gruber1-1/+1
2015-06-12l10n: de.po: punctuation fixesMichael J Gruber1-2/+2
2015-06-12l10n: de.po: grammar fixMichael J Gruber1-1/+1
2015-06-12l10n: de.po: change error message from "sagen" to "Meinten Sie"Phillip Sz1-1/+1
2015-06-10git-prompt.sh: document GIT_PS1_STATESEPARATORJoe Cridge1-0/+4
2015-06-10doc: format-patch: fix typoFrans Klaver1-1/+1
2015-06-09index-pack: avoid excessive re-reading of pack directoryJeff King3-3/+14
2015-06-09commit: cope with scissors lines in commit messageSZEDER Gábor2-5/+28
2015-06-09git-completion.tcsh: fix redirect with noclobberAriel Faigon1-1/+1
2015-06-08am --abort: keep unrelated commits on unborn branchPaul Tan2-1/+12
2015-06-08am --abort: support aborting to unborn branchPaul Tan2-1/+25
2015-06-08am --abort: revert changes introduced by failed 3way mergePaul Tan2-1/+28
2015-06-08am --skip: support skipping while on unborn branchPaul Tan2-3/+11
2015-06-08am -3: support 3way merge on unborn branchPaul Tan2-1/+11
2015-06-08am --skip: revert changes introduced by failed 3way mergePaul Tan2-1/+17
2015-06-08fsck: report errors if reflog entries point at invalid objectsMichael Haggerty1-4/+9
2015-06-08fsck_handle_reflog_sha1(): new functionMichael Haggerty1-14/+15
2015-06-08read_loose_refs(): treat NULL_SHA1 loose references as brokenMichael Haggerty2-1/+11
2015-06-08completion: teach 'scissors' mode to 'git commit --cleanup='SZEDER Gábor1-1/+1
2015-06-05utf8: NO_ICONV: silence uninitialized variable warningEric Sunshine1-1/+3
2015-06-05Git 2.4.3v2.4.3Junio C Hamano4-3/+80
2015-06-05Merge branch 'dl/branch-error-message' into maintJunio C Hamano1-3/+3
2015-06-05Merge branch 'jk/skip-http-tests-under-no-curl' into maintJunio C Hamano8-35/+13
2015-06-05Merge branch 'ps/doc-packfile-vs-pack-file' into maintJunio C Hamano3-9/+9
2015-06-05Merge branch 'fg/document-commit-message-stripping' into maintJunio C Hamano1-4/+7
2015-06-05Merge branch 'jk/rerere-forget-check-enabled' into maintJunio C Hamano1-0/+2
2015-06-05Merge branch 'pt/pull-log-n' into maintJunio C Hamano2-2/+19
2015-06-05Merge branch 'pt/pull-ff-vs-merge-ff' into maintJunio C Hamano3-2/+13
2015-06-05Merge branch 'rs/plug-leak-in-pack-bitmaps' into maintJunio C Hamano1-5/+3
2015-06-05Merge branch 'ja/tutorial-asciidoctor-fix' into maintJunio C Hamano1-1/+1
2015-06-05Merge branch 'jk/stripspace-asciidoctor-fix' into maintJunio C Hamano1-3/+3
2015-06-05Merge branch 'jk/asciidoc-markup-fix' into maintJunio C Hamano19-102/+107
2015-06-05Merge branch 'ps/bundle-verify-arg' into maintJunio C Hamano1-0/+8
2015-06-05Merge branch 'mh/write-refs-sooner-2.4' into maintJunio C Hamano3-33/+112
2015-06-05Merge branch 'mh/ref-directory-file' into maintJunio C Hamano3-118/+312
2015-06-05Merge branch 'mg/log-decorate-HEAD' into maintJunio C Hamano2-11/+22
2015-06-05Merge branch 'sb/t1020-cleanup' into maintJunio C Hamano1-4/+7
2015-06-05Merge branch 'jc/gitignore-precedence' into maintJunio C Hamano2-3/+17
2015-06-05Merge branch 'bc/connect-plink' into maintJunio C Hamano2-22/+67
2015-06-05Merge branch 'ph/rebase-i-redo' into maintJunio C Hamano2-0/+63
2015-06-05Merge branch 'jk/add-e-kill-editor' into maintJunio C Hamano2-1/+9
2015-06-05Merge branch 'mh/clone-verbosity-fix' into maintJunio C Hamano1-2/+2
2015-06-05Merge branch 'jk/sha1-file-reduce-useless-warnings' into maintJunio C Hamano2-6/+2
2015-06-05Merge branch 'tb/blame-resurrect-convert-to-git' into maintJunio C Hamano2-3/+16
2015-06-05Merge branch 'jc/plug-fmt-merge-msg-leak' into maintJunio C Hamano1-5/+11
2015-06-05Merge branch 'pt/xdg-config-path' into maintJunio C Hamano10-81/+243
2015-06-03read_loose_refs(): simplify function logicMichael Haggerty1-7/+12
2015-06-03ewah: use less generic macro nameJeff King4-23/+23
2015-06-03ewah/bitmap: silence warning about MASK macro redefinitionEric Sunshine1-8/+8
2015-06-02Documentation/technical/pack-protocol: mention http as possible protocolStefan Beller1-3/+3
2015-06-02for-each-ref: report broken references correctlyMichael Haggerty2-1/+6
2015-06-02t6301: new tests of for-each-ref error handlingMichael Haggerty1-0/+56
2015-06-01format-patch: do not feed tags to clear_commit_marks()Junio C Hamano2-6/+14
2015-06-01suppress errors on missing UNINTERESTING linksJeff King1-1/+1
2015-06-01silence broken link warnings with revs->ignore_missing_linksJeff King3-2/+17
2015-06-01add quieter versions of parse_{tree,commit}Jeff King4-6/+16
2015-05-29glossary: add "remote", "submodule", "superproject"Stefan Beller1-0/+16
2015-05-29setup_git_directory: delay core.bare/core.worktree errorsJeff King2-10/+26
2015-05-29Makefile: silence perl/PM.stamp recipeJeff King1-1/+1
2015-05-29Makefile: avoid timestamp updates to GIT-BUILD-OPTIONSJeff King1-21/+22
2015-05-29Makefile: drop dependency between git-instaweb and gitwebJeff King1-1/+1
2015-05-28submodule doc: reorder introductory paragraphsStefan Beller1-28/+22
2015-05-28Documentation: include 'merge.branchdesc' for merge and config as wellSZEDER Gábor3-16/+12
2015-05-28xmmap(): drop "Out of memory?"Junio C Hamano1-1/+1
2015-05-28config.c: rewrite ENODEV into EISDIR when mmap failsJeff King1-0/+2
2015-05-28config.c: avoid xmmap error messagesJeff King3-6/+21
2015-05-28config.c: fix mmap leak when writing configJeff King1-4/+5
2015-05-28read-cache.c: drop PROT_WRITE from mmap of indexJeff King1-1/+1
2015-05-27diff.h: rename DIFF_PLAIN color slot to DIFF_CONTEXTJeff King4-20/+20
2015-05-27diff: accept color.diff.context as a synonym for "plain"Jeff King2-2/+3
2015-05-27clone: reorder --dissociate and --reference optionsJeff King1-2/+2
2015-05-27clone: use OPT_STRING_LIST for --referenceJeff King1-11/+2
2015-05-26Git 2.4.2v2.4.2Junio C Hamano4-3/+49
2015-05-26Merge branch 'jk/still-interesting' into maintJunio C Hamano1-4/+19
2015-05-26Merge branch 'jc/hash-object' into maintJunio C Hamano5-9/+43
2015-05-26Merge branch 'jk/rebase-quiet-noop' into maintJunio C Hamano1-1/+1
2015-05-26Merge branch 'sg/complete-decorate-full-not-long' into maintJunio C Hamano1-1/+1
2015-05-26Merge branch 'jk/filter-branch-use-of-sed-on-incomplete-line' into maintJunio C Hamano2-1/+19
2015-05-26Merge branch 'jc/daemon-no-ipv6-for-2.4.1' into maintJunio C Hamano1-1/+1
2015-05-26Merge branch 'jk/stash-require-clean-index' into maintJunio C Hamano2-7/+16
2015-05-26Merge branch 'jk/git-no-more-argv0-path-munging' into maintJunio C Hamano1-1/+0
2015-05-25Merge branch 'jk/http-backend-deadlock-2.3' into jk/http-backend-deadlockJunio C Hamano3-29/+139
2015-05-25Merge branch 'jk/http-backend-deadlock-2.2' into jk/http-backend-deadlock-2.3Junio C Hamano3-29/+139
2015-05-25http-backend: spool ref negotiation requests to bufferJeff King3-11/+105
2015-05-22test_bitmap_walk: free bitmap with bitmap_freeJeff King1-1/+1
2015-05-22doc: fix inconsistent spelling of "packfile"Patrick Steinhardt2-3/+3
2015-05-22t5407: use <<- to align the expected outputJunio C Hamano1-40/+40
2015-05-22rebase -i: fix post-rewrite hook with failed exec commandMatthieu Moy2-6/+6
2015-05-22rebase -i: demonstrate incorrect behavior of post-rewriteMatthieu Moy1-0/+17
2015-05-20Documentation/log: clarify sha1 non-abbreviation in log --rawMatthieu Moy1-1/+4
2015-05-20dir: remove unused variable sbRené Scharfe1-2/+0