summaryrefslogtreecommitdiff
path: root/merge-recursive.c
Commit message (Expand)AuthorAgeFilesLines
* 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
* Merge branch 'rj/path-cleanup'Junio C Hamano2012-09-141-6/+7
|\
| * Call mkpathdup() rather than xstrdup(mkpath(...))Ramsay Jones2012-09-041-6/+7
* | Merge branch 'tr/void-diff-setup-done'Junio C Hamano2012-08-221-2/+1
|\ \
| * | diff_setup_done(): return voidThomas Rast2012-08-031-2/+1
* | | Merge branch 'tr/merge-recursive-flush'Junio C Hamano2012-08-221-18/+1
|\ \ \ | |_|/ |/| |
| * | merge-recursive: eliminate flush_buffer() in favor of write_in_full()Thomas Rast2012-08-031-18/+1
| |/
* | merge-recursive: separate message for common ancestorsRalf Thielow2012-08-051-1/+4
* | i18n: merge-recursive: mark strings for translationJiang Xin2012-07-261-69/+79
* | Merge branch 'jk/diff-no-rename-empty'Junio C Hamano2012-04-161-1/+2
|\ \
| * | merge-recursive: don't detect renames of empty filesjk/diff-no-rename-emptyJeff King2012-03-231-0/+1
| * | drop casts from users EMPTY_TREE_SHA1_BINJeff King2012-03-231-1/+1
* | | Merge branch 'jc/diff-algo-cleanup'Junio C Hamano2012-04-151-2/+2
|\ \ \ | |/ / |/| |
| * | xdiff: PATIENCE/HISTOGRAM are not independent option bitsjc/diff-algo-cleanupJunio C Hamano2012-02-191-2/+2
* | | cache-tree: update API to take abitrary flagsnd/cache-tree-api-refactorNguyễn Thái Ngọc Duy2012-02-071-1/+1
| |/ |/|
* | Merge branch 'tr/cache-tree'Junio C Hamano2011-12-191-1/+1
|\ \
| * | Refactor cache_tree_update idiom from commitThomas Rast2011-12-061-1/+1
| |/
* | merge: make usage of commit->util more extensibleJunio C Hamano2011-11-081-7/+6
|/
* submodule: Search for merges only at end of recursive mergeBrad King2011-10-131-2/+4
View Lorry Controller Status