summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2014-07-30Git 2.0.4v2.0.4Junio C Hamano4-3/+9
2014-07-30commit --amend: test specifies authorship but forgets to checkFabian Ruch1-0/+1
2014-07-28t4013: test diff-tree's --stdin commit formattingJeff King1-0/+10
2014-07-28Merge branch 'jk/alloc-commit-id-maint' into maintJunio C Hamano11-89/+103
2014-07-28diff-tree: avoid lookup_unknown_objectJeff King1-3/+1
2014-07-28object_as_type: set commit indexJeff King1-0/+2
2014-07-28alloc: factor out commit indexJeff King2-2/+8
2014-07-28add object_as_type helper for casting objectsJeff King7-43/+25
2014-07-28parse_object_buffer: do not set object typeJeff King1-2/+0
2014-07-28move setting of object->type to alloc_* functionsJeff King8-12/+13
2014-07-28alloc: write out allocator definitionsJeff King1-11/+27
2014-07-28alloc.c: remove the alloc_raw_commit_node() functionRamsay Jones1-18/+29
2014-07-23Git 2.0.3v2.0.3Junio C Hamano4-3/+21
2014-07-23.mailmap: combine Stefan Beller's emailsStefan Beller1-0/+1
2014-07-23git.1: switch homepage for statsStefan Beller1-1/+1
2014-07-22Merge branch 'ah/fix-http-push' into maintJunio C Hamano1-1/+1
2014-07-22Merge branch 'po/error-message-style' into maintJunio C Hamano1-0/+9
2014-07-22Merge branch 'zk/log-graph-showsig' into maintJunio C Hamano2-0/+32
2014-07-22Merge branch 'mg/fix-log-mergetag-color' into maintJunio C Hamano1-10/+11
2014-07-22Merge branch 'cb/filter-branch-prune-empty-degenerate-merges' into maintJunio C Hamano2-1/+18
2014-07-22Merge branch 'ye/doc-http-proto' into maintJunio C Hamano1-1/+1
2014-07-22Merge branch 'jm/api-strbuf-doc' into maintJunio C Hamano1-5/+5
2014-07-22Merge branch 'jm/dedup-test-config' into maintJunio C Hamano1-5/+0
2014-07-22Merge branch 'sk/test-cmp-bin' into maintJunio C Hamano5-22/+28
2014-07-22Merge branch 'jm/doc-wording-tweaks' into maintJunio C Hamano2-9/+8
2014-07-22Merge branch 'jm/instaweb-apache-24' into maintJunio C Hamano1-1/+11
2014-07-22Merge branch 'bg/xcalloc-nmemb-then-size' into maintJunio C Hamano12-21/+21
2014-07-22Merge branch 'cb/byte-order' into maintJunio C Hamano1-9/+24
2014-07-22Merge branch 'lt/request-pull' into maintJunio C Hamano1-1/+1
2014-07-22Merge branch 'ep/shell-assign-and-export-vars' into maintJunio C Hamano5-5/+16
2014-07-22Merge branch 'maint-1.9' into maintJunio C Hamano1-1/+1
2014-07-22Merge branch 'maint-1.8.5' into maint-1.9Junio C Hamano1-1/+1
2014-07-22Documentation: fix missing text for rev-parse --verifybrian m. carlson1-1/+1
2014-07-21use xmemdupz() to allocate copies of strings given by start and lengthRené Scharfe6-19/+6
2014-07-21use xcalloc() to allocate zero-initialized memoryRené Scharfe4-8/+4
2014-07-16Git 2.0.2v2.0.2Junio C Hamano3-2/+22
2014-07-16Merge branch 'jc/fix-clone-single-starting-at-a-tag' into maintJunio C Hamano1-1/+1
2014-07-16Merge branch 'jk/pretty-G-format-fixes' into maintJunio C Hamano3-9/+70
2014-07-16Merge branch 'rs/fix-alt-odb-path-comparison' into maintJunio C Hamano1-1/+2
2014-07-16Merge branch 'jk/commit-buffer-length' into maintJunio C Hamano27-197/+284
2014-07-16Merge branch 'bc/fix-rebase-merge-skip' into maintJunio C Hamano2-2/+18
2014-07-16Merge branch 'maint-1.9' into maintJunio C Hamano1-7/+5
2014-07-16Merge branch 'maint-1.8.5' into maint-1.9Junio C Hamano4-11/+9
2014-07-16annotate: use argv_arrayRené Scharfe1-7/+5
2014-07-13http-push.c: make CURLOPT_IOCTLDATA a usable pointerAbbaad Haider1-1/+1
2014-07-10log: correctly identify mergetag signature verification statusMichael J Gruber1-10/+11
2014-07-10doc: give some guidelines for error messagesPhilip Oakley1-0/+9
2014-07-10Start preparing for 2.0.2Junio C Hamano2-1/+14
2014-07-10Merge branch 'pb/trim-trailing-spaces' into maintJunio C Hamano2-15/+44
2014-07-10Merge branch 'jk/repack-pack-keep-objects' into maintJunio C Hamano2-7/+27
2014-07-10Merge branch 'mc/doc-submodule-sync-recurse' into maintJunio C Hamano1-1/+1
2014-07-09log: fix indentation for --graph --show-signatureZoltan Klinger2-0/+32
2014-07-02Merge branch 'maint-1.8.5' into maintJunio C Hamano3-4/+4
2014-07-02t7300: repair filesystem permissions with test_when_finishedJeff King1-2/+2
2014-07-02enums: remove trailing ',' after last item in enumRonnie Sahlberg2-2/+2
2014-07-01sha1_file: avoid overrunning alternate object base stringRené Scharfe1-1/+2
2014-07-01filter-branch: eliminate duplicate mapped parentsCharles Bailey2-1/+18
2014-06-25move "%G" format test from t7510 to t6006Jeff King2-6/+6
2014-06-25Git 2.0.1v2.0.1Junio C Hamano4-3/+119
2014-06-25Merge branch 'na/no-http-test-in-the-middle' into maintJunio C Hamano2-59/+100
2014-06-25Merge branch 'jl/status-added-submodule-is-never-ignored' into maintJunio C Hamano5-8/+108
2014-06-25Merge branch 'ym/fix-opportunistic-index-update-race' into maintJunio C Hamano6-5/+90
2014-06-25Merge branch 'mk/show-s-no-extra-blank-line-for-merges' into maintJunio C Hamano4-11/+15
2014-06-25Merge branch 'rr/rebase-autostash-fix' into maintJunio C Hamano3-3/+27
2014-06-25Merge branch 'jc/shortlog-ref-exclude' into maintJunio C Hamano2-0/+7
2014-06-25Merge branch 'jl/remote-rm-prune' into maintJunio C Hamano3-9/+52
2014-06-25Merge branch 'fc/rerere-conflict-style' into maintJunio C Hamano1-0/+2
2014-06-25Merge branch 'rs/pack-objects-no-unnecessary-realloc' into maintJunio C Hamano1-2/+2
2014-06-25Merge branch 'dt/merge-recursive-case-insensitive' into maintJunio C Hamano3-1/+61
2014-06-25Merge branch 'rs/mailinfo-header-cmp' into maintJunio C Hamano1-3/+3
2014-06-25Merge branch 'jk/index-pack-report-missing' into maintJunio C Hamano1-2/+7
2014-06-25Merge branch 'nd/index-pack-one-fd-per-thread' into maintJunio C Hamano3-18/+17
2014-06-25Merge branch 'sk/spawn-less-case-insensitively-from-grep-O-i' into maintJunio C Hamano1-0/+3
2014-06-25Merge branch 'nd/daemonize-gc' into maintJunio C Hamano1-6/+20
2014-06-25Merge branch 'jk/diff-follow-must-take-one-pathspec' into maintJunio C Hamano2-6/+5
2014-06-25Merge branch 'jk/diff-files-assume-unchanged' into maintJunio C Hamano2-12/+32
2014-06-25Merge branch 'jk/commit-C-pick-empty' into maintJunio C Hamano2-4/+12
2014-06-25Merge branch 'bc/blame-crlf-test' into maintJunio C Hamano2-1/+9
2014-06-25Merge branch 'jx/blame-align-relative-time' into maintJunio C Hamano1-8/+22
2014-06-25Merge branch 'jc/apply-ignore-whitespace' into maintJunio C Hamano2-13/+11
2014-06-25Merge branch 'jk/complete-merge-pull' into maintJunio C Hamano1-1/+5
2014-06-25Merge branch 'ow/config-mailmap-pathname' into maintJunio C Hamano1-1/+1
2014-06-25Merge branch 'as/pretty-truncate' into maintJunio C Hamano5-72/+282
2014-06-25Merge branch 'jc/revision-dash-count-parsing' into maintJunio C Hamano1-2/+4
2014-06-25Merge branch 'jk/report-fail-to-read-objects-better' into maintJunio C Hamano1-1/+5
2014-06-25Merge branch 'mn/sideband-no-ansi' into maintJunio C Hamano1-1/+1
2014-06-25Merge branch 'je/pager-do-not-recurse' into maintJunio C Hamano1-1/+1
2014-06-23builtin/clone.c: detect a clone starting at a tag correctlyJunio C Hamano1-1/+1
2014-06-17pretty: avoid reading past end-of-string with "%G"Jeff King2-0/+8
2014-06-17t7510: check %G* pretty-format outputJeff King1-0/+40
2014-06-17t7510: test a commit signed by an unknown keyJeff King1-0/+13
2014-06-17t7510: use consistent &&-chains in loopMichael J Gruber1-6/+6
2014-06-17t7510: stop referring to master in later testsJeff King1-3/+3
2014-06-16rebase--merge: fix --skip with two conflicts in a rowbrian m. carlson2-2/+18
2014-06-16http-protocol.txt: Basic Auth is defined in RFC 2617, not RFC 2616Yi EungJun1-1/+1
2014-06-13submodule: document "sync --recursive"Matthew Chen1-1/+1
2014-06-13t0008: do not depend on 'echo' handling backslashes speciallyJunio C Hamano1-6/+8
2014-06-13reuse cached commit buffer when parsing signaturesJeff King3-19/+12
2014-06-13commit: record buffer length in cacheJeff King16-38/+68
2014-06-13commit: convert commit->buffer to a slabJeff King2-8/+13
2014-06-13commit-slab: provide a static initializerJeff King1-0/+12
2014-06-13use get_commit_buffer everywhereJeff King7-9/+33
2014-06-13convert logmsg_reencode to get_commit_bufferJeff King6-35/+16
2014-06-13use get_commit_buffer to avoid duplicate codeJeff King2-27/+7
2014-06-13use get_cached_commit_buffer where appropriateJeff King3-3/+3
2014-06-13provide helpers to access the commit bufferJeff King2-0/+49
2014-06-13provide a helper to set the commit bufferJeff King4-3/+14
2014-06-13provide a helper to free commit bufferJeff King6-9/+30
2014-06-12Merge branch 'jc/rev-parse-argh-dashed-multi-words' into maintJunio C Hamano2-0/+7
2014-06-12pull: do not abuse 'break' inside a shell 'case'Jacek Konieczny1-2/+0
2014-06-12sequencer: use logmsg_reencode in get_messageJeff King1-40/+5
2014-06-12logmsg_reencode: return const bufferJeff King5-16/+23
2014-06-12do not create "struct commit" with xcallocJeff King2-2/+2
2014-06-12commit: push commit_index update into alloc_commit_nodeJeff King2-4/+10
2014-06-12alloc: include any-object allocations in alloc_reportJeff King1-6/+7
2014-06-12replace dangerous uses of strbuf_attachJeff King2-8/+3
2014-06-12commit_tree: take a pointer/len pair rather than a const strbufJeff King9-22/+29
2014-06-10repack: s/write_bitmap/&s/ in codeJeff King1-6/+6
2014-06-10repack: respect pack.writebitmapsJeff King2-2/+22
2014-06-10repack: do not accidentally pack kept objects by defaultJeff King2-2/+2
2014-06-09api-strbuf.txt minor typosJeremiah Mahler1-5/+5
2014-06-09revision: parse "git log -<count>" more carefullyJunio C Hamano1-2/+4
2014-06-05t/t7810-grep.sh: remove duplicate test_config()Jeremiah Mahler1-5/+0
2014-06-04shortlog: allow --exclude=<glob> to be passedJunio C Hamano2-0/+7
2014-06-04t5000, t5003: do not use test_cmp to compare binary filesStepan Kasal5-22/+28
2014-06-04update-index: fix segfault with missing --cacheinfo argumentJeff King2-0/+7
2014-06-02dir.c:trim_trailing_spaces(): fix for " \ " sequencePasha Bolokhov2-15/+42
2014-06-02pack-objects: use free()+xcalloc() instead of xrealloc()+memset()René Scharfe1-2/+2
2014-06-02mailinfo: use strcmp() for string comparisonRené Scharfe1-3/+3
2014-06-02fix brown paper bag breakage in t5150-request-pull.shJohannes Sixt1-1/+1
2014-06-02sideband.c: do not use ANSI control sequence on non-terminalMichael Naumov1-1/+1
2014-05-30compat/bswap.h: fix endianness detectionBen Walton1-1/+1
2014-05-30t5538: move http push tests out to t5542Nick Alcock2-59/+100
2014-05-30Sync with 1.9.4Junio C Hamano2-1/+18
2014-05-30Git 1.9.4v1.9.4Junio C Hamano4-3/+20
2014-05-30t5537: re-drop http testsJeff King1-28/+0
2014-05-28Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname' into maintJunio C Hamano2-20/+42
2014-05-28Merge branch 'mw/symlinks' into maintJunio C Hamano3-20/+112
2014-05-28Git 2.0v2.0.0Junio C Hamano2-1/+6
2014-05-28Documentation: wording fixes in the user manual and glossaryJeremiah Mahler2-9/+8
2014-05-27transport-helper.c: rearrange xcalloc argumentsBrian Gesiak1-1/+1
2014-05-27remote.c: rearrange xcalloc argumentsBrian Gesiak1-1/+1
2014-05-27reflog-walk.c: rearrange xcalloc argumentsBrian Gesiak1-4/+4
2014-05-27pack-revindex.c: rearrange xcalloc argumentsBrian Gesiak1-1/+1
2014-05-27notes.c: rearrange xcalloc argumentsBrian Gesiak1-3/+3
2014-05-27imap-send.c: rearrange xcalloc argumentsBrian Gesiak1-1/+1
2014-05-27http-push.c: rearrange xcalloc argumentsBrian Gesiak1-1/+1
2014-05-27diff.c: rearrange xcalloc argumentsBrian Gesiak1-1/+1
2014-05-27config.c: rearrange xcalloc argumentsBrian Gesiak1-2/+2
2014-05-27commit.c: rearrange xcalloc argumentsBrian Gesiak1-1/+1
2014-05-27builtin/remote.c: rearrange xcalloc argumentsBrian Gesiak1-4/+4
2014-05-27builtin/ls-remote.c: rearrange xcalloc argumentsBrian Gesiak1-1/+1
2014-05-27config: respect '~' and '~user' in mailmap.fileØystein Walle1-1/+1
2014-05-27git-instaweb: add support for Apache 2.4Jonathan McCrohan1-1/+11
2014-05-27gc --auto: do not lock refs in the backgroundNguyễn Thái Ngọc Duy1-6/+20
2014-05-27remote prune: optimize "dangling symref" check/warningJens Lindström3-2/+25
2014-05-27remote: repack packed-refs once when deleting multiple refsJens Lindström3-3/+21
2014-05-27completion: add missing options for git-mergeJohn Keeping1-1/+4
2014-05-27completion: add a note that merge options are sharedJohn Keeping1-0/+1
2014-05-23scripts: more "export VAR=VALUE" fixesJunio C Hamano2-2/+10
2014-05-23scripts: "export VAR=VALUE" construct is not portableElia Pinto3-3/+6
2014-05-23remote rm: delete remote configuration as the lastJens Lindström1-4/+6
2014-05-21Update draft release notes to 2.0Junio C Hamano1-9/+5
2014-05-21pretty.c: format string with truncate respects logOutputEncodingAlexey Shumkin3-8/+13
2014-05-21t4205, t6006: add tests that fail with i18n.logOutputEncoding setAlexey Shumkin2-2/+213
2014-05-21t4205 (log-pretty-format): use `tformat` rather than `format`Alexey Shumkin1-39/+13
2014-05-21t4041, t4205, t6006, t7102: don't hardcode tested encoding valueAlexey Shumkin4-27/+39
2014-05-20Git 2.0-rc4v2.0.0-rc4Junio C Hamano1-1/+1
2014-05-20RelNotes/2.0.0.txt: Fix several grammar issues, notably a lack of hyphens, do...Jason St. John1-36/+37
2014-05-20Revert "Merge branch 'jc/graduate-remote-hg-bzr' (early part)"Junio C Hamano11-4360/+87
2014-05-20rebase -i: test "Nothing to do" case with autostashMatthieu Moy1-0/+15
2014-05-20move "--follow needs one pathspec" rule to diff_setup_doneJeff King2-6/+5
2014-05-19Merge branch 'jc/graduate-remote-hg-bzr' (early part)Junio C Hamano6-71/+62
2014-05-19remote-helpers: point at their upstream repositoriesJunio C Hamano1-0/+19
2014-05-19contrib: remote-helpers: add move warnings (v2.0)Felipe Contreras2-0/+6
2014-05-19Revert "Merge branch 'fc/transport-helper-sync-error-fix'"Junio C Hamano3-71/+37
2014-05-19Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname'Junio C Hamano2-20/+42
2014-05-19git-prompt.sh: don't assume the shell expands the value of PS1Richard Hansen2-20/+42
2014-05-19rebase -i: handle "Nothing to do" case with autostashRamkumar Ramachandra2-3/+12
2014-05-19t4205 (log-pretty-formats): don't hardcode SHA-1 in expected outputsAlexey Shumkin1-3/+11
2014-05-19Merge branch 'lt/request-pull'Junio C Hamano2-1/+13
2014-05-19Merge branch 'jl/use-vsatisfy-correctly-for-2.0'Junio C Hamano1-2/+2
2014-05-19Merge git://github.com/git-l10n/git-poJunio C Hamano1-21/+21
2014-05-19Merge branch 'kb/fast-hashmap'Junio C Hamano1-1/+0
2014-05-19Documentation/technical/api-hashmap: remove source highlightingAnders Kaseorg1-1/+0
2014-05-19git-gui: tolerate major version changes when comparing the git versionJens Lehmann1-2/+2
2014-05-17fr: a lot of good fixupsGrégoire Paris1-21/+21
2014-05-16request-pull: resurrect for-linus -> tags/for-linus DWIMJunio C Hamano2-1/+13
2014-05-15git grep -O -i: if the pager is 'less', pass the '-I' optionJohannes Schindelin1-0/+3
2014-05-15open_sha1_file: report "most interesting" errnoJeff King1-1/+5
2014-05-15run_diff_files: do not look at uninitialized stat dataJeff King2-12/+32
2014-05-15git-show: fix 'git show -s' to not add extra terminator after merge commitMax Kirillov4-11/+15
2014-05-13Merge branch 'fc/prompt-zsh-read-from-file'Junio C Hamano1-8/+8
2014-05-13contrib: completion: fix 'eread()' namespaceFelipe Contreras1-8/+8
2014-05-12index-pack: distinguish missing objects from type errorsJeff King1-2/+7
2014-05-12Merge git://github.com/git-l10n/git-poJunio C Hamano1-2278/+2755
2014-05-11l10n: Updated Bulgarian translation of git (1307t0f921u)Alexander Shopov1-2278/+2755
2014-05-09Git 2.0-rc3v2.0.0-rc3Junio C Hamano1-1/+1
2014-05-09Sync with 1.9.3Junio C Hamano1-1/+2
2014-05-09Git 1.9.3v1.9.3Junio C Hamano2-2/+3