summaryrefslogtreecommitdiff
path: root/merge-recursive.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/delete-modechange-conflict' into maintJunio C Hamano2015-11-051-2/+6
|\
| * merge: detect delete/modechange conflictjk/delete-modechange-conflictJeff King2015-10-261-2/+6
* | use file_exists() to check if a file exists in the worktreeRené Scharfe2015-05-201-2/+1
* | merge-recursive: fix memleaksStefan Beller2015-03-231-0/+3
* | Merge branch 'jc/merge-bases'Junio C Hamano2015-01-071-1/+1
|\ \
| * | get_merge_bases(): always clean-up object flagsjc/merge-basesJunio C Hamano2014-10-301-1/+1
| * | Merge branch 'jk/commit-buffer-length' into maintJunio C Hamano2014-07-161-2/+4
| |\ \
* | | | tree.c: update read_tree_recursive callback to pass strbuf as baseNguyễn Thái Ngọc Duy2014-12-011-9/+6
| |_|/ |/| |
* | | Merge branch 'mh/lockfile'Junio C Hamano2014-10-141-0/+1
|\ \ \
| * | | lockfile.h: extract new header file for the functions in lockfile.cmh/lockfileMichael Haggerty2014-10-011-0/+1
* | | | Merge branch 'da/include-compat-util-first-in-c'Junio C Hamano2014-10-141-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | cleanups: ensure that git-compat-util.h is included firstda/include-compat-util-first-in-cDavid Aguilar2014-09-151-1/+1
* | | | Merge branch 'sb/merge-recursive-copy-paste-fix'Junio C Hamano2014-09-291-5/+1
|\ \ \ \
| * | | | merge-recursive: remove stale commented debugging codesb/merge-recursive-copy-paste-fixStefan Beller2014-09-231-4/+0
| * | | | merge-recursive: fix copy-paste mistakeStefan Beller2014-09-231-1/+1
* | | | | Merge branch 'rs/export-strbuf-addchars'Junio C Hamano2014-09-191-3/+1
|\ \ \ \ \
| * | | | | strbuf: use strbuf_addchars() for adding a char multiple timesrs/export-strbuf-addcharsRené Scharfe2014-09-081-3/+1
* | | | | | merge-recursive.c: replace `git_config()` with `git_config_get_int()`Tanay Abhra2014-08-131-16/+6
| |_|/ / / |/| | | |
* | | | | Merge branch 'ta/string-list-init'Junio C Hamano2014-07-231-6/+3
|\ \ \ \ \
| * | | | | replace memset with string-list initializersta/string-list-initTanay Abhra2014-07-211-6/+3
* | | | | | Merge branch 'rs/code-cleaning'Junio C Hamano2014-07-161-1/+1
|\ \ \ \ \ \
| * | | | | | use strbuf_addch for adding single charactersRené Scharfe2014-07-101-1/+1
| |/ / / / /
* | | | | | Merge branch 'nd/split-index'Junio C Hamano2014-07-161-7/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | cache-tree: mark istate->cache_changed on cache tree updateNguyễn Thái Ngọc Duy2014-06-131-3/+1
| * | | | | read-cache: new API write_locked_index instead of write_index/write_cacheNguyễn Thái Ngọc Duy2014-06-131-4/+3
* | | | | | Merge branch 'jk/xstrfmt'Junio C Hamano2014-07-091-23/+30
|\ \ \ \ \ \
| * | | | | | unique_path: fix unlikely heap overflowJeff King2014-06-191-15/+26
| * | | | | | use xstrfmt to replace xmalloc + sprintfJeff King2014-06-191-8/+4
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'jk/skip-prefix'Junio C Hamano2014-07-091-7/+8
|\ \ \ \ \ \
| * | | | | | use skip_prefix to avoid repeating stringsJeff King2014-06-201-7/+8
| |/ / / / /
* | | | | | Merge branch 'jk/commit-buffer-length'Junio C Hamano2014-07-021-2/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | / | | |_|_|/ | |/| | |
| * | | | commit: record buffer length in cacheJeff King2014-06-131-1/+1
| * | | | use get_commit_buffer everywhereJeff King2014-06-131-1/+3
| * | | | do not create "struct commit" with xcallocJeff King2014-06-121-1/+1
| |/ / /
| * | | Merge branch 'bk/refresh-missing-ok-in-merge-recursive'Junio C Hamano2014-02-271-1/+3
| |\ \ \
* | | | | merge-recursive.c: fix case-changing merge bugDavid Turner2014-05-071-0/+6
* | | | | Merge branch 'bk/refresh-missing-ok-in-merge-recursive' into maintJunio C Hamano2014-03-181-1/+3
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | merge-recursive.c: tolerate missing files while refreshing indexbk/refresh-missing-ok-in-merge-recursiveBrad King2014-02-241-1/+2
| * | | read-cache.c: extend make_cache_entry refresh flag with optionsBrad King2014-02-241-1/+2
| * | | Merge branch 'jk/diff-algo' into maintJunio C Hamano2013-10-281-2/+2
| |\ \ \
* | \ \ \ Merge branch 'mh/safe-create-leading-directories'Junio C Hamano2014-01-271-1/+1
|\ \ \ \ \
| * | | | | safe_create_leading_directories(): introduce enum for return valuesMichael Haggerty2014-01-061-1/+1
| | |_|/ / | |/| | |
* | | | | replace {pre,suf}fixcmp() with {starts,ends}_with()cc/starts-n-ends-withChristian Couder2013-12-051-3/+3
|/ / / /
* | | | Merge branch 'jk/diff-algo'Jonathan Nieder2013-10-141-2/+2
|\ \ \ \ | | |/ / | |/| |
| * | | merge-recursive: fix parsing of "diff-algorithm" optionjk/diff-algoJohn Keeping2013-09-261-2/+2
* | | | Merge branch 'jl/submodule-mv'Junio C Hamano2013-09-091-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | remove init_pathspec() in favor of parse_pathspec()Nguyễn Thái Ngọc Duy2013-07-151-1/+1
| |/ /
* | | Convert "struct cache_entry *" to "const ..." wherever possiblend/const-struct-cache-entryNguyễn Thái Ngọc Duy2013-07-091-3/+4
|/ /
* | diff: Introduce --diff-algorithm command line optionMichal Privoznik2013-01-161-0/+9
* | Which merge_file() function do you mean?Junio C Hamano2012-12-091-3/+3
View Lorry Controller Status