aboutsummaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAge
* Merge branch 'bp/commit-p-editor'Junio C Hamano2014-03-28
|\
| * merge: fix GIT_EDITOR override for commit hookBenoit Pierre2014-03-18
| * commit: fix patch hunk editing with "commit -p -m"Benoit Pierre2014-03-18
* | Merge branch 'fr/add-interactive-argv-array'Junio C Hamano2014-03-28
|\ \
| * | add: use struct argv_array in run_add_interactive()Fabian Ruch2014-03-18
| |/
* | Merge branch 'jk/pack-bitmap-progress'Junio C Hamano2014-03-28
|\ \
| * | pack-objects: show reused packfile objects in "Counting objects"Jeff King2014-03-17
| * | pack-objects: show progress for reused packfilesJeff King2014-03-17
* | | Merge branch 'jk/pack-bitmap'Junio C Hamano2014-03-28
|\ \ \
| * | | pack-objects: turn off bitmaps when skipping objectsJeff King2014-03-17
* | | | Merge branch 'nd/index-pack-error-message'Junio C Hamano2014-03-25
|\ \ \ \
| * | | | index-pack: report error using the correct variableJunio C Hamano2014-03-17
* | | | | Merge branch 'nd/commit-editor-cleanup'Junio C Hamano2014-03-25
|\ \ \ \ \
| * | | | | commit: add --cleanup=scissorsNguyễn Thái Ngọc Duy2014-02-25
| | |_|_|/ | |/| | |
* | | | | Merge branch 'jk/warn-on-object-refname-ambiguity'Junio C Hamano2014-03-25
|\ \ \ \ \
| * | | | | cat-file: restore warn_on_object_refname_ambiguity flagJeff King2014-03-13
| * | | | | cat-file: fix a minor memory leak in batch_objectsJeff King2014-01-07
| * | | | | cat-file: refactor error handling of batch_objectsJeff King2014-01-07
* | | | | | Merge branch 'jk/mv-submodules-fix'Junio C Hamano2014-03-25
|\ \ \ \ \ \
| * | | | | | mv: prevent mismatched data when ignoring errors.brian m. carlson2014-03-17
| * | | | | | builtin/mv: fix out of bounds writeJohn Keeping2014-03-11
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'nd/upload-pack-shallow'Junio C Hamano2014-03-21
|\ \ \ \ \ \
| * | | | | | upload-pack: send shallow info over stdin to pack-objectsNguyễn Thái Ngọc Duy2014-03-11
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'nd/tag-version-sort'Junio C Hamano2014-03-21
|\ \ \ \ \ \
| * | | | | | tag: support --sort=<spec>Nguyễn Thái Ngọc Duy2014-02-27
| |/ / / / /
* | | | | | Merge branch 'jk/shallow-update-fix'Junio C Hamano2014-03-21
|\ \ \ \ \ \
| * | | | | | shallow: automatically clean up shallow tempfilesJeff King2014-02-27
| |/ / / / /
* | | | | | Merge branch 'jc/tag-contains-with'Junio C Hamano2014-03-18
|\ \ \ \ \ \
| * | | | | | tag: grok "--with" as synonym to "--contains"Junio C Hamano2014-03-07
| |/ / / / /
* | | | | | Merge branch 'jk/repack-pack-keep-objects'Junio C Hamano2014-03-18
|\ \ \ \ \ \
| * | | | | | repack: add `repack.packKeptObjects` config varJeff King2014-03-03
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'sh/finish-tmp-packfile'Junio C Hamano2014-03-18
|\ \ \ \ \ \
| * | | | | | finish_tmp_packfile():use strbuf for pathname constructionSun He2014-03-03
| * | | | | | Merge branch 'sh/write-pack-file-warning-message-fix' into sh/finish-tmp-pack...Junio C Hamano2014-03-03
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge branch 'dd/use-alloc-grow'Junio C Hamano2014-03-18
|\ \ \ \ \ \ \ \
| * | | | | | | | builtin/mktree.c: use ALLOC_GROW() in append_to_tree()Dmitry S. Dolzhenko2014-03-03
| * | | | | | | | builtin/pack-objects.c: use ALLOC_GROW() in check_pbase_path()Dmitry S. Dolzhenko2014-03-03
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'jk/clean-d-pathspec'Junio C Hamano2014-03-18
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | clean: simplify dir/not-dir logicJeff King2014-03-11
| * | | | | | | clean: respect pathspecs with "-d"Jeff King2014-03-11
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'sh/write-pack-file-warning-message-fix'Junio C Hamano2014-03-14
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | write_pack_file: use correct variable in diagnosticSun He2014-03-03
* | | | | | | Merge branch 'mh/replace-refs-variable-rename'Junio C Hamano2014-03-14
|\ \ \ \ \ \ \
| * | | | | | | rename read_replace_refs to check_replace_refsMichael Haggerty2014-02-20
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'nd/i18n-progress'Junio C Hamano2014-03-14
|\ \ \ \ \ \ \
| * | | | | | | i18n: mark all progress lines for translationNguyễn Thái Ngọc Duy2014-02-24
| |/ / / / / /
* | | | | | | Merge branch 'jh/note-trees-record-blobs'Junio C Hamano2014-03-14
|\ \ \ \ \ \ \
| * | | | | | | notes: disallow reusing non-blob as a note objectJohan Herland2014-02-20
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'nd/no-more-fnmatch'Junio C Hamano2014-03-14
|\ \ \ \ \ \ \
| * | | | | | | use wildmatch() directly without fnmatch() wrapperNguyễn Thái Ngọc Duy2014-02-20
| | |/ / / / / | |/| | | | |