aboutsummaryrefslogtreecommitdiff
path: root/merge-recursive.c
Commit message (Expand)AuthorAge
* 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
|\ \ \
| * | | lockfile.h: extract new header file for the functions in lockfile.cMichael Haggerty2014-10-01
* | | | Merge branch 'da/include-compat-util-first-in-c'Junio C Hamano2014-10-14
|\ \ \ \ | |/ / / |/| | |
| * | | cleanups: ensure that git-compat-util.h is included firstDavid Aguilar2014-09-15
* | | | Merge branch 'sb/merge-recursive-copy-paste-fix'Junio C Hamano2014-09-29
|\ \ \ \
| * | | | merge-recursive: remove stale commented debugging codeStefan Beller2014-09-23
| * | | | merge-recursive: fix copy-paste mistakeStefan Beller2014-09-23
* | | | | Merge branch 'rs/export-strbuf-addchars'Junio C Hamano2014-09-19
|\ \ \ \ \
| * | | | | strbuf: use strbuf_addchars() for adding a char multiple timesRené Scharfe2014-09-08
* | | | | | merge-recursive.c: replace `git_config()` with `git_config_get_int()`Tanay Abhra2014-08-13
| |_|/ / / |/| | | |
* | | | | Merge branch 'ta/string-list-init'Junio C Hamano2014-07-23
|\ \ \ \ \
| * | | | | replace memset with string-list initializersTanay Abhra2014-07-21
* | | | | | Merge branch 'rs/code-cleaning'Junio C Hamano2014-07-16
|\ \ \ \ \ \
| * | | | | | use strbuf_addch for adding single charactersRené Scharfe2014-07-10
| |/ / / / /
* | | | | | Merge branch 'nd/split-index'Junio C Hamano2014-07-16
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | cache-tree: mark istate->cache_changed on cache tree updateNguyễn Thái Ngọc Duy2014-06-13
| * | | | | read-cache: new API write_locked_index instead of write_index/write_cacheNguyễn Thái Ngọc Duy2014-06-13
* | | | | | Merge branch 'jk/xstrfmt'Junio C Hamano2014-07-09
|\ \ \ \ \ \
| * | | | | | unique_path: fix unlikely heap overflowJeff King2014-06-19
| * | | | | | use xstrfmt to replace xmalloc + sprintfJeff King2014-06-19
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'jk/skip-prefix'Junio C Hamano2014-07-09
|\ \ \ \ \ \
| * | | | | | use skip_prefix to avoid repeating stringsJeff King2014-06-20
| |/ / / / /
* | | | | | Merge branch 'jk/commit-buffer-length'Junio C Hamano2014-07-02
|\ \ \ \ \ \ | |/ / / / / |/| | | | / | | |_|_|/ | |/| | |
| * | | | commit: record buffer length in cacheJeff King2014-06-13
| * | | | use get_commit_buffer everywhereJeff King2014-06-13
| * | | | do not create "struct commit" with xcallocJeff King2014-06-12
| |/ / /
| * | | Merge branch 'bk/refresh-missing-ok-in-merge-recursive'Junio C Hamano2014-02-27
| |\ \ \
* | | | | merge-recursive.c: fix case-changing merge bugDavid Turner2014-05-07
* | | | | Merge branch 'bk/refresh-missing-ok-in-merge-recursive' into maintJunio C Hamano2014-03-18
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | merge-recursive.c: tolerate missing files while refreshing indexBrad King2014-02-24
| * | | read-cache.c: extend make_cache_entry refresh flag with optionsBrad King2014-02-24
| * | | Merge branch 'jk/diff-algo' into maintJunio C Hamano2013-10-28
| |\ \ \
* | \ \ \ Merge branch 'mh/safe-create-leading-directories'Junio C Hamano2014-01-27
|\ \ \ \ \
| * | | | | safe_create_leading_directories(): introduce enum for return valuesMichael Haggerty2014-01-06
| | |_|/ / | |/| | |
* | | | | replace {pre,suf}fixcmp() with {starts,ends}_with()Christian Couder2013-12-05
|/ / / /
* | | | Merge branch 'jk/diff-algo'Jonathan Nieder2013-10-14
|\ \ \ \ | | |/ / | |/| |
| * | | merge-recursive: fix parsing of "diff-algorithm" optionJohn Keeping2013-09-26
* | | | Merge branch 'jl/submodule-mv'Junio C Hamano2013-09-09
|\ \ \ \ | |_|/ / |/| | |