summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/repack-pack-keep-objects'Junio C Hamano2014-03-184-2/+44
|\
| * repack: add `repack.packKeptObjects` config varJeff King2014-03-034-2/+44
* | Merge branch 'sh/finish-tmp-packfile'Junio C Hamano2014-03-184-21/+22
|\ \
| * | finish_tmp_packfile():use strbuf for pathname constructionsh/finish-tmp-packfileSun He2014-03-034-21/+22
| * | Merge branch 'sh/write-pack-file-warning-message-fix' into sh/finish-tmp-pack...Junio C Hamano2014-03-031-1/+1
| |\ \
* | \ \ Merge branch 'dd/use-alloc-grow'Junio C Hamano2014-03-1814-87/+21
|\ \ \ \
| * | | | sha1_file.c: use ALLOC_GROW() in pretend_sha1_file()dd/use-alloc-growDmitry S. Dolzhenko2014-03-031-6/+1
| * | | | read-cache.c: use ALLOC_GROW() in add_index_entry()Dmitry S. Dolzhenko2014-03-031-5/+1
| * | | | builtin/mktree.c: use ALLOC_GROW() in append_to_tree()Dmitry S. Dolzhenko2014-03-031-4/+1
| * | | | attr.c: use ALLOC_GROW() in handle_attr_line()Dmitry S. Dolzhenko2014-03-031-6/+1
| * | | | dir.c: use ALLOC_GROW() in create_simplify()Dmitry S. Dolzhenko2014-03-031-4/+1
| * | | | reflog-walk.c: use ALLOC_GROW()Dmitry S. Dolzhenko2014-03-031-10/+2
| * | | | replace_object.c: use ALLOC_GROW() in register_replace_object()Dmitry S. Dolzhenko2014-03-031-6/+2
| * | | | patch-ids.c: use ALLOC_GROW() in add_commit()Dmitry S. Dolzhenko2014-03-031-4/+1
| * | | | diffcore-rename.c: use ALLOC_GROW()Dmitry S. Dolzhenko2014-03-031-10/+2
| * | | | diff.c: use ALLOC_GROW()Dmitry S. Dolzhenko2014-03-031-10/+2
| * | | | commit.c: use ALLOC_GROW() in register_commit_graft()Dmitry S. Dolzhenko2014-03-031-6/+2
| * | | | cache-tree.c: use ALLOC_GROW() in find_subtree()Dmitry S. Dolzhenko2014-03-031-5/+1
| * | | | bundle.c: use ALLOC_GROW() in add_to_ref_list()Dmitry S. Dolzhenko2014-03-031-5/+1
| * | | | builtin/pack-objects.c: use ALLOC_GROW() in check_pbase_path()Dmitry S. Dolzhenko2014-03-031-6/+3
* | | | | Merge branch 'dd/find-graft-with-sha1-pos'Junio C Hamano2014-03-181-15/+9
|\ \ \ \ \
| * | | | | commit.c: use the generic "sha1_pos" function for lookupdd/find-graft-with-sha1-posDmitry S. Dolzhenko2014-02-271-15/+9
| |/ / / /
* | | | | Merge branch 'fc/transport-helper-fixes'Junio C Hamano2014-03-187-12/+105
|\ \ \ \ \
| * | | | | remote-bzr: support the new 'force' optionfc/transport-helper-fixesRichard Hansen2014-02-242-2/+51
| * | | | | test-hg.sh: tests are now expected to passRichard Hansen2014-02-241-2/+2
| * | | | | transport-helper.c: do not overwrite forced bitMax Horn2014-02-241-1/+1
| * | | | | transport-helper: check for 'forced update' messageFelipe Contreras2013-11-121-1/+7
| * | | | | transport-helper: add 'force' to 'export' helpersFelipe Contreras2013-11-124-0/+40
| * | | | | transport-helper: don't update refs in dry-runFelipe Contreras2013-10-311-4/+5
| * | | | | transport-helper: mismerge fixFelipe Contreras2013-10-311-3/+0
* | | | | | Merge branch 'nd/sha1-file-delta-stack-leakage-fix'Junio C Hamano2014-03-181-0/+4
|\ \ \ \ \ \
| * | | | | | sha1_file: fix delta_stack memory leak in unpack_entrynd/sha1-file-delta-stack-leakage-fixNguyễn Thái Ngọc Duy2014-02-241-0/+4
* | | | | | | Merge branch 'jk/diff-filespec-cleanup'Junio C Hamano2014-03-181-1/+1
|\ \ \ \ \ \ \
| * | | | | | | diffcore.h: be explicit about the signedness of is_binaryjk/diff-filespec-cleanupRichard Lowe2014-02-241-1/+1
* | | | | | | | Merge branch 'jk/clean-d-pathspec'Junio C Hamano2014-03-182-11/+25
|\ \ \ \ \ \ \ \
| * | | | | | | | clean: simplify dir/not-dir logicjk/clean-d-pathspecJeff King2014-03-111-9/+6
| * | | | | | | | clean: respect pathspecs with "-d"Jeff King2014-03-112-2/+19
* | | | | | | | | Update draft release notes to Git 2.0Junio C Hamano2014-03-142-3/+64
* | | | | | | | | Merge branch 'ta/parse-commit-with-skip-prefix'Junio C Hamano2014-03-141-8/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | commit.c: use skip_prefix() instead of starts_with()ta/parse-commit-with-skip-prefixTanay Abhra2014-03-041-8/+6
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'sr/add--interactive-term-readkey'Junio C Hamano2014-03-142-1/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git-add--interactive: warn if module for interactive.singlekey is missingsr/add--interactive-term-readkeySimon Ruderich2014-03-031-0/+3
| * | | | | | | | | git-config: document interactive.singlekey requires Term::ReadKeySimon Ruderich2014-03-031-1/+1
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'sh/write-pack-file-warning-message-fix'Junio C Hamano2014-03-141-1/+1
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | write_pack_file: use correct variable in diagnosticsh/write-pack-file-warning-message-fixSun He2014-03-031-1/+1
* | | | | | | | | Merge branch 'nd/strbuf-inline-styles'Junio C Hamano2014-03-141-6/+12
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | strbuf: style fix -- top opening bracket on a separate linend/strbuf-inline-stylesNguyễn Thái Ngọc Duy2014-03-031-6/+12
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jn/bisect-coding-style'Junio C Hamano2014-03-141-4/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git-bisect.sh: fix a few style issuesjn/bisect-coding-styleJacopo Notarstefano2014-03-031-4/+4
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'mh/replace-refs-variable-rename'Junio C Hamano2014-03-1414-15/+79
|\ \ \ \ \ \ \ \ \