Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'bp/commit-p-editor' | Junio C Hamano | 2014-03-28 |
|\ | |||
| * | merge: fix GIT_EDITOR override for commit hook | Benoit Pierre | 2014-03-18 |
| * | commit: fix patch hunk editing with "commit -p -m" | Benoit Pierre | 2014-03-18 |
* | | Merge branch 'fr/add-interactive-argv-array' | Junio C Hamano | 2014-03-28 |
|\ \ | |||
| * | | add: use struct argv_array in run_add_interactive() | Fabian Ruch | 2014-03-18 |
| |/ | |||
* | | Merge branch 'jk/pack-bitmap-progress' | Junio C Hamano | 2014-03-28 |
|\ \ | |||
| * | | pack-objects: show reused packfile objects in "Counting objects" | Jeff King | 2014-03-17 |
| * | | pack-objects: show progress for reused packfiles | Jeff King | 2014-03-17 |
* | | | Merge branch 'jk/pack-bitmap' | Junio C Hamano | 2014-03-28 |
|\ \ \ | |||
| * | | | pack-objects: turn off bitmaps when skipping objects | Jeff King | 2014-03-17 |
* | | | | Merge branch 'nd/index-pack-error-message' | Junio C Hamano | 2014-03-25 |
|\ \ \ \ | |||
| * | | | | index-pack: report error using the correct variable | Junio C Hamano | 2014-03-17 |
* | | | | | Merge branch 'nd/commit-editor-cleanup' | Junio C Hamano | 2014-03-25 |
|\ \ \ \ \ | |||
| * | | | | | commit: add --cleanup=scissors | Nguyễn Thái Ngọc Duy | 2014-02-25 |
| | |_|_|/ | |/| | | | |||
* | | | | | Merge branch 'jk/warn-on-object-refname-ambiguity' | Junio C Hamano | 2014-03-25 |
|\ \ \ \ \ | |||
| * | | | | | cat-file: restore warn_on_object_refname_ambiguity flag | Jeff King | 2014-03-13 |
| * | | | | | cat-file: fix a minor memory leak in batch_objects | Jeff King | 2014-01-07 |
| * | | | | | cat-file: refactor error handling of batch_objects | Jeff King | 2014-01-07 |
* | | | | | | Merge branch 'jk/mv-submodules-fix' | Junio C Hamano | 2014-03-25 |
|\ \ \ \ \ \ | |||
| * | | | | | | mv: prevent mismatched data when ignoring errors. | brian m. carlson | 2014-03-17 |
| * | | | | | | builtin/mv: fix out of bounds write | John Keeping | 2014-03-11 |
| | |_|/ / / | |/| | | | | |||
* | | | | | | Merge branch 'nd/upload-pack-shallow' | Junio C Hamano | 2014-03-21 |
|\ \ \ \ \ \ | |||
| * | | | | | | upload-pack: send shallow info over stdin to pack-objects | Nguyễn Thái Ngọc Duy | 2014-03-11 |
| | |_|/ / / | |/| | | | | |||
* | | | | | | Merge branch 'nd/tag-version-sort' | Junio C Hamano | 2014-03-21 |
|\ \ \ \ \ \ | |||
| * | | | | | | tag: support --sort=<spec> | Nguyễn Thái Ngọc Duy | 2014-02-27 |
| |/ / / / / | |||
* | | | | | | Merge branch 'jk/shallow-update-fix' | Junio C Hamano | 2014-03-21 |
|\ \ \ \ \ \ | |||
| * | | | | | | shallow: automatically clean up shallow tempfiles | Jeff King | 2014-02-27 |
| |/ / / / / | |||
* | | | | | | Merge branch 'jc/tag-contains-with' | Junio C Hamano | 2014-03-18 |
|\ \ \ \ \ \ | |||
| * | | | | | | tag: grok "--with" as synonym to "--contains" | Junio C Hamano | 2014-03-07 |
| |/ / / / / | |||
* | | | | | | Merge branch 'jk/repack-pack-keep-objects' | Junio C Hamano | 2014-03-18 |
|\ \ \ \ \ \ | |||
| * | | | | | | repack: add `repack.packKeptObjects` config var | Jeff King | 2014-03-03 |
| | |_|_|/ / | |/| | | | | |||
* | | | | | | Merge branch 'sh/finish-tmp-packfile' | Junio C Hamano | 2014-03-18 |
|\ \ \ \ \ \ | |||
| * | | | | | | finish_tmp_packfile():use strbuf for pathname construction | Sun He | 2014-03-03 |
| * | | | | | | Merge branch 'sh/write-pack-file-warning-message-fix' into sh/finish-tmp-pack... | Junio C Hamano | 2014-03-03 |
| |\ \ \ \ \ \ | |||
* | \ \ \ \ \ \ | Merge branch 'dd/use-alloc-grow' | Junio C Hamano | 2014-03-18 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | builtin/mktree.c: use ALLOC_GROW() in append_to_tree() | Dmitry S. Dolzhenko | 2014-03-03 |
| * | | | | | | | | builtin/pack-objects.c: use ALLOC_GROW() in check_pbase_path() | Dmitry S. Dolzhenko | 2014-03-03 |
| | |_|_|/ / / / | |/| | | | | | | |||
* | | | | | | | | Merge branch 'jk/clean-d-pathspec' | Junio C Hamano | 2014-03-18 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | |||
| * | | | | | | | clean: simplify dir/not-dir logic | Jeff King | 2014-03-11 |
| * | | | | | | | clean: respect pathspecs with "-d" | Jeff King | 2014-03-11 |
| | |_|_|_|/ / | |/| | | | | | |||
* | | | | | | | Merge branch 'sh/write-pack-file-warning-message-fix' | Junio C Hamano | 2014-03-14 |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||
| * | | | | | | write_pack_file: use correct variable in diagnostic | Sun He | 2014-03-03 |
* | | | | | | | Merge branch 'mh/replace-refs-variable-rename' | Junio C Hamano | 2014-03-14 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | rename read_replace_refs to check_replace_refs | Michael Haggerty | 2014-02-20 |
| | |_|/ / / / | |/| | | | | | |||
* | | | | | | | Merge branch 'nd/i18n-progress' | Junio C Hamano | 2014-03-14 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | i18n: mark all progress lines for translation | Nguyễn Thái Ngọc Duy | 2014-02-24 |
| |/ / / / / / | |||
* | | | | | | | Merge branch 'jh/note-trees-record-blobs' | Junio C Hamano | 2014-03-14 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | notes: disallow reusing non-blob as a note object | Johan Herland | 2014-02-20 |
| | |/ / / / / | |/| | | | | | |||
* | | | | | | | Merge branch 'nd/no-more-fnmatch' | Junio C Hamano | 2014-03-14 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | use wildmatch() directly without fnmatch() wrapper | Nguyễn Thái Ngọc Duy | 2014-02-20 |
| | |/ / / / / | |/| | | | | |