| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'jc/merge-bases' | Junio C Hamano | 2015-01-07 | 1 | -1/+1 |
| |\ | |||||
| | * | get_merge_bases(): always clean-up object flags | 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.c | 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 first | 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 code | 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 times | 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 initializers | 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 index | 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 |
| | * | | | Merge branch 'jk/diff-algo' into maint | Junio C Hamano | 2013-10-28 | 1 | -2/+2 |
| | |\ \ \ | |||||
| * | \ \ \ | Merge branch 'mh/safe-create-leading-directories' | Junio C Hamano | 2014-01-27 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| | * | | | | | safe_create_leading_directories(): introduce enum for return values | Michael Haggerty | 2014-01-06 | 1 | -1/+1 |
| | | |_|/ / | |/| | | | |||||
| * / | | | | replace {pre,suf}fixcmp() with {starts,ends}_with() | Christian Couder | 2013-12-05 | 1 | -3/+3 |
| |/ / / / | |||||
| * | | | | Merge branch 'jk/diff-algo' | Jonathan Nieder | 2013-10-14 | 1 | -2/+2 |
| |\ \ \ \ | | |/ / | |/| | | |||||
| | * | | | merge-recursive: fix parsing of "diff-algorithm" option | John Keeping | 2013-09-26 | 1 | -2/+2 |
| * | | | | Merge branch 'jl/submodule-mv' | Junio C Hamano | 2013-09-09 | 1 | -1/+1 |
| |\ \ \ \ | |_|/ / |/| | | | |||||
| | * | | | remove init_pathspec() in favor of parse_pathspec() | Nguyễn Thái Ngọc Duy | 2013-07-15 | 1 | -1/+1 |
| | |/ / | |||||
| * / / | Convert "struct cache_entry *" to "const ..." wherever possible | Nguyễn Thái Ngọc Duy | 2013-07-09 | 1 | -3/+4 |
| |/ / | |||||
| * | | diff: Introduce --diff-algorithm command line option | Michal Privoznik | 2013-01-16 | 1 | -0/+9 |
| * | | Which merge_file() function do you mean? | Junio C Hamano | 2012-12-09 | 1 | -3/+3 |
| * | | Merge branch 'rj/path-cleanup' | Junio C Hamano | 2012-09-14 | 1 | -6/+7 |
| |\ \ | |||||
| | * | | Call mkpathdup() rather than xstrdup(mkpath(...)) | Ramsay Jones | 2012-09-04 | 1 | -6/+7 |
| * | | | Merge branch 'tr/void-diff-setup-done' | Junio C Hamano | 2012-08-22 | 1 | -2/+1 |
| |\ \ \ | |||||
| | * | | | diff_setup_done(): return void | Thomas Rast | 2012-08-03 | 1 | -2/+1 |
 |
index : rhi/git | |
| Roland Hieber |
| summaryrefslogtreecommitdiffstats |
path: root/merge-recursive.c