Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'jk/pack-bitmap' | Junio C Hamano | 2014-04-08 |
|\ | |||
| * | pack-objects: do not reuse packfiles without --delta-base-offset | Jeff King | 2014-04-04 |
* | | Merge branch 'jl/nor-or-nand-and' | Junio C Hamano | 2014-04-08 |
|\ \ | |||
| * | | code and test: fix misuses of "nor" | Justin Lebar | 2014-03-31 |
| * | | comments: fix misuses of "nor" | Justin Lebar | 2014-03-31 |
| * | | Merge branch 'jk/clean-d-pathspec' into maint | Junio C Hamano | 2014-03-18 |
| |\ \ | |||
| * \ \ | Merge branch 'nd/reset-setup-worktree' into maint | Junio C Hamano | 2014-03-18 |
| |\ \ \ | |||
| * \ \ \ | Merge branch 'jc/check-attr-honor-working-tree' into maint | Junio C Hamano | 2014-03-18 |
| |\ \ \ \ | |||
| * \ \ \ \ | Merge branch 'ds/rev-parse-required-args' into maint | Junio C Hamano | 2014-03-18 |
| |\ \ \ \ \ | |||
| * \ \ \ \ \ | Merge branch 'nd/submodule-pathspec-ending-with-slash' into maint | Junio C Hamano | 2014-03-18 |
| |\ \ \ \ \ \ | |||
* | \ \ \ \ \ \ | Merge branch 'mh/update-ref-batch-create-fix' | Junio C Hamano | 2014-04-08 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | update-ref: fail create operation over stdin if ref already exists | Aman Gupta | 2014-04-02 |
| |/ / / / / / / | |||
* | | | | | | | | Merge branch 'jc/rev-parse-argh-dashed-multi-words' | Junio C Hamano | 2014-04-08 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | update-index: teach --cacheinfo a new syntax "mode,sha1,path" | Junio C Hamano | 2014-03-24 |
| * | | | | | | | | parse-options: multi-word argh should use dash to separate words | Junio C Hamano | 2014-03-24 |
* | | | | | | | | | Merge branch 'nd/gc-aggressive' | Junio C Hamano | 2014-04-03 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | gc --aggressive: make --depth configurable | Nguyễn Thái Ngọc Duy | 2014-03-31 |
* | | | | | | | | | | Merge branch 'nd/log-show-linear-break' | Junio C Hamano | 2014-04-03 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | object.h: centralize object flag allocation | Nguyễn Thái Ngọc Duy | 2014-03-25 |
* | | | | | | | | | | | Merge branch 'ib/rev-parse-parseopt-argh' | Junio C Hamano | 2014-03-31 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | | |||
| * | | | | | | | | | | rev-parse --parseopt: option argument name hints | Ilya Bobyr | 2014-03-23 |
* | | | | | | | | | | | 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 |
| |/ / / / / / / / / / / |