summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'nd/index-pack-error-message'Junio C Hamano2014-03-251-2/+2
|\
| * index-pack: report error using the correct variablend/index-pack-error-messageJunio C Hamano2014-03-171-2/+2
* | Merge branch 'nd/commit-editor-cleanup'Junio C Hamano2014-03-251-3/+11
|\ \
| * | commit: add --cleanup=scissorsnd/commit-editor-cleanupNguyễn Thái Ngọc Duy2014-02-251-3/+11
* | | Merge branch 'jk/warn-on-object-refname-ambiguity'Junio C Hamano2014-03-251-6/+9
|\ \ \
| * | | cat-file: restore warn_on_object_refname_ambiguity flagJeff King2014-03-131-0/+3
| * | | cat-file: fix a minor memory leak in batch_objectsJeff King2014-01-071-0/+1
| * | | cat-file: refactor error handling of batch_objectsJeff King2014-01-071-6/+5
* | | | Merge branch 'jk/mv-submodules-fix'Junio C Hamano2014-03-251-0/+9
|\ \ \ \
| * | | | mv: prevent mismatched data when ignoring errors.jk/mv-submodules-fixbrian m. carlson2014-03-171-0/+5
| * | | | builtin/mv: fix out of bounds writeJohn Keeping2014-03-111-0/+4
| | |_|/ | |/| |
* | | | Merge branch 'nd/upload-pack-shallow'Junio C Hamano2014-03-211-0/+10
|\ \ \ \
| * | | | upload-pack: send shallow info over stdin to pack-objectsnd/upload-pack-shallowNguyễn Thái Ngọc Duy2014-03-111-0/+10
| | |_|/ | |/| |
* | | | Merge branch 'nd/tag-version-sort'Junio C Hamano2014-03-211-5/+66
|\ \ \ \
| * | | | tag: support --sort=<spec>nd/tag-version-sortNguyễn Thái Ngọc Duy2014-02-271-5/+66
| |/ / /
* | | | Merge branch 'jk/shallow-update-fix'Junio C Hamano2014-03-211-12/+4
|\ \ \ \
| * | | | shallow: automatically clean up shallow tempfilesJeff King2014-02-271-12/+4
| |/ / /
* | | | Merge branch 'jc/tag-contains-with'Junio C Hamano2014-03-181-0/+6
|\ \ \ \
| * | | | tag: grok "--with" as synonym to "--contains"jc/tag-contains-withJunio C Hamano2014-03-071-0/+6
| |/ / /
* | | | Merge branch 'jk/repack-pack-keep-objects'Junio C Hamano2014-03-181-1/+12
|\ \ \ \
| * | | | repack: add `repack.packKeptObjects` config varJeff King2014-03-031-1/+12
* | | | | Merge branch 'sh/finish-tmp-packfile'Junio C Hamano2014-03-181-9/+6
|\ \ \ \ \
| * | | | | finish_tmp_packfile():use strbuf for pathname constructionsh/finish-tmp-packfileSun He2014-03-031-9/+6
| * | | | | 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-182-10/+4
|\ \ \ \ \ \ \
| * | | | | | | builtin/mktree.c: use ALLOC_GROW() in append_to_tree()Dmitry S. Dolzhenko2014-03-031-4/+1
| * | | | | | | builtin/pack-objects.c: use ALLOC_GROW() in check_pbase_path()Dmitry S. Dolzhenko2014-03-031-6/+3
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'jk/clean-d-pathspec'Junio C Hamano2014-03-181-11/+9
|\ \ \ \ \ \ \
| * | | | | | | clean: simplify dir/not-dir logicjk/clean-d-pathspecJeff King2014-03-111-9/+6
| * | | | | | | clean: respect pathspecs with "-d"Jeff King2014-03-111-2/+3
| | |_|_|_|/ / | |/| | | | |
* | | | | | | 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 'mh/replace-refs-variable-rename'Junio C Hamano2014-03-146-6/+6
|\ \ \ \ \ \ \
| * | | | | | | rename read_replace_refs to check_replace_refsMichael Haggerty2014-02-206-6/+6
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'nd/i18n-progress'Junio C Hamano2014-03-145-9/+9
|\ \ \ \ \ \ \
| * | | | | | | i18n: mark all progress lines for translationnd/i18n-progressNguyễn Thái Ngọc Duy2014-02-245-9/+9
| |/ / / / / /
* | | | | | | Merge branch 'jh/note-trees-record-blobs'Junio C Hamano2014-03-141-1/+5
|\ \ \ \ \ \ \
| * | | | | | | notes: disallow reusing non-blob as a note objectjh/note-trees-record-blobsJohan Herland2014-02-201-1/+5
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'nd/no-more-fnmatch'Junio C Hamano2014-03-1410-10/+10
|\ \ \ \ \ \ \
| * | | | | | | use wildmatch() directly without fnmatch() wrapperNguyễn Thái Ngọc Duy2014-02-2010-10/+10
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'nd/reset-setup-worktree'Junio C Hamano2014-03-141-3/+4
|\ \ \ \ \ \ \
| * | | | | | | reset: optionally setup worktree and refresh index on --mixednd/reset-setup-worktreeNguyễn Thái Ngọc Duy2014-02-181-3/+4
| | |_|/ / / / | |/| | | | |
| * | | | | | Merge branch 'bm/merge-base-octopus-dedup' into maintJunio C Hamano2014-02-131-6/+25
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'sb/repack-in-c' into maintJunio C Hamano2014-02-131-12/+12
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'js/lift-parent-count-limit' into maintJunio C Hamano2014-02-051-4/+4
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'nd/add-empty-fix' into maintJunio C Hamano2014-02-051-1/+1
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jl/commit-v-strip-marker' into maintJunio C Hamano2014-02-051-6/+3
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'tb/clone-ssh-with-colon-for-port' into maintJunio C Hamano2014-02-051-3/+11
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/transport-positive-depth-only' into maintJunio C Hamano2014-02-052-0/+8
| |\ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ks/config-file-stdin'Junio C Hamano2014-03-141-49/+55
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status