summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2013-07-24Git 1.8.4-rc0v1.8.4-rc0Junio C Hamano2-2/+10
2013-07-24Merge branch 'mh/multimail'Junio C Hamano7-4/+3411
2013-07-24Merge branch 'ob/typofixes'Junio C Hamano22-38/+38
2013-07-24Merge branch 'es/contacts'Junio C Hamano2-0/+282
2013-07-24Merge branch 'ml/cygwin-updates'Junio C Hamano1-6/+7
2013-07-24Merge branch 'rj/sparse'Junio C Hamano1-0/+3
2013-07-24Merge branch 'sb/traverse-trees-bitmask-variable-name'Junio C Hamano1-6/+5
2013-07-24Merge branch 'jk/cat-file-batch-optim'Junio C Hamano6-71/+145
2013-07-24Merge branch 'ml/avoid-using-grep-on-crlf-files'Junio C Hamano3-2/+4
2013-07-24Merge branch 'jm/doc-ref-prune'Junio C Hamano2-3/+3
2013-07-24Merge branch 'rh/template-updates'Junio C Hamano1-14/+13
2013-07-24Merge branch 'mh/ref-races-optim-invalidate-cached'Junio C Hamano1-3/+6
2013-07-24Merge branch 'sb/misc-fixes'Junio C Hamano3-5/+2
2013-07-24Merge branch 'tr/line-log'Junio C Hamano2-3/+19
2013-07-24t4211: fix incorrect rebase at f8395edc (range-set: satisfy non-empty ranges ...Junio C Hamano1-1/+0
2013-07-23Merge branch 'es/line-log-further-fixes' into tr/line-logJunio C Hamano3-7/+153
2013-07-23line-log: fix "log -LN" crash when N is last line of fileEric Sunshine2-1/+2
2013-07-23range-set: satisfy non-empty ranges invariantEric Sunshine2-1/+4
2013-07-23t4211: demonstrate crash when first -L encountered is empty rangeEric Sunshine1-0/+5
2013-07-23t4211: demonstrate empty -L range crashEric Sunshine1-0/+8
2013-07-23range-set: fix sort_and_merge_range_set() corner case bugEric Sunshine1-3/+3
2013-07-23open_istream: remove unneeded check for null pointerStefan Beller1-1/+1
2013-07-23Merge branch 'mv/merge-ff-tristate'Junio C Hamano1-1/+1
2013-07-23t7600: fix typo in test titleJunio C Hamano1-1/+1
2013-07-22post-receive-email: deprecate script in favor of git-multimailMichael Haggerty1-4/+13
2013-07-22typofix: in-code commentsOndřej Bílka9-23/+23
2013-07-22typofix: documentationOndřej Bílka7-7/+7
2013-07-22typofix: release notesOndřej Bílka6-8/+8
2013-07-22Sync with Git 1.8.3.4Junio C Hamano4-5/+6
2013-07-22Update draft release notes to 1.8.4Junio C Hamano1-0/+50
2013-07-22Merge branch 'jc/name-rev-exact-ref'Junio C Hamano3-32/+142
2013-07-22Merge branch 'rr/send-email-ssl-verify'Junio C Hamano3-3/+48
2013-07-22Merge branch 'es/check-mailmap'Junio C Hamano9-0/+162
2013-07-22Merge branch 'jx/clean-interactive'Junio C Hamano14-171/+1473
2013-07-22Merge branch 'hv/config-from-blob'Junio C Hamano5-53/+278
2013-07-22Merge branch 'mk/upload-pack-off-by-one-dead-code-removal'Junio C Hamano1-11/+6
2013-07-22Merge branch 'jk/t0008-sigpipe-fix'Junio C Hamano1-2/+10
2013-07-22Merge branch 'nd/const-struct-cache-entry'Junio C Hamano29-85/+93
2013-07-22Merge branch 'jk/gcc-function-attributes'Junio C Hamano10-5/+21
2013-07-22Merge branch 'db/show-ref-head'Junio C Hamano3-6/+179
2013-07-22Merge branch 'es/blame-L-breakage'Junio C Hamano5-115/+283
2013-07-22Merge branch 'tr/protect-low-3-fds'Junio C Hamano5-21/+24
2013-07-22Merge branch 'sb/parse-object-buffer-eaten'Junio C Hamano1-4/+3
2013-07-22Merge branch 'tr/do-not-call-submodules-subprojects'Junio C Hamano3-5/+5
2013-07-22Merge branch 'mm/diff-no-patch-synonym-to-s'Junio C Hamano6-28/+75
2013-07-22Merge branch 'dw/request-pull-diag'Junio C Hamano1-2/+12
2013-07-22Merge branch 'jc/mailmap-case-insensitivity'Junio C Hamano2-28/+57
2013-07-22Merge branch 'tr/fd-gotcha-fixes'Junio C Hamano2-2/+5
2013-07-22Merge branch 'mm/color-auto-default'Junio C Hamano1-0/+1
2013-07-22Merge branch 'jc/simple-add-must-be-a-no-op'Junio C Hamano1-0/+10
2013-07-22Git 1.8.3.4v1.8.3.4Junio C Hamano2-2/+3
2013-07-22update URL to the marc.info mail archiveOndřej Bílka3-4/+4
2013-07-21Sync with maintJunio C Hamano2-3/+25
2013-07-21Update draft release notes to 1.8.3.4Junio C Hamano1-0/+5
2013-07-21Merge branch 'rr/maint-fetch-tag-doc-asterisks' into maintJunio C Hamano1-1/+1
2013-07-21Merge branch 'dk/maint-t5150-dirname' into maintJunio C Hamano1-1/+1
2013-07-21Merge branch 'dk/version-gen-gitdir' into maintJunio C Hamano1-1/+1
2013-07-21Merge branch 'nk/config-local-doc' into maintJunio C Hamano1-0/+9
2013-07-21Merge branch 'kb/diff-blob-blob-doc' into maintJunio C Hamano1-7/+7
2013-07-21Merge branch 'mm/merge-in-dirty-worktree-doc' into maintJunio C Hamano1-2/+2
2013-07-21Merge branch 'ph/builtin-srcs-are-in-subdir-these-days' into maintJunio C Hamano9-21/+20
2013-07-21Merge branch 'ft/doc-git-transport' into maintJunio C Hamano1-0/+3
2013-07-21Merge branch 'mh/maint-lockfile-overflow' into maintJunio C Hamano1-4/+6
2013-07-21Merge branch 'jc/maint-diff-core-safecrlf' into maintJunio C Hamano2-1/+17
2013-07-21cygwin: stop forcing core.filemode=falseMark Levedahl1-1/+0
2013-07-21Cygwin 1.7 supports mmapMark Levedahl1-4/+4
2013-07-21Cygwin 1.7 has thread-safe preadMark Levedahl1-1/+1
2013-07-21Cygwin 1.7 needs compat/regexMark Levedahl1-0/+2
2013-07-21t9801: git-p4: check ignore files with client specVitor Antunes1-3/+20
2013-07-21contrib: contacts: add documentationEric Sunshine1-0/+94
2013-07-21contrib: contacts: add mailmap supportEric Sunshine1-0/+18
2013-07-21contrib: contacts: interpret committish akin to format-patchEric Sunshine1-1/+18
2013-07-21contrib: contacts: add ability to parse from committishEric Sunshine1-6/+32
2013-07-21contrib: add git-contacts helperEric Sunshine1-0/+127
2013-07-21Revert "compat/unsetenv.c: Fix a sparse warning"Benoit Sigoure1-0/+3
2013-07-19t2202: make sure "git add" (no args) stays a no-opJunio C Hamano1-0/+10
2013-07-19traverse_trees(): clarify return value of the callbackStefan Beller1-6/+5
2013-07-19git add -e: Explicitly specify that patch should have no colorAndrew Wong1-0/+1
2013-07-19Sync with maintJunio C Hamano4-3/+18
2013-07-19Start preparing for 1.8.3.4Junio C Hamano2-1/+16
2013-07-19apply.c::find_name_traditional(): do not initialize len to the line's lengthStefan Beller1-1/+1
2013-07-19http-push.c::add_send_request(): do not initialize transfer_requestStefan Beller1-1/+1
2013-07-19Merge branch 'tr/test-lint-no-export-assignment-in-shell' into maintJunio C Hamano2-1/+2
2013-07-19Merge branch 'rr/name-rev-stdin-doc' into maintJunio C Hamano1-2/+4
2013-07-19Merge branch 'ft/diff-rename-default-score-is-half' into maintJunio C Hamano1-1/+1
2013-07-19Merge branch 'jc/t1512-fix' into maintJunio C Hamano2-11/+23
2013-07-19Merge branch 'vl/typofix' into maintJunio C Hamano3-3/+3
2013-07-19Merge branch 'wk/doc-git-has-grown' into maintJunio C Hamano1-3/+3
2013-07-19Merge branch 'ys/cygstart' into maintJunio C Hamano2-3/+9
2013-07-19Merge branch 'mm/push-force-is-dangerous' into maintJunio C Hamano1-0/+9
2013-07-19Merge branch 'rs/logical-vs-binary-or' into maintJunio C Hamano3-6/+6
2013-07-19Merge branch 'js/test-ln-s-add' into maintJunio C Hamano30-333/+351
2013-07-19Merge branch 'jk/apache-test-for-2.4' into maintJunio C Hamano1-1/+19
2013-07-19Merge branch 'tr/test-commit-only-on-orphan' into maintJunio C Hamano1-0/+13
2013-07-19Merge branch 'sb/archive-zip-double-assignment-fix' into maintJunio C Hamano1-1/+0
2013-07-19Merge branch 'th/bisect-skip-report-range-fix' into maintJunio C Hamano1-2/+2
2013-07-19Merge branch 'rs/tar-tests' into maintJunio C Hamano3-78/+92
2013-07-19Merge branch 'rr/column-doc' into maintJunio C Hamano1-3/+17
2013-07-19Merge branch 'rs/discard-index-discard-array' into maintJunio C Hamano5-2/+32
2013-07-19Merge branch 'tr/coverage' into maintJunio C Hamano1-8/+13
2013-07-19Documentation: "git reset <tree-ish> <pathspec>" takes a tree-ish, not tree-shStefan Beller1-1/+1
2013-07-19Add the LAST_ARG_MUST_BE_NULL macroRamsay Jones5-5/+12
2013-07-18test-lib.sh - define and use GREP_STRIPS_CRMark Levedahl3-2/+4
2013-07-18Fix some sparse warningsRamsay Jones2-2/+2
2013-07-18Documentation: fix git-prune example usageJonathon Mah1-1/+1
2013-07-18Documentation: remove --prune from pack-refs examplesJonathon Mah1-2/+2
2013-07-18send-email: be explicit with SSL certificate verificationRamkumar Ramachandra3-3/+48
2013-07-18describe: fix --contains when a tag is given as inputJunio C Hamano3-2/+30
2013-07-18name-rev: differentiate between tags and commits they point atJunio C Hamano2-8/+28
2013-07-18Update draft release notes to 1.8.4Junio C Hamano1-0/+16
2013-07-18Merge branch 'jc/revert-clone-doc-update-for-push-from-shallow'Junio C Hamano1-7/+5
2013-07-18Merge branch 'rs/mailmap-himself'Junio C Hamano1-1/+1
2013-07-18Merge branch 'sb/mailmap-updates'Junio C Hamano1-34/+151
2013-07-18Merge branch 'jk/in-pack-size-measurement'Junio C Hamano7-106/+390
2013-07-18Merge branch 'bp/mediawiki-preview'Junio C Hamano8-83/+528
2013-07-18Merge branch 'bc/commit-invalid-utf8'Junio C Hamano2-6/+68
2013-07-18Merge branch 'es/overlapping-range-set'Junio C Hamano2-4/+133
2013-07-18Merge branch 'jk/maint-clone-shared-no-connectivity-validation'Junio C Hamano2-10/+19
2013-07-18Merge branch 'bc/push-match-many-refs'Junio C Hamano1-2/+25
2013-07-18Merge branch 'rr/rebase-reflog-message-reword'Junio C Hamano3-3/+26
2013-07-18show-branch: fix description of --date-orderThomas Rast1-3/+3
2013-07-18apply, entry: speak of submodules instead of subprojectsThomas Rast2-3/+3
2013-07-17.mailmap: combine more (email, name) to individual personsStefan Beller1-3/+7
2013-07-17parse_object_buffer: correct freeing the bufferStefan Beller1-4/+3
2013-07-17blame-options.txt: explain that -L <start> and <end> are optionalEric Sunshine1-2/+5
2013-07-17blame-options.txt: place each -L option variation on its own lineEric Sunshine1-1/+2
2013-07-17t8001/t8002 (blame): add blame -L :funcname testsEric Sunshine1-2/+46
2013-07-17t8001/t8002 (blame): add blame -L testsEric Sunshine1-3/+101
2013-07-17t8001/t8002 (blame): modernize styleEric Sunshine3-112/+127
2013-07-17line-range: fix "blame -L X,-N" regressionEric Sunshine1-0/+7
2013-07-17.mailmap: René Scharfe has a new email addressRené Scharfe1-1/+1
2013-07-17show-ref: make --head always show the HEAD refDoug Bell3-6/+179
2013-07-17Documentation/git-log.txt: capitalize section namesMatthieu Moy1-4/+4
2013-07-17Documentation: move description of -s, --no-patch to diff-options.txtMatthieu Moy2-4/+5
2013-07-17Documentation/git-show.txt: include common diff options, like git-log.txtMatthieu Moy1-0/+9
2013-07-17diff: allow --patch & cie to override -s/--no-patchMatthieu Moy2-11/+35
2013-07-17diff: allow --no-patch as synonym for -sMatthieu Moy3-1/+14
2013-07-17t4000-diff-format.sh: modernize styleMatthieu Moy1-9/+9
2013-07-17git-log.txt: fix typesetting of example "git-log -L" invocationEric Sunshine1-1/+1
2013-07-17git: ensure 0/1/2 are open in main()Thomas Rast1-0/+7
2013-07-17daemon/shell: refactor redirection of 0/1/2 from /dev/nullThomas Rast4-21/+17
2013-07-17request-pull: improve error message for invalid revision argsDirk Wallenstein1-2/+12
2013-07-15git-multimail: an improved replacement for post-receive-emailMichael Haggerty6-0/+3398
2013-07-15upload-pack: remove a piece of dead codeMatthijs Kooijman1-11/+6
2013-07-15Update draft release notes to 1.8.4Junio C Hamano1-29/+29
2013-07-15Sync with 1.8.3.3Junio C Hamano2-1/+23
2013-07-15Git 1.8.3.3v1.8.3.3Junio C Hamano3-2/+24
2013-07-15Merge branch 'tr/maint-apply-non-git-patch-parsefix' into maintJunio C Hamano2-1/+15
2013-07-15Merge branch 'bc/http-keep-memory-given-to-curl' into maintJunio C Hamano1-3/+9
2013-07-15Merge branch 'jk/pull-into-dirty-unborn' into maintJunio C Hamano2-2/+38
2013-07-15Merge branch 'fg/submodule-non-ascii-path' into maintJunio C Hamano2-1/+17
2013-07-15Merge branch 'fc/sequencer-plug-leak' into maintJunio C Hamano1-7/+11
2013-07-15Merge branch 'mt/send-email-cc-match-fix' into maintJunio C Hamano2-9/+106
2013-07-15Merge branch 'bc/send-email-use-port-as-separate-param'Junio C Hamano1-2/+4
2013-07-15Merge branch 'fg/submodule-clone-depth'Junio C Hamano4-12/+62
2013-07-15Merge branch 'cp/submodule-custom-update'Junio C Hamano3-1/+38
2013-07-15Merge branch 'jk/format-patch-from'Junio C Hamano7-9/+145
2013-07-15Merge branch 'mv/merge-ff-tristate'Junio C Hamano2-25/+42
2013-07-15Merge branch 'jk/fetch-pack-many-refs'Junio C Hamano3-9/+11
2013-07-15templates: spell ASCII in uppercase in pre-commit hookRichard Hartmann1-3/+3
2013-07-15templates: Reformat pre-commit hook's messageRichard Hartmann1-4/+2
2013-07-15templates: Use heredoc in pre-commit hookRichard Hartmann1-12/+13
2013-07-15diff.c: Do not initialize a variable, which gets reassigned anyway.Stefan Beller1-3/+1
2013-07-15commit: Fix a memory leak in determine_author_infoStefan Beller1-1/+0
2013-07-15daemon.c:handle: Remove unneeded check for null pointer.Stefan Beller1-1/+1
2013-07-15Revert "git-clone.txt: remove the restriction on pushing from a shallow clone"Junio C Hamano1-7/+5
2013-07-15mailmap: style fixesJunio C Hamano1-15/+27
2013-07-15mailmap: debug: avoid passing NULL to fprintf() '%s' conversion specificationEric Sunshine1-6/+9
2013-07-15mailmap: debug: eliminate -Wformat field precision type warningEric Sunshine1-3/+3
2013-07-15mailmap: debug: fix malformed fprintf() format conversion specificationEric Sunshine1-1/+1
2013-07-15mailmap: debug: fix out-of-order fprintf() argumentsEric Sunshine1-1/+1
2013-07-15mailmap: do not downcase mailmap entriesJunio C Hamano2-13/+9
2013-07-15t4203: demonstrate loss of uppercase characters in canonical emailEric Sunshine1-0/+9
2013-07-15mailmap: do not lose single-letter namesJunio C Hamano2-2/+2
2013-07-15t4203: demonstrate loss of single-character name in mailmap entryEric Sunshine1-0/+9
2013-07-15.mailmap: Combine more (email, name) to individual personsStefan Beller1-7/+35
2013-07-13t4203: test check-mailmap command invocationEric Sunshine1-0/+43
2013-07-13builtin: add git-check-mailmap commandEric Sunshine8-0/+119
2013-07-12.mailmap: Map email addresses to namesStefan Beller1-25/+110
2013-07-12Update draft release notes for 1.8.4Junio C Hamano1-0/+7
2013-07-12Merge branch 'jc/remote-http-argv-array'Junio C Hamano1-16/+16
2013-07-12Merge branch 'rs/pickaxe-simplify'Junio C Hamano1-7/+4
2013-07-12Merge branch 'tr/test-lint-no-export-assignment-in-shell'Junio C Hamano2-1/+2
2013-07-12Merge branch 'rr/name-rev-stdin-doc'Junio C Hamano1-2/+4
2013-07-12Merge branch 'ft/diff-rename-default-score-is-half'Junio C Hamano1-1/+1
2013-07-12Merge branch 'ml/cygwin-does-not-have-fifo'Junio C Hamano1-1/+8
2013-07-12Merge branch 'tf/gitweb-extra-breadcrumbs'Junio C Hamano2-3/+26
2013-07-12Merge branch 'ms/remote-tracking-branches-in-doc'Junio C Hamano6-14/+17
2013-07-12Merge branch 'jk/pull-to-integrate'Junio C Hamano3-8/+8
2013-07-12Merge branch 'jk/maint-config-multi-order'Junio C Hamano1-8/+12
2013-07-12Merge branch 'as/log-output-encoding-in-user-format'Junio C Hamano9-136/+265
2013-07-12git-clone.txt: remove the restriction on pushing from a shallow cloneNguyễn Thái Ngọc Duy1-5/+7
2013-07-12run-command: dup_devnull(): guard against syscalls failingThomas Rast1-1/+4
2013-07-12git_mkstemps: correctly test return value of open()Dale R. Worley1-1/+1
2013-07-12sha1_object_info_extended: pass object_info to helpersJeff King1-27/+22
2013-07-12sha1_object_info_extended: make type calculation optionalJeff King4-11/+19
2013-07-12packed_object_info: make type lookup optionalJeff King1-9/+16
2013-07-12packed_object_info: hoist delta type resolution to helperJeff King1-40/+53
2013-07-12sha1_loose_object_info: make type lookup optionalJeff King1-5/+43
2013-07-12sha1_object_info_extended: rename "status" to "type"Jeff King1-10/+10