Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'nd/log-show-linear-break' | Junio C Hamano | 2014-04-03 | 1 | -1/+1 |
|\ | |||||
| * | object.h: centralize object flag allocation | Nguyễn Thái Ngọc Duy | 2014-03-25 | 1 | -1/+1 |
* | | Merge branch 'ib/rev-parse-parseopt-argh' | Junio C Hamano | 2014-03-31 | 1 | -1/+12 |
|\ \ | |||||
| * | | rev-parse --parseopt: option argument name hints | Ilya Bobyr | 2014-03-23 | 1 | -1/+12 |
* | | | Merge branch 'bp/commit-p-editor' | Junio C Hamano | 2014-03-28 | 5 | -17/+38 |
|\ \ \ | |||||
| * | | | merge: fix GIT_EDITOR override for commit hook | Benoit Pierre | 2014-03-18 | 1 | -1/+1 |
| * | | | commit: fix patch hunk editing with "commit -p -m" | Benoit Pierre | 2014-03-18 | 5 | -17/+38 |
* | | | | Merge branch 'fr/add-interactive-argv-array' | Junio C Hamano | 2014-03-28 | 1 | -11/+10 |
|\ \ \ \ | |||||
| * | | | | add: use struct argv_array in run_add_interactive()fr/add-interactive-argv-array | Fabian Ruch | 2014-03-18 | 1 | -11/+10 |
| |/ / / | |||||
* | | | | Merge branch 'jk/pack-bitmap-progress' | Junio C Hamano | 2014-03-28 | 1 | -11/+19 |
|\ \ \ \ | |||||
| * | | | | pack-objects: show reused packfile objects in "Counting objects"jk/pack-bitmap-progress | Jeff King | 2014-03-17 | 1 | -8/+3 |
| * | | | | pack-objects: show progress for reused packfiles | Jeff King | 2014-03-17 | 1 | -3/+16 |
* | | | | | Merge branch 'jk/pack-bitmap' | Junio C Hamano | 2014-03-28 | 1 | -1/+11 |
|\ \ \ \ \ | |||||
| * | | | | | pack-objects: turn off bitmaps when skipping objects | Jeff King | 2014-03-17 | 1 | -1/+11 |
* | | | | | | Merge branch 'nd/index-pack-error-message' | Junio C Hamano | 2014-03-25 | 1 | -2/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | index-pack: report error using the correct variablend/index-pack-error-message | Junio C Hamano | 2014-03-17 | 1 | -2/+2 |
* | | | | | | | Merge branch 'nd/commit-editor-cleanup' | Junio C Hamano | 2014-03-25 | 1 | -3/+11 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | commit: add --cleanup=scissorsnd/commit-editor-cleanup | Nguyễn Thái Ngọc Duy | 2014-02-25 | 1 | -3/+11 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'jk/warn-on-object-refname-ambiguity' | Junio C Hamano | 2014-03-25 | 1 | -6/+9 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | cat-file: restore warn_on_object_refname_ambiguity flag | Jeff King | 2014-03-13 | 1 | -0/+3 |
| * | | | | | | | cat-file: fix a minor memory leak in batch_objects | Jeff King | 2014-01-07 | 1 | -0/+1 |
| * | | | | | | | cat-file: refactor error handling of batch_objects | Jeff King | 2014-01-07 | 1 | -6/+5 |
* | | | | | | | | Merge branch 'jk/mv-submodules-fix' | Junio C Hamano | 2014-03-25 | 1 | -0/+9 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | |||||
| * | | | | | | | mv: prevent mismatched data when ignoring errors.jk/mv-submodules-fix | brian m. carlson | 2014-03-17 | 1 | -0/+5 |
| * | | | | | | | builtin/mv: fix out of bounds write | John Keeping | 2014-03-11 | 1 | -0/+4 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'nd/upload-pack-shallow' | Junio C Hamano | 2014-03-21 | 1 | -0/+10 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | upload-pack: send shallow info over stdin to pack-objectsnd/upload-pack-shallow | Nguyễn Thái Ngọc Duy | 2014-03-11 | 1 | -0/+10 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'nd/tag-version-sort' | Junio C Hamano | 2014-03-21 | 1 | -5/+66 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | tag: support --sort=<spec>nd/tag-version-sort | Nguyễn Thái Ngọc Duy | 2014-02-27 | 1 | -5/+66 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'jk/shallow-update-fix' | Junio C Hamano | 2014-03-21 | 1 | -12/+4 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | shallow: automatically clean up shallow tempfiles | Jeff King | 2014-02-27 | 1 | -12/+4 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'jc/tag-contains-with' | Junio C Hamano | 2014-03-18 | 1 | -0/+6 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | tag: grok "--with" as synonym to "--contains"jc/tag-contains-with | Junio C Hamano | 2014-03-07 | 1 | -0/+6 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'jk/repack-pack-keep-objects' | Junio C Hamano | 2014-03-18 | 1 | -1/+12 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | repack: add `repack.packKeptObjects` config var | Jeff King | 2014-03-03 | 1 | -1/+12 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'sh/finish-tmp-packfile' | Junio C Hamano | 2014-03-18 | 1 | -9/+6 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | finish_tmp_packfile():use strbuf for pathname constructionsh/finish-tmp-packfile | Sun He | 2014-03-03 | 1 | -9/+6 |
| * | | | | | | | Merge branch 'sh/write-pack-file-warning-message-fix' into sh/finish-tmp-pack... | Junio C Hamano | 2014-03-03 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ | Merge branch 'dd/use-alloc-grow' | Junio C Hamano | 2014-03-18 | 2 | -10/+4 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | builtin/mktree.c: use ALLOC_GROW() in append_to_tree() | Dmitry S. Dolzhenko | 2014-03-03 | 1 | -4/+1 |
| * | | | | | | | | | builtin/pack-objects.c: use ALLOC_GROW() in check_pbase_path() | Dmitry S. Dolzhenko | 2014-03-03 | 1 | -6/+3 |
| | |_|_|/ / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'jk/clean-d-pathspec' | Junio C Hamano | 2014-03-18 | 1 | -11/+9 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | |||||
| * | | | | | | | | clean: simplify dir/not-dir logicjk/clean-d-pathspec | Jeff King | 2014-03-11 | 1 | -9/+6 |
| * | | | | | | | | clean: respect pathspecs with "-d" | Jeff King | 2014-03-11 | 1 | -2/+3 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'sh/write-pack-file-warning-message-fix' | Junio C Hamano | 2014-03-14 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | |||||
| * | | | | | | | write_pack_file: use correct variable in diagnosticsh/write-pack-file-warning-message-fix | Sun He | 2014-03-03 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'mh/replace-refs-variable-rename' | Junio C Hamano | 2014-03-14 | 6 | -6/+6 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | rename read_replace_refs to check_replace_refs | Michael Haggerty | 2014-02-20 | 6 | -6/+6 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'nd/i18n-progress' | Junio C Hamano | 2014-03-14 | 5 | -9/+9 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | i18n: mark all progress lines for translationnd/i18n-progress | Nguyễn Thái Ngọc Duy | 2014-02-24 | 5 | -9/+9 |
| |/ / / / / / / |