summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
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-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-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-05nedmalloc: work around overzealous GCC 6 warningRené Scharfe1-5/+4
2016-08-05use strbuf_addstr() instead of strbuf_addf() with "%s"René Scharfe3-3/+3
2016-08-04nedmalloc: fix misleading indentationJohannes Schindelin1-4/+4
2016-08-04t7063: work around FreeBSD's lazy mtime update featureNguyễn Thái Ngọc Duy1-1/+16
2016-08-03clarify %f documentationJoey Hess1-0/+5
2016-08-03t4130: work around Windows limitationJohannes Sixt1-3/+7
2016-08-02hashmap: clarify that hashmap_entry can safely be discardedJunio C Hamano1-0/+5
2016-08-01am: reset cached ident date for each patchJeff King3-0/+8
2016-08-01use strbuf_addstr() for adding constant strings to a strbufRené Scharfe4-6/+6
2016-08-01gitweb: escape link body in format_ref_markerAndreas Brauchli1-1/+1
2016-07-28difftool: use Git::* functions instead of passing around stateDavid Aguilar1-31/+21
2016-07-28difftool: avoid $GIT_DIR and $GIT_WORK_TREEDavid Aguilar2-21/+20
2016-07-28submodule-config: fix test binary crashing when no arguments givenHeiko Voigt1-1/+1
2016-07-28submodule-config: combine early return code into one gotoHeiko Voigt1-19/+12
2016-07-28submodule-config: passing name reference for .gitmodule blobsHeiko Voigt2-9/+28
2016-07-28Some fixes for 2.9.3Junio C Hamano2-1/+59
2016-07-28Merge branch 'ak/lazy-prereq-mktemp' into maintJunio C Hamano1-1/+6
2016-07-28Merge branch 'nd/icase' into maintJunio C Hamano11-21/+291
2016-07-28Merge branch 'sb/submodule-parallel-fetch' into maintJunio C Hamano1-16/+27
2016-07-28Merge branch 'dk/blame-move-no-reason-for-1-line-context' into maintJunio C Hamano1-4/+3
2016-07-28Merge branch 'jk/test-match-signal' into maintJunio C Hamano3-11/+26
2016-07-28Merge branch 'js/am-call-theirs-theirs-in-fallback-3way' into maintJunio C Hamano1-8/+8
2016-07-28Merge branch 'js/t3404-grammo-fix' into maintJunio C Hamano1-1/+1
2016-07-28Merge branch 'nd/doc-new-command' into maintJunio C Hamano1-1/+1
2016-07-28Merge branch 'ew/gc-auto-pack-limit-fix' into maintJunio C Hamano1-1/+1
2016-07-28Merge branch 'js/color-on-windows-comment' into maintJunio C Hamano1-5/+0
2016-07-28Merge branch 'mm/doc-tt' into maintJunio C Hamano62-227/+228
2016-07-28Merge branch 'js/sign-empty-commit-fix' into maintJunio C Hamano1-1/+6
2016-07-28Merge branch 'ps/rebase-i-auto-unstash-upon-abort' into maintJunio C Hamano2-0/+32
2016-07-28Merge branch 'nd/ita-cleanup' into maintJunio C Hamano2-3/+61
2016-07-28Merge branch 'js/find-commit-subject-ignore-leading-blanks' into maintJunio C Hamano7-15/+31
2016-07-28Merge branch 'dg/subtree-rebase-test' into maintJunio C Hamano1-0/+119
2016-07-27t4205: indent here documentsJeff King1-196/+196
2016-07-27t4205: drop top-level &&-chainingJeff King1-2/+4
2016-07-27completion: add option '--recurse-submodules' to 'git clone'Chris Packham1-0/+1
2016-07-26subtree: fix "git subtree split --rejoin"David Aguilar2-0/+17
2016-07-26t7900-subtree.sh: fix quoting and broken && chainsDavid Aguilar1-8/+8
2016-07-26submodule deinit: remove outdated commentStefan Beller1-2/+0
2016-07-26commit: describe that --no-verify skips the commit-msg hook in the help textOrgad Shaneh1-1/+1
2016-07-26config.mak.uname: correct perl path on FreeBSDNguyễn Thái Ngọc Duy1-0/+1
2016-07-25grep: further simplify setting the pattern typeJunio C Hamano4-16/+29
2016-07-22Documentation: pack-protocol correct NAK responseStefan Beller1-1/+1
2016-07-22diff: do not reuse worktree files that need "clean" conversionJeff King2-0/+18
2016-07-22Windows: add missing definition of ENOTSOCKJohannes Sixt1-0/+3
2016-07-22contrib/persistent-https: use Git version for build labelParker Moore1-1/+1
2016-07-22contrib/persistent-https: update ldflags syntax for Go 1.7+Parker Moore1-1/+3
2016-07-22status: suggest 'git merge --abort' when appropriateMatthieu Moy3-2/+10
2016-07-22strbuf: avoid calling strbuf_grow() twice in strbuf_addbuf()René Scharfe2-5/+8
2016-07-20t5541: fix url scrubbing test when GPG is not setJeff King1-2/+4
2016-07-19submodule-config: use explicit empty string instead of strbuf in config_from()René Scharfe1-2/+1
2016-07-19use strbuf_addbuf() for appending a strbuf to anotherRené Scharfe3-3/+3
2016-07-19difftool: fix argument handling in subdirsJohn Keeping1-10/+3
2016-07-18t/t8003-blame-corner-cases.sh: Use here documentsMike Hommey1-17/+17
2016-07-18blame: allow to blame paths freshly added to the indexMike Hommey2-1/+54
2016-07-18cache-tree: do not generate empty trees as a result of all i-t-a subentriesNguyễn Thái Ngọc Duy2-1/+23
2016-07-18cache-tree.c: fix i-t-a entry skipping directory updates sometimesNguyễn Thái Ngọc Duy2-2/+19
2016-07-18test-lib.sh: introduce and use $EMPTY_BLOBNguyễn Thái Ngọc Duy8-38/+35
2016-07-18test-lib.sh: introduce and use $EMPTY_TREENguyễn Thái Ngọc Duy6-13/+11
2016-07-18configure.ac: stronger test for pthread linkageEric Wong1-0/+5
2016-07-18daemon: ignore ENOTSOCK from setsockoptEric Wong1-3/+5
2016-07-15Git 2.9.2v2.9.2Junio C Hamano4-3/+17
2016-07-15Merge branch 'jk/tzoffset-fix' into maintJunio C Hamano3-3/+18
2016-07-15t0006: skip "far in the future" test when unsigned long is not long enoughJeff King3-3/+18
2016-07-14diff: document diff-filter exclusionJunio C Hamano1-0/+3
2016-07-14push: anonymize URL in status outputJeff King2-2/+12
2016-07-13fsck: use streaming interface for large blobs in packNguyễn Thái Ngọc Duy4-6/+29
2016-07-13pack-objects: do not truncate result in-pack object size on 32-bit systemsNguyễn Thái Ngọc Duy1-7/+8
2016-07-13index-pack: correct "offset" type in unpack_entry_data()Nguyễn Thái Ngọc Duy1-1/+1
2016-07-13index-pack: report correct bad object offsets even if they are largeNguyễn Thái Ngọc Duy1-3/+4
2016-07-13index-pack: correct "len" type in unpack_data()Nguyễn Thái Ngọc Duy1-7/+7
2016-07-13sha1_file.c: use type off_t* for object_info->disk_sizepNguyễn Thái Ngọc Duy2-3/+3
2016-07-12worktree: use strbuf_add_absolute_path() directlyRené Scharfe1-2/+2
2016-07-12rm: reuse strbuf for all remove_dir_recursively() callsRené Scharfe1-2/+3
2016-07-12pack-objects: pass length to check_pack_crc() without truncationNguyễn Thái Ngọc Duy2-2/+2
2016-07-12travis-ci: enable web server tests t55xx on LinuxLars Schneider1-0/+2
2016-07-11t/test-lib.sh: fix running tests with --valgrindJohannes Schindelin1-1/+1
2016-07-11diff: fix a double off-by-one with --ignore-space-at-eolJohannes Schindelin3-4/+6
2016-07-11diff: demonstrate a bug with --patience and --ignore-space-at-eolJohannes Schindelin1-0/+8
2016-07-11Git 2.9.1v2.9.1Junio C Hamano3-2/+58
2016-07-11Merge branch 'jc/t2300-setup' into maintJunio C Hamano1-1/+9
2016-07-11Merge branch 'cb/t7810-test-label-fix' into maintJunio C Hamano1-1/+1
2016-07-11Merge branch 'sb/t5614-modernize' into maintJunio C Hamano1-50/+20
2016-07-11Merge branch 'jn/preformatted-doc-url' into maintJunio C Hamano1-2/+2
2016-07-11Merge branch 'ao/p4-has-branch-prefix-fix' into maintJunio C Hamano1-1/+1
2016-07-11Merge branch 'js/perf-on-apple' into maintJunio C Hamano2-1/+7
2016-07-11Merge branch 'ak/t7800-wo-readlink' into maintJunio C Hamano1-1/+1
2016-07-11Merge branch 'jk/tzoffset-fix' into maintJunio C Hamano3-17/+71
2016-07-11Merge branch 'js/mingw-parameter-less-c-functions' into maintJunio C Hamano3-6/+6
2016-07-11Merge branch 'lc/shell-default-value-noexpand' into maintJunio C Hamano1-3/+3
2016-07-11Merge branch 'sb/clone-shallow-passthru' into maintJunio C Hamano3-8/+21
2016-07-11Merge branch 'mg/signature-doc' into maintJunio C Hamano2-0/+187
2016-07-11Merge branch 'jk/bisect-show-tree' into maintJunio C Hamano1-0/+1
2016-07-11Merge branch 'km/fetch-do-not-free-remote-name' into maintJunio C Hamano1-4/+2
2016-07-11Merge branch 'nd/graph-width-padded' into maintJunio C Hamano6-1/+80
2016-07-11Merge branch 'jk/add-i-diff-compact-heuristics' into maintJunio C Hamano1-0/+4
2016-07-11hoist out handle_nonblock function for xread and xwriteEric Wong1-28/+20
2016-07-08am: counteract gender biasJohannes Schindelin1-8/+8
2016-07-07notes-merge: use O_EXCL to avoid overwriting existing filesRené Scharfe1-5/+1
2016-07-07.gitattributes: set file type for C filesRené Scharfe1-1/+1
2016-07-06sideband.c: small optimization of strbuf usageNicolas Pitre1-3/+3
2016-07-06More fixes for 2.9.1Junio C Hamano1-0/+34
2016-07-06Merge branch 'jc/deref-tag' into maintJunio C Hamano2-6/+3
2016-07-06Merge branch 'pb/strbuf-read-file-doc' into maintJunio C Hamano1-0/+2
2016-07-06Merge branch 'jk/fetch-prune-doc' into maintJunio C Hamano1-1/+1
2016-07-06Merge branch 'pc/occurred' into maintJunio C Hamano2-2/+2
2016-07-06Merge branch 'mg/cherry-pick-multi-on-unborn' into maintJunio C Hamano1-5/+6
2016-07-06Merge branch 'em/newer-freebsd-shells-are-fine-with-returns' into maintJunio C Hamano3-6/+6
2016-07-06Merge branch 'lv/status-say-working-tree-not-directory' into maintJunio C Hamano1-1/+1
2016-07-06Merge branch 'nb/gnome-keyring-build' into maintJunio C Hamano1-2/+3
2016-07-06Merge branch 'et/add-chmod-x' into maintJunio C Hamano6-20/+68
2016-07-06Merge branch 'jk/avoid-unbounded-alloca' into maintJunio C Hamano1-6/+16
2016-07-06Merge branch 'rj/compat-regex-size-max-fix' into maintJunio C Hamano2-2/+1
2016-07-06Merge branch 'vs/prompt-avoid-unset-variable' into maintJunio C Hamano1-3/+3
2016-07-06Merge branch 'sg/reflog-past-root' into maintJunio C Hamano3-1/+29
2016-07-06Merge branch 'dn/gpg-doc' into maintJunio C Hamano2-2/+2
2016-07-06Merge branch 'ap/git-svn-propset-doc' into maintJunio C Hamano1-0/+14
2016-07-06Merge branch 'tr/doc-tt' into maintJunio C Hamano36-217/+224
2016-07-06t7610: test for mktemp before test executionArmin Kunaschik1-1/+6
2016-07-06Makefile: use VCSSVN_LIB to refer to svn libraryJeff King1-2/+2
2016-07-06Makefile: drop extra dependencies for test helpersJeff King1-8/+0
2016-07-06mailmap: use main email address for dturnerDavid Turner1-0/+1
2016-07-06parse_options: allocate a new array when concatenatingJeff King3-22/+22
2016-07-06t/lib-git-daemon: use test_match_signalJeff King1-2/+1
2016-07-06test_must_fail: use test_match_signalJeff King1-1/+1
2016-07-06t0005: use test_match_signal as appropriateJeff King1-2/+2
2016-07-06tests: factor portable signal check out of t0005Jeff King2-6/+22
2016-07-01grep: fix grepping for "intent to add" filesCharles Bailey2-2/+60
2016-07-01t7810-grep.sh: fix a whitespace inconsistencyCharles Bailey1-1/+1
2016-07-01t7810-grep.sh: fix duplicated test nameCharles Bailey1-1/+1
2016-07-01sideband.c: refactor recv_sideband()Lukas Fleischer1-74/+58
2016-07-01grep.c: reuse "icase" variableNguyễn Thái Ngọc Duy1-4/+1
2016-07-01diffcore-pickaxe: support case insensitive match on non-asciiNguyễn Thái Ngọc Duy2-0/+18
2016-07-01diffcore-pickaxe: Add regcomp_or_die()Nguyễn Thái Ngọc Duy1-9/+13
2016-07-01grep/pcre: support utf-8Nguyễn Thái Ngọc Duy2-0/+17
2016-07-01gettext: add is_utf8_locale()Nguyễn Thái Ngọc Duy2-2/+23
2016-07-01grep/pcre: prepare locale-dependent tables for icase matchingNguyễn Thái Ngọc Duy3-2/+26
2016-07-01grep: rewrite an if/else condition to avoid duplicate expressionNguyễn Thái Ngọc Duy1-4/+1
2016-07-01grep/icase: avoid kwsset when -F is specifiedNguyễn Thái Ngọc Duy4-1/+108
2016-06-29commit -S: avoid invalid pointer with empty messageJohannes Schindelin1-1/+6
2016-06-29reset --hard: skip blank lines when reporting the commit subjectJohannes Schindelin1-1/+1
2016-06-29sequencer: use skip_blank_lines() to find the commit subjectJohannes Schindelin1-4/+2
2016-06-29commit -C: skip blank lines at the beginning of the messageJohannes Schindelin1-1/+1
2016-06-29t3404: fix a grammo (commands are ran -> commands are run)Johannes Schindelin1-1/+1
2016-06-29rebase -i: restore autostash on abortPatrick Steinhardt2-0/+32
2016-06-28contrib/subtree: Add a test for subtree rebase that loses commitsDavid A. Greene1-0/+119
2016-06-28color.h: remove obsolete comment about limitations on WindowsJohannes Schindelin1-5/+0
2016-06-28doc: typeset HEAD and variants as literalMatthieu Moy11-26/+26
2016-06-28CodingGuidelines: formatting HEAD in documentationMatthieu Moy1-2/+3
2016-06-28doc: typeset long options with argument as literalMatthieu Moy1-2/+2
2016-06-28doc: typeset '--' as literalMatthieu Moy3-4/+4
2016-06-28doc: typeset long command-line options as literalMatthieu Moy46-149/+149
2016-06-28doc: typeset short command-line options as literalMatthieu Moy23-52/+52
2016-06-28Documentation/git-mv.txt: fix whitespace indentationMatthieu Moy1-2/+2
2016-06-27Start preparing for 2.9.1Junio C Hamano2-1/+29
2016-06-27Merge branch 'rs/xdiff-hunk-with-func-line' into maintJunio C Hamano10-93/+365