summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2016-10-28Git 2.10.2v2.10.2Junio C Hamano3-2/+69
2016-10-28Merge branch 'pb/test-parse-options-expect' into maintJunio C Hamano1-170/+13
2016-10-28Merge branch 'jc/cocci-xstrdup-or-null' into maintJunio C Hamano7-20/+17
2016-10-28Merge branch 'rs/cocci' into maintJunio C Hamano15-45/+99
2016-10-28Merge branch 'jc/diff-unique-abbrev-comments' into maintJunio C Hamano1-1/+22
2016-10-28Merge branch 'rs/pretty-format-color-doc-fix' into maintJunio C Hamano1-1/+2
2016-10-28Merge branch 'js/reset-usage' into maintJunio C Hamano1-1/+1
2016-10-28Merge branch 'po/fix-doc-merge-base-illustration' into maintJunio C Hamano2-21/+21
2016-10-28Merge branch 'jk/tap-verbose-fix' into maintJunio C Hamano3-5/+37
2016-10-28Merge branch 'tg/add-chmod+x-fix' into maintJunio C Hamano1-0/+1
2016-10-28Merge branch 'bw/submodule-branch-dot-doc' into maintJunio C Hamano2-3/+8
2016-10-28Merge branch 'jk/tighten-alloc' into maintJunio C Hamano1-11/+6
2016-10-28Merge branch 'jk/fetch-quick-tag-following' into maintJunio C Hamano4-4/+112
2016-10-28Merge branch 'jk/merge-base-fork-point-without-reflog' into maintJunio C Hamano2-0/+9
2016-10-28Merge branch 'dk/worktree-dup-checkout-with-bare-is-ok' into maintJunio C Hamano2-0/+10
2016-10-28Merge branch 'sb/submodule-config-doc-drop-path' into maintJunio C Hamano1-5/+6
2016-10-28Merge branch 'jk/ref-symlink-loop' into maintJunio C Hamano2-1/+18
2016-10-28Merge branch 'nd/commit-p-doc' into maintJunio C Hamano1-2/+4
2016-10-28Merge branch 'jk/clone-copy-alternates-fix' into maintJunio C Hamano1-2/+5
2016-10-28Merge branch 'dt/http-empty-auth' into maintJunio C Hamano1-1/+1
2016-10-28Merge branch 'dp/autoconf-curl-ssl' into maintJunio C Hamano1-10/+11
2016-10-28Merge branch 'ak/curl-imap-send-explicit-scheme' into maintJunio C Hamano1-0/+1
2016-10-28Merge branch 'jt/fetch-pack-in-vain-count-with-stateless' into maintJunio C Hamano1-2/+9
2016-10-28Merge branch 'js/regexec-buf' into maintJunio C Hamano1-6/+7
2016-10-28Merge branch 'rs/c-auto-resets-attributes' into maintJunio C Hamano1-0/+2
2016-10-28Merge branch 'yk/git-tag-remove-mention-of-old-layout-in-doc' into maintJunio C Hamano1-3/+2
2016-10-24doc: fix the 'revert a faulty merge' ASCII art tab spacingPhilip Oakley1-8/+8
2016-10-24test-lib: bail out when "-v" used under "prove"Jeff King1-0/+10
2016-10-21travis: use --verbose-log test optionJeff King1-1/+1
2016-10-21test-lib: add --verbose-log optionJeff King2-3/+25
2016-10-21test-lib: handle TEST_OUTPUT_DIRECTORY with spacesJeff King1-2/+2
2016-10-21doc: fix merge-base ASCII art tab spacingPhilip Oakley1-13/+13
2016-10-20doc: remove reference to the traditional layout in git-tag.txtYounes Khoudli1-3/+2
2016-10-20t3700: fix broken test under !SANITYJunio C Hamano1-0/+1
2016-10-19submodules doc: update documentation for "." used for submodule branchesBrandon Williams2-3/+8
2016-10-17t0040: convert all possible tests to use `test-parse-options --expect`Pranit Bauva1-170/+13
2016-10-17inline xalloc_flex() into FLEXPTR_ALLOC_MEMRené Scharfe1-9/+3
2016-10-17avoid pointer arithmetic involving NULL in FLEX_ALLOC_MEMRené Scharfe1-2/+3
2016-10-17Merge tag 'l10n-2.10.0-rnd2.4' of git://github.com/git-l10n/git-po into maintJunio C Hamano2-2417/+2813
2016-10-16Merge branch 'russian-l10n' of https://github.com/DJm00n/git-po-ruJiang Xin1-26/+26
2016-10-14fetch: use "quick" has_sha1_file for tag followingJeff King4-4/+112
2016-10-14worktree: allow the main brach of a bare repository to be checked outDennis Kaarsemaker2-0/+10
2016-10-12merge-base: handle --fork-point without reflogJeff King2-0/+9
2016-10-12cocci: refactor common patterns to use xstrdup_or_null()Junio C Hamano7-20/+17
2016-10-12l10n: de.po: translate 260 new messagesRalf Thielow1-2387/+2783
2016-10-11Start preparing for 2.10.2Junio C Hamano2-1/+46
2016-10-11Merge branch 'jk/verify-packfile-gently' into maintJunio C Hamano1-5/+2
2016-10-11Merge branch 'jc/worktree-config' into maintJunio C Hamano1-0/+2
2016-10-11Merge branch 'jc/verify-loose-object-header' into maintJunio C Hamano2-8/+30
2016-10-11Merge branch 'rs/git-gui-use-modern-git-merge-syntax' into maintJunio C Hamano1-6/+1
2016-10-11Merge branch 'kd/mailinfo-quoted-string' into maintJunio C Hamano6-33/+159
2016-10-11Merge branch 'pb/rev-list-reverse-with-count' into maintJunio C Hamano1-2/+3
2016-10-11Merge branch 'jc/blame-abbrev' into maintJunio C Hamano1-1/+1
2016-10-11Merge branch 'jk/graph-padding-fix' into maintJunio C Hamano1-4/+12
2016-10-11Merge branch 'sg/ref-filter-parse-optim' into maintJunio C Hamano1-11/+11
2016-10-11Merge branch 'rs/copy-array' into maintJunio C Hamano7-9/+40
2016-10-11Merge branch 'dt/mailinfo' into maintJunio C Hamano1-0/+1
2016-10-11reset: fix usageJohannes Schindelin1-1/+1
2016-10-11pretty: fix document link for color specificationRené Scharfe1-1/+2
2016-10-11documentation: improve submodule.<name>.{url, path} descriptionStefan Beller1-5/+6
2016-10-10configure.ac: improve description of NO_REGEX testJakub Narębski1-6/+7
2016-10-10use strbuf_add_unique_abbrev() for adding short hashes, part 3René Scharfe4-20/+15
2016-10-10remove unnecessary NULL check before free(3)René Scharfe2-2/+6
2016-10-10files_read_raw_ref: prevent infinite retry loops in generalJeff King1-0/+7
2016-10-10files_read_raw_ref: avoid infinite loop on broken symlinksJeff King2-1/+11
2016-10-05clone: detect errors in normalize_path_copyJeff King1-2/+5
2016-10-05git-commit.txt: clarify --patch mode with pathspecDuy Nguyen1-2/+4
2016-10-04http: http.emptyauth should allow empty (not just NULL) usernamesDavid Turner1-1/+1
2016-10-03Git 2.10.1v2.10.1Junio C Hamano3-2/+14
2016-10-03Merge branch 'jk/ident-ai-canonname-could-be-null' into maintJunio C Hamano1-1/+1
2016-10-03Merge branch 'jk/doc-cvs-update' into maintJunio C Hamano2-2/+6
2016-10-03Merge branch 'jk/pack-tag-of-tag' into maintJunio C Hamano2-30/+95
2016-10-03ref-filter: strip format option after a field name only once while parsingSZEDER Gábor1-11/+11
2016-10-03coccicheck: make transformation for strbuf_addf(sb, "...") more preciseRené Scharfe1-3/+26
2016-09-30diff_unique_abbrev(): document its assumption and limitationJunio C Hamano1-1/+22
2016-09-29pretty: avoid adding reset for %C(auto) if output is emptyRené Scharfe2-2/+2
2016-09-29Prepare for 2.10.1Junio C Hamano1-0/+87
2016-09-29Merge branch 'tg/add-chmod+x-fix' into maintJunio C Hamano8-49/+136
2016-09-29Merge branch 'et/add-chmod-x' into maintJunio C Hamano1-1/+6
2016-09-29Merge branch 'rt/rebase-i-broken-insn-advise' into maintJunio C Hamano2-4/+4
2016-09-29Merge branch 'ls/travis-homebrew-path-fix' into maintJunio C Hamano1-1/+1
2016-09-29Merge branch 'js/regexec-buf' into maintJunio C Hamano7-33/+53
2016-09-29Merge branch 'nd/checkout-disambiguation' into maintJunio C Hamano4-3/+36
2016-09-29Merge branch 'ep/doc-check-ref-format-example' into maintJunio C Hamano1-2/+2
2016-09-29Merge branch 'mm/config-color-ui-default-to-auto' into maintJunio C Hamano1-6/+12
2016-09-29Merge branch 'jk/reduce-gc-aggressive-depth' into maintJunio C Hamano2-2/+2
2016-09-29Merge branch 'jk/rebase-i-drop-ident-check' into maintJunio C Hamano2-3/+47
2016-09-29Merge branch 'jt/format-patch-base-info-above-sig' into maintJunio C Hamano2-9/+30
2016-09-29Merge branch 'ks/perf-build-with-autoconf' into maintJunio C Hamano1-1/+7
2016-09-29Merge branch 'rs/xdiff-merge-overlapping-hunks-for-W-context' into maintJunio C Hamano2-1/+26
2016-09-29Merge branch 'ew/http-do-not-forget-to-call-curl-multi-remove-handle' into maintJunio C Hamano1-11/+18
2016-09-29Merge branch 'jk/patch-ids-no-merges' into maintJunio C Hamano1-0/+16
2016-09-29Merge branch 'js/git-gui-commit-gpgsign' into maintJunio C Hamano1-0/+3
2016-09-29Merge branch 'jk/fix-remote-curl-url-wo-proto' into maintJunio C Hamano2-1/+9
2016-09-29Merge branch 'sy/git-gui-i18n-ja' into maintJunio C Hamano1-1309/+1438
2016-09-29Merge branch 'mr/vcs-svn-printf-ulong' into maintJunio C Hamano1-2/+2
2016-09-29Merge branch 'rs/unpack-trees-reduce-file-scope-global' into maintJunio C Hamano1-4/+5
2016-09-29Merge branch 'rs/strbuf-remove-fix' into maintJunio C Hamano1-1/+1
2016-09-29Merge branch 'rs/checkout-some-states-are-const' into maintJunio C Hamano1-3/+3
2016-09-29Merge branch 'bw/pathspec-remove-unused-extern-decl' into maintJunio C Hamano1-2/+0
2016-09-29graph: fix extra spaces in graph_padding_lineJeff King1-4/+12
2016-09-28blame: use DEFAULT_ABBREV macroJunio C Hamano1-1/+1
2016-09-28mailinfo: unescape quoted-pair in header fieldsKevin Daudt6-0/+124
2016-09-28t5100-mailinfo: replace common path prefix with variableKevin Daudt1-33/+35
2016-09-27rev-list-options: clarify the usage of --reversePranit Bauva1-2/+3
2016-09-27use strbuf_add_unique_abbrev() for adding short hashes, part 2René Scharfe4-4/+9
2016-09-27use strbuf_addstr() instead of strbuf_addf() with "%s", part 2René Scharfe3-2/+8
2016-09-27gitignore: ignore output files of coccicheck make targetRené Scharfe1-0/+1
2016-09-27worktree: honor configuration variablesJunio C Hamano1-0/+2
2016-09-26add David Turner's Two Sigma addressDavid Turner1-0/+1
2016-09-26unpack_sha1_header(): detect malformed object headerJunio C Hamano1-2/+24
2016-09-26streaming: make sure to notice corrupt objectJunio C Hamano1-6/+6
2016-09-26Merge branch 'rs/use-modern-git-merge-syntax' of git-gui into rs/git-gui-use-...Junio C Hamano1-6/+1
2016-09-26git-gui: stop using deprecated merge syntaxRené Scharfe1-6/+1
2016-09-25use COPY_ARRAYRené Scharfe6-9/+32
2016-09-25add COPY_ARRAYRené Scharfe1-0/+8
2016-09-23fetch-pack: do not reset in_vain on non-novel acksJonathan Tan1-2/+9
2016-09-23ident: handle NULL ai_canonnameJeff King1-1/+1
2016-09-22docs/cvs-migration: mention cvsimport caveatsJeff King1-0/+4
2016-09-22docs/cvs-migration: update link to cvsps homepageJeff King1-1/+1
2016-09-22docs/cvsimport: prefer cvs-fast-export to parsecvsJeff King1-1/+1
2016-09-22verify_packfile: check pack validity before accessing dataJeff King1-5/+2
2016-09-22travis-ci: ask homebrew for its path instead of hardcoding itLars Schneider1-1/+1
2016-09-21t3700-add: do not check working tree file mode without POSIXPERMJohannes Sixt1-4/+2
2016-09-21regex: use regexec_buf()Johannes Schindelin5-33/+17
2016-09-21regex: add regexec_buf() that can work on a non NUL-terminated stringJohannes Schindelin2-1/+15
2016-09-21regex: -G<pattern> feeds a non NUL-terminated string to regexec() and failsJohannes Schindelin1-0/+22
2016-09-21git-check-ref-format.txt: fixup documentationElia Pinto1-2/+2
2016-09-21t3700-add: create subdirectory gentlyJohannes Sixt1-1/+1
2016-09-21checkout: fix ambiguity check in subdirNguyễn Thái Ngọc Duy3-2/+23
2016-09-21checkout.txt: document a common case that ignores ambiguation rulesNguyễn Thái Ngọc Duy1-0/+12
2016-09-19Start preparing for 2.10.1Junio C Hamano2-1/+34
2016-09-19Merge branch 'sb/diff-cleanup' into maintJunio C Hamano1-21/+10
2016-09-19Merge branch 'ah/misc-message-fixes' into maintJunio C Hamano5-7/+7
2016-09-19Merge branch 'sb/transport-report-missing-submodule-on-stderr' into maintJunio C Hamano1-1/+1
2016-09-19Merge branch 'sb/xdiff-remove-unused-static-decl' into maintJunio C Hamano1-9/+0
2016-09-19Merge branch 'js/t9903-chaining' into maintJunio C Hamano1-1/+1
2016-09-19Merge branch 'rs/hex2chr' into maintJunio C Hamano6-78/+21
2016-09-19Merge branch 'rs/compat-strdup' into maintJunio C Hamano4-19/+33
2016-09-19Merge branch 'jk/squelch-false-warning-from-gcc-o3' into maintJunio C Hamano3-1/+3
2016-09-19Merge branch 'ep/use-git-trace-curl-in-tests' into maintJunio C Hamano4-9/+19
2016-09-19Merge branch 'js/t6026-clean-up' into maintJunio C Hamano1-0/+2
2016-09-19Merge branch 'jc/forbid-symbolic-ref-d-HEAD' into maintJunio C Hamano2-7/+16
2016-09-19Merge branch 'jc/submodule-anchor-git-dir' into maintJunio C Hamano2-0/+36
2016-09-19Merge branch 'jk/test-lib-drop-pid-from-results' into maintJunio C Hamano1-2/+2
2016-09-19Merge branch 'bh/diff-highlight-graph' into maintJunio C Hamano5-6/+338
2016-09-19Merge branch 'po/range-doc' into maintJunio C Hamano5-51/+88
2016-09-19pretty: let %C(auto) reset all attributesRené Scharfe2-1/+3
2016-09-16Documentation/config: default for color.* is color.uiMatthieu Moy1-6/+12
2016-09-15t/perf/run: copy config.mak.autogen & friends to build areaKirill Smelkov1-1/+7
2016-09-15use strbuf_addstr() for adding constant strings to a strbuf, part 2René Scharfe7-12/+18
2016-09-15add coccicheck make targetRené Scharfe1-0/+14
2016-09-15contrib/coccinelle: fix semantic patch for oid_to_hex_r()René Scharfe1-6/+6
2016-09-15add: modify already added files when --chmod is givenThomas Gummerer6-34/+91
2016-09-15read-cache: introduce chmod_index_entryThomas Gummerer3-14/+33
2016-09-15format-patch: show base info before email signatureJosh Triplett2-9/+30
2016-09-14xdiff: fix merging of hunks with -W context and -u contextRené Scharfe2-1/+26
2016-09-14update-index: add test for chmod flagsThomas Gummerer2-1/+14
2016-09-14Merge branch 'ib/t3700-add-chmod-x-updates' into tg/add-chmod+x-fixJunio C Hamano1-39/+26
2016-09-14vcs-svn/fast_export: fix timestamp fmt specifiersMike Ralphson1-2/+2
2016-09-13unpack-trees: pass checkout state explicitly to check_updates()René Scharfe1-4/+5
2016-09-13checkout: constify parameters of checkout_stage() and checkout_merged()René Scharfe1-3/+3
2016-09-13pathspec: remove unnecessary function prototypesBrandon Williams1-2/+0
2016-09-13strbuf: use valid pointer in strbuf_remove()René Scharfe1-1/+1
2016-09-13http: always remove curl easy from curlm session on releaseEric Wong1-4/+6
2016-09-13http: consolidate #ifdefs for curl_multi_remove_handleEric Wong1-7/+10
2016-09-13http: warn on curl_multi_add_handle failuresEric Wong1-0/+2
2016-09-12Merge tag 'l10n-2.10.0-rnd2.3' of git://github.com/git-l10n/git-po into maintJunio C Hamano3-446/+402
2016-09-12add: document the chmod optionThomas Gummerer1-1/+6
2016-09-12patch-ids: refuse to compute patch-id for merge commitJeff King1-0/+15
2016-09-12l10n: de.po: fix translation of autostashRalf Thielow1-4/+4
2016-09-11Merge branch 'js/commit-gpgsign' of ../git-gui into js/git-gui-commit-gpgsignJunio C Hamano1-0/+3
2016-09-11git-gui: respect commit.gpgsign againJohannes Schindelin1-0/+3
2016-09-11l10n: zh_CN: review for git v2.10.0 l10nRay Chen1-50/+50
2016-09-11l10n: zh_CN: fixed some typos for git 2.10.0Jiang Xin1-4/+4
2016-09-09patch-ids: turn off rename detectionJeff King1-0/+1
2016-09-08Start maintenance track for 2.10.x seriesJunio C Hamano303-18845/+35770
2016-09-08Prepare for 2.9.4Junio C Hamano2-1/+84
2016-09-08Merge branch 'hv/doc-commit-reference-style' into maintJunio C Hamano1-0/+10
2016-09-08Merge branch 'sg/reflog-past-root' into maintJunio C Hamano1-1/+0
2016-09-08Merge branch 'rs/mailinfo-lib' into maintJunio C Hamano1-7/+2
2016-09-08Merge branch 'jk/tighten-alloc' into maintJunio C Hamano2-4/+2
2016-09-08Merge branch 'rs/use-strbuf-add-unique-abbrev' into maintJunio C Hamano3-16/+11
2016-09-08Merge branch 'rs/merge-recursive-string-list-init' into maintJunio C Hamano1-2/+1
2016-09-08Merge branch 'rs/merge-add-strategies-simplification' into maintJunio C Hamano1-34/+10
2016-09-08Merge branch 'ls/packet-line-protocol-doc-fix' into maintJunio C Hamano1-3/+3
2016-09-08Merge branch 'bw/mingw-avoid-inheriting-fd-to-lockfile' into maintJunio C Hamano6-1/+35
2016-09-08Merge branch 'dg/document-git-c-in-git-config-doc' into maintJunio C Hamano1-0/+3
2016-09-08Merge branch 'js/no-html-bypass-on-windows' into maintJunio C Hamano3-52/+0
2016-09-08Merge branch 'jk/difftool-command-not-found' into maintJunio C Hamano2-0/+13
2016-09-08Merge branch 'sb/checkout-explit-detach-no-advice' into maintJunio C Hamano2-1/+25
2016-09-08Merge branch 'rs/pull-signed-tag' into maintJunio C Hamano4-12/+33
2016-09-08Merge branch 'js/test-lint-pathname' into maintJunio C Hamano1-1/+10
2016-09-08Merge branch 'js/mv-dir-to-new-directory' into maintJunio C Hamano1-4/+7
2016-09-08Merge branch 'js/import-tars-hardlinks' into maintJunio C Hamano1-11/+20
2016-09-08Merge branch 'ms/document-pack-window-memory-is-per-thread' into maintJunio C Hamano2-4/+6
2016-09-08Merge branch 'jk/push-force-with-lease-creation' into maintJunio C Hamano4-7/+46
2016-09-08Merge branch 'jk/reflog-date' into maintJunio C Hamano6-10/+57
2016-09-08Merge branch 'jc/renormalize-merge-kill-safer-crlf' into maintJunio C Hamano10-90/+112
2016-09-08Merge branch 'jk/common-main' into maintJunio C Hamano53-153/+126