| Commit message (Expand) | Author | Age |
|---|
| * | Merge branch 'sb/merge-recursive-code-cleanup' | Junio C Hamano | 2017-07-06 |
| |\ |
|
| | * | merge-recursive: use DIFF_XDL_SET macro | Stefan Beller | 2017-06-30 |
| * | | Merge branch 'bw/config-h' | Junio C Hamano | 2017-06-24 |
| |\ \ |
|
| | * | | config: don't include config.h by default | Brandon Williams | 2017-06-15 |
| | |/ |
|
| * | | Merge branch 'bw/ls-files-sans-the-index' | Junio C Hamano | 2017-06-24 |
| |\ \ |
|
| | * | | convert: convert renormalize_buffer to take an index | Brandon Williams | 2017-06-13 |
| * | | | diff-tree: convert diff_tree_sha1 to struct object_id | Brandon Williams | 2017-06-05 |
| |/ / |
|
| * | | object: convert parse_object* to take struct object_id | brian m. carlson | 2017-05-08 |
| * | | Convert lookup_tree to struct object_id | brian m. carlson | 2017-05-08 |
| * | | submodule: convert merge_submodule to use struct object_id | brian m. carlson | 2017-05-08 |
| * | | Convert struct cache_tree to use struct object_id | brian m. carlson | 2017-05-02 |
| |/ |
|
| * | Merge branch 'mm/merge-rename-delete-message' | Junio C Hamano | 2017-02-27 |
| |\ |
|
| | * | merge-recursive: make "CONFLICT (rename/delete)" message show both paths | Matt McCutchen | 2017-01-30 |
| | * | Merge branch 'nd/qsort-in-merge-recursive' into maint | Junio C Hamano | 2017-01-17 |
| | |\ |
|
| | * \ | Merge branch 'jc/renormalize-merge-kill-safer-crlf' into maint | Junio C Hamano | 2017-01-17 |
| | |\ \ |
|
| * | | | | use SWAP macro | René Scharfe | 2017-01-30 |
| * | | | | Merge branch 'jc/lock-report-on-error' | Junio C Hamano | 2016-12-19 |
| |\ \ \ \ |
|
| | * | | | | hold_locked_index(): align error handling with hold_lockfile_for_update() | Junio C Hamano | 2016-12-07 |
| * | | | | | Merge branch 'jc/renormalize-merge-kill-safer-crlf' | Junio C Hamano | 2016-12-19 |
| |\ \ \ \ \
| | |_|/ /
| |/| | | |
|
| | * | | | | merge-recursive: handle NULL in add_cacheinfo() correctly | Johannes Schindelin | 2016-11-28 |
| * | | | | | Merge branch 'nd/qsort-in-merge-recursive' | Junio C Hamano | 2016-12-16 |
| |\ \ \ \ \
| |_|_|/ /
|/| | | /
| | |_|/
| |/| | |
|
| | * | | | merge-recursive.c: use string_list_sort instead of qsort | Nguyễn Thái Ngọc Duy | 2016-11-28 |
| * | | | | submodules: allow empty working-tree dirs in merge/cherry-pick | David Turner | 2016-11-17 |
| | |_|/
|/| | |
|
| * | | | Merge branch 'rs/cocci' | Junio C Hamano | 2016-10-17 |
| |\ \ \
| |/ / |
|
| | * | | use strbuf_add_unique_abbrev() for adding short hashes, part 3 | René Scharfe | 2016-10-10 |
| * | | | Merge branch 'rs/cocci' | Junio C Hamano | 2016-09-26 |
| |\ \ \
| |/ / |
|
| | * | | use strbuf_addstr() for adding constant strings to a strbuf, part 2 | René Scharfe | 2016-09-15 |
| * | | | Convert read_mmblob to take struct object_id. | brian m. carlson | 2016-09-07 |
| * | | | cache: convert struct cache_entry to use struct object_id | brian m. carlson | 2016-09-07 |
| |/ / |
|
| * | | Merge branch 'rs/pull-signed-tag' | Junio C Hamano | 2016-08-19 |
| |\ \ |
|
| | * | | merge-recursive: fix verbose output for multiple base trees | René Scharfe | 2016-08-13 |
| * | | | Merge branch 'rs/merge-recursive-string-list-init' | Junio C Hamano | 2016-08-12 |
| |\ \ \ |
|
| | * | | | merge-recursive: use STRING_LIST_INIT_NODUP | René Scharfe | 2016-08-05 |
| | |/ / |
|
| * | | | merge-recursive: flush output buffer even when erroring out | Johannes Schindelin | 2016-08-01 |
| * | | | merge_trees(): ensure that the callers release output buffer | Johannes Schindelin | 2016-08-01 |
| * | | | merge-recursive: offer an option to retain the output in 'obuf' | Johannes Schindelin | 2016-08-01 |
| * | | | merge-recursive: write the commit title in one go | Johannes Schindelin | 2016-08-01 |
| * | | | merge-recursive: flush output buffer before printing error messages | Johannes Schindelin | 2016-08-01 |
| * | | | merge-recursive: switch to returning errors instead of dying | Johannes Schindelin | 2016-07-26 |
| * | | | merge-recursive: handle return values indicating errors | Johannes Schindelin | 2016-07-26 |
| * | | | merge-recursive: allow write_tree_from_memory() to error out | Johannes Schindelin | 2016-07-26 |
| * | | | merge-recursive: avoid returning a wholesale struct | Johannes Schindelin | 2016-07-26 |
| * | | | merge_recursive: abort properly upon errors | Johannes Schindelin | 2016-07-26 |
| * | | | merge-recursive: clarify code in was_tracked() | Johannes Schindelin | 2016-07-26 |
| * | | | die(_("BUG")): avoid translating bug messages | Johannes Schindelin | 2016-07-26 |
| * | | | die("bug"): report bugs consistently | Johannes Schindelin | 2016-07-26 |
| * | | | Merge branch 'jc/renormalize-merge-kill-safer-crlf' | Junio C Hamano | 2016-07-25 |
| |\ \ \
| | |/
| |/| |
|
| | * | | merge: avoid "safer crlf" during recording of merge results | Junio C Hamano | 2016-07-12 |
| * | | | merge-recursive: convert merge_recursive_generic() to object_id | brian m. carlson | 2016-06-28 |
| * | | | merge-recursive: convert leaf functions to use struct object_id | brian m. carlson | 2016-06-28 |
