| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'bc/object-id' | Junio C Hamano | 2016-05-06 | 1 | -2/+2 |
|\ |
|
| * | match-trees: convert shift_tree() and shift_tree_by() to use object_id | brian m. carlson | 2016-04-19 | 1 | -2/+2 |
* | | merge-recursive: do not check working copy when creating a virtual merge baseen/merge-fixes | Elijah Newren | 2016-04-12 | 1 | -3/+3 |
* | | merge-recursive: remove duplicate code | Elijah Newren | 2016-04-12 | 1 | -2/+0 |
|/ |
|
* | merge-recursive: find-renames resets threshold | Felipe Gonçalves Assis | 2016-02-24 | 1 | -1/+3 |
* | merge-recursive: more consistent interface | Felipe Gonçalves Assis | 2016-02-17 | 1 | -1/+4 |
* | merge-recursive: option to disable renames | Felipe Gonçalves Assis | 2016-02-17 | 1 | -0/+7 |
* | Remove get_object_hash. | brian m. carlson | 2015-11-20 | 1 | -8/+8 |
* | Convert struct object to object_id | brian m. carlson | 2015-11-20 | 1 | -7/+7 |
* | Add several uses of get_object_hash. | brian m. carlson | 2015-11-20 | 1 | -8/+8 |
* | Merge branch 'jk/delete-modechange-conflict' | Junio C Hamano | 2015-10-30 | 1 | -2/+6 |
|\ |
|
| * | merge: detect delete/modechange conflictjk/delete-modechange-conflict | Jeff King | 2015-10-26 | 1 | -2/+6 |
* | | merge-recursive: convert malloc / strcpy to strbuf | Jeff King | 2015-10-05 | 1 | -9/+8 |
* | | use file_exists() to check if a file exists in the worktree | René Scharfe | 2015-05-20 | 1 | -2/+1 |
* | | merge-recursive: fix memleaks | Stefan Beller | 2015-03-23 | 1 | -0/+3 |
* | | Merge branch 'jc/merge-bases' | Junio C Hamano | 2015-01-07 | 1 | -1/+1 |
|\ \ |
|
| * | | get_merge_bases(): always clean-up object flagsjc/merge-bases | Junio C Hamano | 2014-10-30 | 1 | -1/+1 |
| * | | Merge branch 'jk/commit-buffer-length' into maint | Junio C Hamano | 2014-07-16 | 1 | -2/+4 |
| |\ \ |
|
* | | | | tree.c: update read_tree_recursive callback to pass strbuf as base | Nguyễn Thái Ngọc Duy | 2014-12-01 | 1 | -9/+6 |
| |_|/
|/| | |
|
* | | | Merge branch 'mh/lockfile' | Junio C Hamano | 2014-10-14 | 1 | -0/+1 |
|\ \ \ |
|
| * | | | lockfile.h: extract new header file for the functions in lockfile.cmh/lockfile | Michael Haggerty | 2014-10-01 | 1 | -0/+1 |
* | | | | Merge branch 'da/include-compat-util-first-in-c' | Junio C Hamano | 2014-10-14 | 1 | -1/+1 |
|\ \ \ \
| |/ / /
|/| | | |
|
| * | | | cleanups: ensure that git-compat-util.h is included firstda/include-compat-util-first-in-c | David Aguilar | 2014-09-15 | 1 | -1/+1 |
* | | | | Merge branch 'sb/merge-recursive-copy-paste-fix' | Junio C Hamano | 2014-09-29 | 1 | -5/+1 |
|\ \ \ \ |
|
| * | | | | merge-recursive: remove stale commented debugging codesb/merge-recursive-copy-paste-fix | Stefan Beller | 2014-09-23 | 1 | -4/+0 |
| * | | | | merge-recursive: fix copy-paste mistake | Stefan Beller | 2014-09-23 | 1 | -1/+1 |
* | | | | | Merge branch 'rs/export-strbuf-addchars' | Junio C Hamano | 2014-09-19 | 1 | -3/+1 |
|\ \ \ \ \ |
|
| * | | | | | strbuf: use strbuf_addchars() for adding a char multiple timesrs/export-strbuf-addchars | René Scharfe | 2014-09-08 | 1 | -3/+1 |
* | | | | | | merge-recursive.c: replace `git_config()` with `git_config_get_int()` | Tanay Abhra | 2014-08-13 | 1 | -16/+6 |
| |_|/ / /
|/| | | | |
|
* | | | | | Merge branch 'ta/string-list-init' | Junio C Hamano | 2014-07-23 | 1 | -6/+3 |
|\ \ \ \ \ |
|
| * | | | | | replace memset with string-list initializersta/string-list-init | Tanay Abhra | 2014-07-21 | 1 | -6/+3 |
* | | | | | | Merge branch 'rs/code-cleaning' | Junio C Hamano | 2014-07-16 | 1 | -1/+1 |
|\ \ \ \ \ \ |
|
| * | | | | | | use strbuf_addch for adding single characters | René Scharfe | 2014-07-10 | 1 | -1/+1 |
| |/ / / / / |
|
* | | | | | | Merge branch 'nd/split-index' | Junio C Hamano | 2014-07-16 | 1 | -7/+4 |
|\ \ \ \ \ \
| |/ / / / /
|/| | | | | |
|
| * | | | | | cache-tree: mark istate->cache_changed on cache tree update | Nguyễn Thái Ngọc Duy | 2014-06-13 | 1 | -3/+1 |
| * | | | | | read-cache: new API write_locked_index instead of write_index/write_cache | Nguyễn Thái Ngọc Duy | 2014-06-13 | 1 | -4/+3 |
* | | | | | | Merge branch 'jk/xstrfmt' | Junio C Hamano | 2014-07-09 | 1 | -23/+30 |
|\ \ \ \ \ \ |
|
| * | | | | | | unique_path: fix unlikely heap overflow | Jeff King | 2014-06-19 | 1 | -15/+26 |
| * | | | | | | use xstrfmt to replace xmalloc + sprintf | Jeff King | 2014-06-19 | 1 | -8/+4 |
| | |_|_|/ /
| |/| | | | |
|
* | | | | | | Merge branch 'jk/skip-prefix' | Junio C Hamano | 2014-07-09 | 1 | -7/+8 |
|\ \ \ \ \ \ |
|
| * | | | | | | use skip_prefix to avoid repeating strings | Jeff King | 2014-06-20 | 1 | -7/+8 |
| |/ / / / / |
|
* | | | | | | Merge branch 'jk/commit-buffer-length' | Junio C Hamano | 2014-07-02 | 1 | -2/+4 |
|\ \ \ \ \ \
| |/ / / / /
|/| | | | /
| | |_|_|/
| |/| | | |
|
| * | | | | commit: record buffer length in cache | Jeff King | 2014-06-13 | 1 | -1/+1 |
| * | | | | use get_commit_buffer everywhere | Jeff King | 2014-06-13 | 1 | -1/+3 |
| * | | | | do not create "struct commit" with xcalloc | Jeff King | 2014-06-12 | 1 | -1/+1 |
| |/ / / |
|
| * | | | Merge branch 'bk/refresh-missing-ok-in-merge-recursive' | Junio C Hamano | 2014-02-27 | 1 | -1/+3 |
| |\ \ \ |
|
* | | | | | merge-recursive.c: fix case-changing merge bug | David Turner | 2014-05-07 | 1 | -0/+6 |
* | | | | | Merge branch 'bk/refresh-missing-ok-in-merge-recursive' into maint | Junio C Hamano | 2014-03-18 | 1 | -1/+3 |
|\ \ \ \ \
| |/ / / /
|/| / / /
| |/ / / |
|
| * | | | merge-recursive.c: tolerate missing files while refreshing indexbk/refresh-missing-ok-in-merge-recursive | Brad King | 2014-02-24 | 1 | -1/+2 |
| * | | | read-cache.c: extend make_cache_entry refresh flag with options | Brad King | 2014-02-24 | 1 | -1/+2 |