| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | Merge branch 'mm/merge-rename-delete-message' | Junio C Hamano | 2017-02-27 | 1 | -54/+63 |
| |\ |
|
| | * | merge-recursive: make "CONFLICT (rename/delete)" message show both pathsmm/merge-rename-delete-message | Matt McCutchen | 2017-01-30 | 1 | -54/+63 |
| | * | Merge branch 'nd/qsort-in-merge-recursive' into maint | Junio C Hamano | 2017-01-17 | 1 | -9/+7 |
| | |\ |
|
| | * \ | Merge branch 'jc/renormalize-merge-kill-safer-crlf' into maint | Junio C Hamano | 2017-01-17 | 1 | -0/+2 |
| | |\ \ |
|
| * | | | | use SWAP macro | René Scharfe | 2017-01-30 | 1 | -4/+1 |
| * | | | | Merge branch 'jc/lock-report-on-error' | Junio C Hamano | 2016-12-19 | 1 | -1/+1 |
| |\ \ \ \ |
|
| | * | | | | hold_locked_index(): align error handling with hold_lockfile_for_update() | Junio C Hamano | 2016-12-07 | 1 | -1/+1 |
| * | | | | | Merge branch 'jc/renormalize-merge-kill-safer-crlf' | Junio C Hamano | 2016-12-19 | 1 | -0/+2 |
| |\ \ \ \ \
| | |_|/ /
| |/| | | |
|
| | * | | | | merge-recursive: handle NULL in add_cacheinfo() correctly | Johannes Schindelin | 2016-11-28 | 1 | -0/+2 |
| * | | | | | Merge branch 'nd/qsort-in-merge-recursive' | Junio C Hamano | 2016-12-16 | 1 | -9/+7 |
| |\ \ \ \ \
| |_|_|/ /
|/| | | /
| | |_|/
| |/| | |
|
| | * | | | merge-recursive.c: use string_list_sort instead of qsortnd/qsort-in-merge-recursive | Nguyễn Thái Ngọc Duy | 2016-11-28 | 1 | -9/+7 |
| * | | | | submodules: allow empty working-tree dirs in merge/cherry-pickdt/empty-submodule-in-merge | David Turner | 2016-11-17 | 1 | -6/+15 |
| | |_|/
|/| | |
|
| * | | | Merge branch 'rs/cocci' | Junio C Hamano | 2016-10-17 | 1 | -3/+3 |
| |\ \ \
| |/ / |
|
| | * | | use strbuf_add_unique_abbrev() for adding short hashes, part 3 | René Scharfe | 2016-10-10 | 1 | -3/+3 |
| * | | | Merge branch 'rs/cocci' | Junio C Hamano | 2016-09-26 | 1 | -1/+1 |
| |\ \ \
| |/ / |
|
| | * | | use strbuf_addstr() for adding constant strings to a strbuf, part 2 | René Scharfe | 2016-09-15 | 1 | -1/+1 |
| * | | | Convert read_mmblob to take struct object_id. | brian m. carlson | 2016-09-07 | 1 | -3/+3 |
| * | | | cache: convert struct cache_entry to use struct object_id | brian m. carlson | 2016-09-07 | 1 | -1/+1 |
| |/ / |
|
| * | | Merge branch 'rs/pull-signed-tag' | Junio C Hamano | 2016-08-19 | 1 | -4/+1 |
| |\ \ |
|
| | * | | merge-recursive: fix verbose output for multiple base trees | René Scharfe | 2016-08-13 | 1 | -4/+1 |
| * | | | Merge branch 'rs/merge-recursive-string-list-init' | Junio C Hamano | 2016-08-12 | 1 | -2/+1 |
| |\ \ \ |
|
| | * | | | merge-recursive: use STRING_LIST_INIT_NODUPrs/merge-recursive-string-list-init | René Scharfe | 2016-08-05 | 1 | -2/+1 |
| | |/ / |
|
| * | | | merge-recursive: flush output buffer even when erroring outjs/am-3-merge-recursive-direct | Johannes Schindelin | 2016-08-01 | 1 | -1/+3 |
| * | | | merge_trees(): ensure that the callers release output buffer | Johannes Schindelin | 2016-08-01 | 1 | -0/+2 |
| * | | | merge-recursive: offer an option to retain the output in 'obuf' | Johannes Schindelin | 2016-08-01 | 1 | -4/+13 |
| * | | | merge-recursive: write the commit title in one go | Johannes Schindelin | 2016-08-01 | 1 | -8/+9 |
| * | | | merge-recursive: flush output buffer before printing error messages | Johannes Schindelin | 2016-08-01 | 1 | -48/+68 |
| * | | | merge-recursive: switch to returning errors instead of dying | Johannes Schindelin | 2016-07-26 | 1 | -27/+35 |
| * | | | merge-recursive: handle return values indicating errors | Johannes Schindelin | 2016-07-26 | 1 | -102/+150 |
| * | | | merge-recursive: allow write_tree_from_memory() to error out | Johannes Schindelin | 2016-07-26 | 1 | -2/+2 |
| * | | | merge-recursive: avoid returning a wholesale struct | Johannes Schindelin | 2016-07-26 | 1 | -50/+56 |
| * | | | merge_recursive: abort properly upon errors | Johannes Schindelin | 2016-07-26 | 1 | -5/+12 |
| * | | | merge-recursive: clarify code in was_tracked() | Johannes Schindelin | 2016-07-26 | 1 | -16/+14 |
| * | | | die(_("BUG")): avoid translating bug messages | Johannes Schindelin | 2016-07-26 | 1 | -3/+3 |
| * | | | die("bug"): report bugs consistently | Johannes Schindelin | 2016-07-26 | 1 | -8/+7 |
| * | | | Merge branch 'jc/renormalize-merge-kill-safer-crlf' | Junio C Hamano | 2016-07-25 | 1 | -4/+13 |
| |\ \ \
| | |/
| |/| |
|
| | * | | merge: avoid "safer crlf" during recording of merge results | Junio C Hamano | 2016-07-12 | 1 | -4/+13 |
| * | | | merge-recursive: convert merge_recursive_generic() to object_id | brian m. carlson | 2016-06-28 | 1 | -7/+7 |
| * | | | merge-recursive: convert leaf functions to use struct object_id | brian m. carlson | 2016-06-28 | 1 | -118/+118 |
| * | | | merge-recursive: convert struct merge_file_info to object_id | brian m. carlson | 2016-06-28 | 1 | -19/+20 |
| * | | | merge-recursive: convert struct stage_data to use object_id | brian m. carlson | 2016-06-28 | 1 | -20/+18 |
| * | | | diff: convert struct diff_filespec to struct object_id | brian m. carlson | 2016-06-28 | 1 | -49/+58 |
| | |/
|/| |
|
| * | | Merge branch 'bc/object-id' | Junio C Hamano | 2016-05-06 | 1 | -2/+2 |
| |\ \ |
|
| | * | | match-trees: convert shift_tree() and shift_tree_by() to use object_id | brian m. carlson | 2016-04-19 | 1 | -2/+2 |
| | |/ |
|
| * | | merge-recursive: do not check working copy when creating a virtual merge baseen/merge-fixes | Elijah Newren | 2016-04-12 | 1 | -3/+3 |
| * | | merge-recursive: remove duplicate code | Elijah Newren | 2016-04-12 | 1 | -2/+0 |
| |/ |
|
| * | merge-recursive: find-renames resets threshold | Felipe Gonçalves Assis | 2016-02-24 | 1 | -1/+3 |
| * | merge-recursive: more consistent interface | Felipe Gonçalves Assis | 2016-02-17 | 1 | -1/+4 |
| * | merge-recursive: option to disable renames | Felipe Gonçalves Assis | 2016-02-17 | 1 | -0/+7 |
| * | Remove get_object_hash. | brian m. carlson | 2015-11-20 | 1 | -8/+8 |
