summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2016-09-02Git 2.10v2.10.0Junio C Hamano2-1/+6
2016-09-02Merge tag 'l10n-2.10.0-rnd2.2' of git://github.com/git-l10n/git-poJunio C Hamano1-374/+317
2016-09-02Merge branch 'master' of https://github.com/vnwildman/gitJiang Xin1-374/+317
2016-08-31A few more fixes before the final 2.10Junio C Hamano1-3/+8
2016-08-31Merge tag 'l10n-2.10.0-rnd2' of git://github.com/git-l10n/git-poJunio C Hamano8-14691/+24337
2016-08-31Merge branch 'ls/packet-line-protocol-doc-fix'Junio C Hamano1-3/+3
2016-08-31Merge branch 'mh/blame-worktree'Junio C Hamano2-1/+7
2016-08-31Merge branch 'kw/patch-ids-optim'Junio C Hamano1-0/+0
2016-08-30pack-protocol: fix maximum pkt-line sizeLars Schneider1-3/+3
2016-08-31l10n: zh_CN: for git v2.10.0 l10n round 2Jiang Xin1-1755/+2746
2016-08-29p3400: make test script executableRené Scharfe1-0/+0
2016-08-29blame: fix segfault on untracked filesThomas Gummerer2-1/+7
2016-08-28l10n: ca.po: update translationAlex Henrie1-2262/+3751
2016-08-28l10n: fr.po v2.10.0-rc2Jean-Noel Avila1-1796/+3072
2016-08-28l10n: Updated Vietnamese translation for v2.10.0-rc2 (2757t)Tran Ngoc Quan1-374/+317
2016-08-27l10n: sv.po: Update Swedish translation (2757t0f0u)Peter Krefting1-1791/+3043
2016-08-27Merge branch 'master' of https://github.com/vnwildman/gitJiang Xin1-1780/+3085
2016-08-27l10n: git.pot: v2.10.0 round 2 (12 new, 44 removed)Jiang Xin1-342/+189
2016-08-27Merge branch 'master' of git://github.com/git-l10n/git-poJiang Xin3-5296/+8782
2016-08-27l10n: Updated Vietnamese translation for v2.10.0 (2789t)Tran Ngoc Quan1-1780/+3085
2016-08-26Git 2.10-rc2v2.10.0-rc2Junio C Hamano2-1/+4
2016-08-26gitattributes: Document the unified "auto" handlingTorsten Bögershausen1-34/+24
2016-08-25Prepare for 2.10.0-rc2Junio C Hamano1-2/+29
2016-08-25Merge branch 'ja/i18n'Junio C Hamano3-71/+20
2016-08-25Merge branch 'bw/mingw-avoid-inheriting-fd-to-lockfile'Junio C Hamano6-1/+35
2016-08-25Merge branch 'dg/document-git-c-in-git-config-doc'Junio C Hamano1-0/+3
2016-08-25Merge branch 'js/no-html-bypass-on-windows'Junio C Hamano3-52/+0
2016-08-25Merge branch 'hv/doc-commit-reference-style'Junio C Hamano1-0/+5
2016-08-25git ls-files: text=auto eol=lf is supported in Git 2.10Torsten Bögershausen1-2/+1
2016-08-25l10n: pt_PT: update Portuguese translationVasco Almeida1-428/+507
2016-08-25l10n: pt_PT: merge git.potVasco Almeida1-1793/+3017
2016-08-24i18n: simplify numeric error reportingJean-Noel Avila1-28/+16
2016-08-24i18n: fix git rebase interactive commit messagesJean-Noel Avila1-42/+3
2016-08-24i18n: fix typos for translationJean-Noel Avila1-1/+1
2016-08-23doc: mention `git -c` in git-config(1)David Glasser1-0/+3
2016-08-23mingw: ensure temporary file handles are not inherited by child processesBen Wijen6-2/+23
2016-08-22l10n: ko.po: Update Korean translationChangwoo Ryu1-1757/+2908
2016-08-19Git 2.10-rc1v2.10.0-rc1Junio C Hamano2-1/+32
2016-08-19Merge branch 'lt/gpg-show-long-key-in-signature-verification'Junio C Hamano1-0/+1
2016-08-19Merge branch 'ab/hooks'Junio C Hamano3-4/+9
2016-08-19Merge branch 'jk/difftool-command-not-found'Junio C Hamano2-0/+13
2016-08-19Merge branch 'sb/checkout-explit-detach-no-advice'Junio C Hamano2-1/+25
2016-08-19Merge branch 'tb/t0027-raciness-fix'Junio C Hamano2-43/+60
2016-08-19Merge branch 'rs/pull-signed-tag'Junio C Hamano4-12/+33
2016-08-19Revert "display HTML in default browser using Windows' shell API"Johannes Schindelin3-52/+0
2016-08-18t6026-merge-attr: child processes must not inherit index.lock handlesBen Wijen1-0/+13
2016-08-17RelNotes: final batch of topics before -rc1Junio C Hamano1-0/+13
2016-08-17Merge branch 'js/test-lint-pathname'Junio C Hamano1-1/+10
2016-08-17Merge branch 'sg/reflog-past-root'Junio C Hamano1-1/+0
2016-08-17Merge branch 'rs/mailinfo-lib'Junio C Hamano1-7/+2
2016-08-17Merge branch 'jk/tighten-alloc'Junio C Hamano2-4/+2
2016-08-17Merge branch 'va/i18n'Junio C Hamano3-4/+4
2016-08-17git-multimail: update to release 1.4.0Matthieu Moy6-276/+725
2016-08-17relnotes: redo the description of text=auto fixJunio C Hamano1-5/+4
2016-08-17SubmittingPatches: document how to reference previous commitsHeiko Voigt1-0/+5
2016-08-16Merge branch 'lt/gpg-show-long-key-in-signature-verification-maint' into lt/g...Junio C Hamano1-0/+1
2016-08-16gpg-interface: prefer "long" key format output when verifying pgp signaturesLinus Torvalds1-2/+2
2016-08-16rev-parse: respect core.hooksPath in --git-pathJohannes Schindelin3-4/+9
2016-08-16t/Makefile: ensure that paths are valid on platforms we careJohannes Schindelin1-1/+10
2016-08-15difftool: always honor fatal error exit codesJohn Keeping2-0/+13
2016-08-15checkout: do not mention detach advice for explicit --detach optionStefan Beller2-1/+25
2016-08-15Relnotes: decribe the updates to the "text=auto" attributeJunio C Hamano1-0/+9
2016-08-15t1410: remove superfluous 'git reflog' from the 'walk past root' testSZEDER Gábor1-1/+0
2016-08-15l10n: git.pot: v2.10.0 round 1 (248 new, 56 removed)Jiang Xin1-1712/+2744
2016-08-14Git 2.10-rc0v2.10.0-rc0Junio C Hamano2-13/+11
2016-08-14convert: Correct NNO tests and missing `LF will be replaced by CRLF`Torsten Bögershausen2-43/+60
2016-08-13receive-pack: use FLEX_ALLOC_MEM in queue_command()René Scharfe1-3/+1
2016-08-13commit: use FLEX_ARRAY in struct merge_remote_descRené Scharfe2-3/+2
2016-08-13merge-recursive: fix verbose output for multiple base treesRené Scharfe2-4/+19
2016-08-13commit: factor out set_merge_remote_desc()René Scharfe2-7/+14
2016-08-13commit: use xstrdup() in get_merge_parent()René Scharfe1-1/+1
2016-08-13mailinfo: recycle strbuf in check_header()René Scharfe1-7/+2
2016-08-13correct FLEXPTR_* example in commentRené Scharfe1-1/+1
2016-08-12t7411: become resilient to GETTEXT_POISONVasco Almeida1-1/+1
2016-08-12t5520: become resilient to GETTEXT_POISONVasco Almeida1-2/+2
2016-08-12t3404: become resilient to GETTEXT_POISONVasco Almeida1-1/+1
2016-08-12Sync with 2.9.3Junio C Hamano2-1/+12
2016-08-12Final batch before 2.10-rc0Junio C Hamano1-2/+36
2016-08-12Merge branch 'kw/patch-ids-optim'Junio C Hamano8-87/+128
2016-08-12Merge branch 'ew/http-backend-batch-headers'Junio C Hamano1-104/+116
2016-08-12Merge branch 'va/i18n'Junio C Hamano3-16/+16
2016-08-12Merge branch 'vs/typofix'Junio C Hamano25-33/+33
2016-08-12Merge branch 'js/mv-dir-to-new-directory'Junio C Hamano1-4/+7
2016-08-12Merge branch 'rs/use-strbuf-add-unique-abbrev'Junio C Hamano3-16/+11
2016-08-12Merge branch 'jk/big-and-future-archive-tar'Junio C Hamano1-10/+5
2016-08-12Merge branch 'jk/trace-fixup'Junio C Hamano3-33/+35
2016-08-12Merge branch 'rs/merge-recursive-string-list-init'Junio C Hamano1-2/+1
2016-08-12Merge branch 'rs/merge-add-strategies-simplification'Junio C Hamano1-34/+10
2016-08-12Merge branch 'rs/child-process-init'Junio C Hamano2-6/+3
2016-08-12Merge branch 'js/import-tars-hardlinks'Junio C Hamano1-11/+20
2016-08-12Merge branch 'ms/document-pack-window-memory-is-per-thread'Junio C Hamano2-4/+6
2016-08-12Merge branch 'vs/completion-branch-fully-spelled-d-m-r'Junio C Hamano1-3/+3
2016-08-12Merge branch 'sb/submodule-clone-retry'Junio C Hamano1-2/+6
2016-08-12Git 2.9.3v2.9.3Junio C Hamano3-2/+13
2016-08-12Merge branch 'jk/difftool-in-subdir' into maintJunio C Hamano2-59/+41
2016-08-12Merge branch 'jk/reset-ident-time-per-commit' into maintJunio C Hamano3-0/+8
2016-08-11rebase: avoid computing unnecessary patch IDsKevin Willford5-8/+85
2016-08-11Spelling fixesVille Skyttä25-33/+33
2016-08-10Sync with maintJunio C Hamano1-0/+68
2016-08-10Twelfth batch for 2.10Junio C Hamano1-20/+21
2016-08-10Merge branch 'sb/submodule-update-dot-branch'Junio C Hamano5-17/+132
2016-08-10Merge branch 'js/am-3-merge-recursive-direct'Junio C Hamano15-294/+419
2016-08-10Merge branch 'js/commit-slab-decl-fix'Junio C Hamano2-4/+3
2016-08-10Merge branch 'jk/completion-diff-submodule'Junio C Hamano1-0/+19
2016-08-10Merge branch 'cc/mailmap-tuxfamily'Junio C Hamano1-0/+1
2016-08-10Merge branch 'jt/format-patch-from-config'Junio C Hamano4-1/+63
2016-08-10Merge branch 'jk/push-force-with-lease-creation'Junio C Hamano4-7/+46
2016-08-10Merge branch 'jk/reset-ident-time-per-commit'Junio C Hamano3-0/+8
2016-08-10Yet another batch for 2.9.3Junio C Hamano1-0/+68
2016-08-10Merge branch 'jh/clean-smudge-f-doc' into maintJunio C Hamano1-0/+5
2016-08-10Merge branch 'rs/use-strbuf-addstr' into maintJunio C Hamano7-9/+9
2016-08-10Merge branch 'cp/completion-clone-recurse-submodules' into maintJunio C Hamano1-0/+1
2016-08-10Merge branch 'jk/t4205-cleanup' into maintJunio C Hamano1-198/+200
2016-08-10Merge branch 'jc/hashmap-doc-init' into maintJunio C Hamano1-0/+5
2016-08-10Merge branch 'js/nedmalloc-gcc6-warnings' into maintJunio C Hamano1-9/+8
2016-08-10Merge branch 'nd/fbsd-lazy-mtime' into maintJunio C Hamano1-1/+16
2016-08-10Merge branch 'ab/gitweb-link-html-escape' into maintJunio C Hamano1-1/+1
2016-08-10Merge branch 'js/t4130-rename-without-ino' into maintJunio C Hamano1-3/+7
2016-08-10Merge branch 'jc/grep-commandline-vs-configuration' into maintJunio C Hamano4-16/+29
2016-08-10Merge branch 'jk/diff-do-not-reuse-wtf-needs-cleaning' into maintJunio C Hamano2-0/+18
2016-08-10Merge branch 'pm/build-persistent-https-with-recent-go' into maintJunio C Hamano1-2/+4
2016-08-10Merge branch 'da/subtree-2.9-regression' into maintJunio C Hamano2-8/+25
2016-08-10Merge branch 'os/no-verify-skips-commit-msg-too' into maintJunio C Hamano1-1/+1
2016-08-10Merge branch 'rs/rm-strbuf-optim' into maintJunio C Hamano1-2/+3
2016-08-10Merge branch 'jk/parse-options-concat' into maintJunio C Hamano3-22/+22
2016-08-10Merge branch 'ls/travis-enable-httpd-tests' into maintJunio C Hamano1-0/+2
2016-08-10Merge branch 'ew/autoconf-pthread' into maintJunio C Hamano1-0/+5
2016-08-10Merge branch 'rs/help-c-source-with-gitattributes' into maintJunio C Hamano1-1/+1
2016-08-10Merge branch 'mm/status-suggest-merge-abort' into maintJunio C Hamano3-2/+10
2016-08-10t7406: fix breakage on OSXStefan Beller1-1/+1
2016-08-10document git-repack interaction of pack.threads and pack.windowMemoryMichael Stahl2-4/+6
2016-08-10i18n: git-stash: mark messages for translationVasco Almeida1-2/+2
2016-08-10http-backend: buffer headers before sendingEric Wong1-104/+116
2016-08-09submodule--helper: use parallel processor correctlyStefan Beller1-2/+6
2016-08-09completion: add completion for --submodule=* diff optionJacob Keller1-0/+19
2016-08-09i18n: archive: mark errors for translationVasco Almeida1-5/+5
2016-08-09i18n: setup: mark error messages for translationVasco Almeida1-9/+9
2016-08-09completion: complete --delete, --move, and --remotes for git branchVille Skyttä1-3/+3
2016-08-09commit-slab.h: avoid duplicated global static variablesJohannes Sixt1-3/+3
2016-08-09config.c: avoid duplicated global static variablesJohannes Sixt1-1/+0
2016-08-08.mailmap: use Christian Couder's Tuxfamily addressChristian Couder1-0/+1
2016-08-08Sync with maintJunio C Hamano1-0/+34
2016-08-08Eleventh batch for 2.10Junio C Hamano1-20/+65
2016-08-08Merge branch 'jc/hashmap-doc-init'Junio C Hamano1-0/+5
2016-08-08Merge branch 'ew/build-time-pager-tweaks'Junio C Hamano5-8/+67
2016-08-08Merge branch 'sb/submodule-recommend-shallowness'Junio C Hamano1-0/+5
2016-08-08Merge branch 'jk/parseopt-string-list'Junio C Hamano1-1/+1
2016-08-08Merge branch 'jh/clean-smudge-f-doc'Junio C Hamano1-0/+5
2016-08-08Merge branch 'js/nedmalloc-gcc6-warnings'Junio C Hamano1-9/+8
2016-08-08Merge branch 'nd/fbsd-lazy-mtime'Junio C Hamano1-1/+16
2016-08-08Merge branch 'nd/log-decorate-color-head-arrow'Junio C Hamano2-3/+1
2016-08-08Merge branch 'rs/use-strbuf-addstr'Junio C Hamano7-9/+9
2016-08-08Merge branch 'rs/st-mult'Junio C Hamano3-3/+3
2016-08-08Merge branch 'ib/t3700-add-chmod-x-updates'Junio C Hamano1-39/+26
2016-08-08Merge branch 'ab/gitweb-link-html-escape'Junio C Hamano1-1/+1
2016-08-08Merge branch 'jk/pack-objects-optim'Junio C Hamano8-50/+248
2016-08-08Merge branch 'jk/difftool-in-subdir'Junio C Hamano2-59/+41
2016-08-08Merge branch 'va/i18n'Junio C Hamano4-24/+112
2016-08-08Merge branch 'js/rebase-i-progress-tidy'Junio C Hamano1-1/+1
2016-08-08Merge branch 'jk/reflog-date'Junio C Hamano6-10/+57
2016-08-08Merge branch 'cp/completion-clone-recurse-submodules'Junio C Hamano1-0/+1
2016-08-08Merge branch 'jk/t4205-cleanup'Junio C Hamano1-198/+200
2016-08-08Merge branch 'da/subtree-modernize'Junio C Hamano1-286/+391
2016-08-08Merge branch 'nd/fetch-ref-summary'Junio C Hamano1-2/+2
2016-08-08Merge branch 'ew/git-svn-http-tests'Junio C Hamano10-91/+30
2016-08-08Merge branch 'js/t4130-rename-without-ino'Junio C Hamano1-3/+7
2016-08-08Hopefully final batch for 2.9.3Junio C Hamano1-0/+34
2016-08-08Merge branch 'sb/pack-protocol-doc-nak' into maintJunio C Hamano1-1/+1
2016-08-08Merge branch 'rs/submodule-config-code-cleanup' into maintJunio C Hamano3-17/+28
2016-08-08Merge branch 'sb/submodule-deinit-all' into maintJunio C Hamano1-2/+0
2016-08-08Merge branch 'rs/worktree-use-strbuf-absolute-path' into maintJunio C Hamano1-2/+2
2016-08-08Merge branch 'jc/doc-diff-filter-exclude' into maintJunio C Hamano1-0/+3
2016-08-08Merge branch 'nd/test-helpers' into maintJunio C Hamano2-11/+3
2016-08-08Merge branch 'rs/use-strbuf-addbuf' into maintJunio C Hamano5-8/+11
2016-08-08Merge branch 'lf/recv-sideband-cleanup' into maintJunio C Hamano1-74/+58
2016-08-08Merge branch 'ah/unpack-trees-advice-messages' into maintJunio C Hamano4-16/+16
2016-08-08Merge branch 'lf/sideband-returns-void' into maintJunio C Hamano3-15/+10
2016-08-08Merge branch 'jk/send-pack-stdio' into maintJunio C Hamano3-29/+16
2016-08-08Merge branch 'pb/commit-editmsg-path' into maintJunio C Hamano1-7/+8
2016-08-08Merge branch 'ew/find-perl-on-freebsd-in-local' into maintJunio C Hamano1-0/+1
2016-08-08Merge branch 'ew/daemon-socket-keepalive' into maintJunio C Hamano2-3/+8
2016-08-08Merge branch 'nd/pack-ofs-4gb-limit' into maintJunio C Hamano9-29/+54
2016-08-08Merge branch 'rs/notes-merge-no-toctou' into maintJunio C Hamano1-5/+1
2016-08-08Merge branch 'js/ignore-space-at-eol' into maintJunio C Hamano3-3/+13
2016-08-08Merge branch 'jk/push-scrub-url' into maintJunio C Hamano2-2/+14
2016-08-08Merge branch 'nd/cache-tree-ita' into maintJunio C Hamano15-53/+87
2016-08-08Merge branch 'mh/blame-worktree' into maintJunio C Hamano2-18/+71
2016-08-08git mv: do not keep slash in `git mv dir non-existing-dir/`Johannes Schindelin1-4/+7
2016-08-06use strbuf_add_unique_abbrev() for adding short hashesRené Scharfe3-16/+11
2016-08-06archive-tar: make write_extended_header() voidRené Scharfe1-10/+5
2016-08-05nedmalloc: work around overzealous GCC 6 warningRené Scharfe1-5/+4
2016-08-05merge: use string_list_split() in add_strategies()René Scharfe1-34/+10
2016-08-05merge-recursive: use STRING_LIST_INIT_NODUPRené Scharfe1-2/+1
2016-08-05use CHILD_PROCESS_INIT to initialize automatic variablesRené Scharfe2-6/+3
2016-08-05use strbuf_addstr() instead of strbuf_addf() with "%s"René Scharfe3-3/+3
2016-08-05trace: do not fall back to stderrJeff King1-6/+4
2016-08-05write_or_die: drop write_or_whine_pipe()Jeff King2-13/+0
2016-08-05trace: disable key after write errorJeff King1-0/+1
2016-08-05trace: correct variable name in write() error messageJeff King1-5/+5
2016-08-05trace: cosmetic fixes for error messagesJeff King1-8/+8