aboutsummaryrefslogtreecommitdiff
path: root/merge-recursive.c
Commit message (Expand)AuthorAge
* Merge branch 'rs/cocci'Junio C Hamano2016-10-17
|\
| * use strbuf_add_unique_abbrev() for adding short hashes, part 3René Scharfe2016-10-10
* | Merge branch 'rs/cocci'Junio C Hamano2016-09-26
|\ \ | |/
| * use strbuf_addstr() for adding constant strings to a strbuf, part 2René Scharfe2016-09-15
* | Convert read_mmblob to take struct object_id.brian m. carlson2016-09-07
* | cache: convert struct cache_entry to use struct object_idbrian m. carlson2016-09-07
|/
* Merge branch 'rs/pull-signed-tag'Junio C Hamano2016-08-19
|\
| * merge-recursive: fix verbose output for multiple base treesRené Scharfe2016-08-13
* | Merge branch 'rs/merge-recursive-string-list-init'Junio C Hamano2016-08-12
|\ \
| * | merge-recursive: use STRING_LIST_INIT_NODUPRené Scharfe2016-08-05
| |/
* | merge-recursive: flush output buffer even when erroring outJohannes Schindelin2016-08-01
* | merge_trees(): ensure that the callers release output bufferJohannes Schindelin2016-08-01
* | merge-recursive: offer an option to retain the output in 'obuf'Johannes Schindelin2016-08-01
* | merge-recursive: write the commit title in one goJohannes Schindelin2016-08-01
* | merge-recursive: flush output buffer before printing error messagesJohannes Schindelin2016-08-01
* | merge-recursive: switch to returning errors instead of dyingJohannes Schindelin2016-07-26
* | merge-recursive: handle return values indicating errorsJohannes Schindelin2016-07-26
* | merge-recursive: allow write_tree_from_memory() to error outJohannes Schindelin2016-07-26
* | merge-recursive: avoid returning a wholesale structJohannes Schindelin2016-07-26
* | merge_recursive: abort properly upon errorsJohannes Schindelin2016-07-26
* | merge-recursive: clarify code in was_tracked()Johannes Schindelin2016-07-26
* | die(_("BUG")): avoid translating bug messagesJohannes Schindelin2016-07-26
* | die("bug"): report bugs consistentlyJohannes Schindelin2016-07-26
* | Merge branch 'jc/renormalize-merge-kill-safer-crlf'Junio C Hamano2016-07-25
|\ \
| * | merge: avoid "safer crlf" during recording of merge resultsJunio C Hamano2016-07-12
* | | merge-recursive: convert merge_recursive_generic() to object_idbrian m. carlson2016-06-28
* | | merge-recursive: convert leaf functions to use struct object_idbrian m. carlson2016-06-28
* | | merge-recursive: convert struct merge_file_info to object_idbrian m. carlson2016-06-28
* | | merge-recursive: convert struct stage_data to use object_idbrian m. carlson2016-06-28
* | | diff: convert struct diff_filespec to struct object_idbrian m. carlson2016-06-28
| |/ |/|
* | Merge branch 'bc/object-id'Junio C Hamano2016-05-06
|\ \
| * | match-trees: convert shift_tree() and shift_tree_by() to use object_idbrian m. carlson2016-04-19
| |/
* | merge-recursive: do not check working copy when creating a virtual merge baseElijah Newren2016-04-12
* | merge-recursive: remove duplicate codeElijah Newren2016-04-12
|/
* merge-recursive: find-renames resets thresholdFelipe Gonçalves Assis2016-02-24
* merge-recursive: more consistent interfaceFelipe Gonçalves Assis2016-02-17
* merge-recursive: option to disable renamesFelipe Gonçalves Assis2016-02-17
* Remove get_object_hash.brian m. carlson2015-11-20
* Convert struct object to object_idbrian m. carlson2015-11-20
* Add several uses of get_object_hash.brian m. carlson2015-11-20
* Merge branch 'jk/delete-modechange-conflict'Junio C Hamano2015-10-30
|\
| * merge: detect delete/modechange conflictJeff King2015-10-26
* | merge-recursive: convert malloc / strcpy to strbufJeff King2015-10-05
* | use file_exists() to check if a file exists in the worktreeRené Scharfe2015-05-20
* | merge-recursive: fix memleaksStefan Beller2015-03-23
* | Merge branch 'jc/merge-bases'Junio C Hamano2015-01-07
|\ \
| * | get_merge_bases(): always clean-up object flagsJunio C Hamano2014-10-30
| * | Merge branch 'jk/commit-buffer-length' into maintJunio C Hamano2014-07-16
| |\ \
* | | | tree.c: update read_tree_recursive callback to pass strbuf as baseNguyễn Thái Ngọc Duy2014-12-01
| |_|/ |/| |
* | | Merge branch 'mh/lockfile'Junio C Hamano2014-10-14
|\ \ \