summaryrefslogtreecommitdiff
path: root/merge-recursive.c
AgeCommit message (Expand)AuthorFilesLines
2016-07-26merge-recursive: allow write_tree_from_memory() to error outLibravatar Johannes Schindelin1-2/+2
2016-07-26merge-recursive: avoid returning a wholesale structLibravatar Johannes Schindelin1-50/+56
2016-07-26merge_recursive: abort properly upon errorsLibravatar Johannes Schindelin1-5/+12
2016-07-26merge-recursive: clarify code in was_tracked()Libravatar Johannes Schindelin1-16/+14
2016-07-26die(_("BUG")): avoid translating bug messagesLibravatar Johannes Schindelin1-3/+3
2016-07-26die("bug"): report bugs consistentlyLibravatar Johannes Schindelin1-8/+7
2016-07-25Merge branch 'jc/renormalize-merge-kill-safer-crlf'Libravatar Junio C Hamano1-4/+13
2016-07-12merge: avoid "safer crlf" during recording of merge resultsLibravatar Junio C Hamano1-4/+13
2016-06-28merge-recursive: convert merge_recursive_generic() to object_idLibravatar brian m. carlson1-7/+7
2016-06-28merge-recursive: convert leaf functions to use struct object_idLibravatar brian m. carlson1-118/+118
2016-06-28merge-recursive: convert struct merge_file_info to object_idLibravatar brian m. carlson1-19/+20
2016-06-28merge-recursive: convert struct stage_data to use object_idLibravatar brian m. carlson1-20/+18
2016-06-28diff: convert struct diff_filespec to struct object_idLibravatar brian m. carlson1-49/+58
2016-05-06Merge branch 'bc/object-id'Libravatar Junio C Hamano1-2/+2
2016-04-19match-trees: convert shift_tree() and shift_tree_by() to use object_idLibravatar brian m. carlson1-2/+2
2016-04-12merge-recursive: do not check working copy when creating a virtual merge baseLibravatar Elijah Newren1-3/+3
2016-04-12merge-recursive: remove duplicate codeLibravatar Elijah Newren1-2/+0
2016-02-24merge-recursive: find-renames resets thresholdLibravatar Felipe Gonçalves Assis1-1/+3
2016-02-17merge-recursive: more consistent interfaceLibravatar Felipe Gonçalves Assis1-1/+4
2016-02-17merge-recursive: option to disable renamesLibravatar Felipe Gonçalves Assis1-0/+7
2015-11-20Remove get_object_hash.Libravatar brian m. carlson1-8/+8
2015-11-20Convert struct object to object_idLibravatar brian m. carlson1-7/+7
2015-11-20Add several uses of get_object_hash.Libravatar brian m. carlson1-8/+8
2015-10-30Merge branch 'jk/delete-modechange-conflict'Libravatar Junio C Hamano1-2/+6
2015-10-26merge: detect delete/modechange conflictLibravatar Jeff King1-2/+6
2015-10-05merge-recursive: convert malloc / strcpy to strbufLibravatar Jeff King1-9/+8
2015-05-20use file_exists() to check if a file exists in the worktreeLibravatar René Scharfe1-2/+1
2015-03-23merge-recursive: fix memleaksLibravatar Stefan Beller1-0/+3
2015-01-07Merge branch 'jc/merge-bases'Libravatar Junio C Hamano1-1/+1
2014-12-01tree.c: update read_tree_recursive callback to pass strbuf as baseLibravatar Nguyễn Thái Ngọc Duy1-9/+6
2014-10-30get_merge_bases(): always clean-up object flagsLibravatar Junio C Hamano1-1/+1
2014-10-14Merge branch 'mh/lockfile'Libravatar Junio C Hamano1-0/+1
2014-10-14Merge branch 'da/include-compat-util-first-in-c'Libravatar Junio C Hamano1-1/+1
2014-10-01lockfile.h: extract new header file for the functions in lockfile.cLibravatar Michael Haggerty1-0/+1
2014-09-29Merge branch 'sb/merge-recursive-copy-paste-fix'Libravatar Junio C Hamano1-5/+1
2014-09-23merge-recursive: remove stale commented debugging codeLibravatar Stefan Beller1-4/+0
2014-09-23merge-recursive: fix copy-paste mistakeLibravatar Stefan Beller1-1/+1
2014-09-19Merge branch 'rs/export-strbuf-addchars'Libravatar Junio C Hamano1-3/+1
2014-09-15cleanups: ensure that git-compat-util.h is included firstLibravatar David Aguilar1-1/+1
2014-09-08strbuf: use strbuf_addchars() for adding a char multiple timesLibravatar René Scharfe1-3/+1
2014-08-13merge-recursive.c: replace `git_config()` with `git_config_get_int()`Libravatar Tanay Abhra1-16/+6
2014-07-23Merge branch 'ta/string-list-init'Libravatar Junio C Hamano1-6/+3
2014-07-21replace memset with string-list initializersLibravatar Tanay Abhra1-6/+3
2014-07-16Merge branch 'rs/code-cleaning'Libravatar Junio C Hamano1-1/+1
2014-07-16Merge branch 'nd/split-index'Libravatar Junio C Hamano1-7/+4
2014-07-16Merge branch 'jk/commit-buffer-length' into maintLibravatar Junio C Hamano1-2/+4
2014-07-10use strbuf_addch for adding single charactersLibravatar René Scharfe1-1/+1
2014-07-09Merge branch 'jk/xstrfmt'Libravatar Junio C Hamano1-23/+30
2014-07-09Merge branch 'jk/skip-prefix'Libravatar Junio C Hamano1-7/+8
2014-07-02Merge branch 'jk/commit-buffer-length'Libravatar Junio C Hamano1-2/+4
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 10:51:57 +0000