index
:
tgif.git
2.36
Terin's Improved Git Fork
terinjokes@gmail.com
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
merge-recursive.c
Age
Commit message (
Expand
)
Author
Files
Lines
2016-02-17
merge-recursive: more consistent interface
Felipe Gonçalves Assis
1
-1
/
+4
2016-02-17
merge-recursive: option to disable renames
Felipe Gonçalves Assis
1
-0
/
+7
2015-11-20
Remove get_object_hash.
brian m. carlson
1
-8
/
+8
2015-11-20
Convert struct object to object_id
brian m. carlson
1
-7
/
+7
2015-11-20
Add several uses of get_object_hash.
brian m. carlson
1
-8
/
+8
2015-10-30
Merge branch 'jk/delete-modechange-conflict'
Junio C Hamano
1
-2
/
+6
2015-10-26
merge: detect delete/modechange conflict
Jeff King
1
-2
/
+6
2015-10-05
merge-recursive: convert malloc / strcpy to strbuf
Jeff King
1
-9
/
+8
2015-05-20
use file_exists() to check if a file exists in the worktree
René Scharfe
1
-2
/
+1
2015-03-23
merge-recursive: fix memleaks
Stefan Beller
1
-0
/
+3
2015-01-07
Merge branch 'jc/merge-bases'
Junio C Hamano
1
-1
/
+1
2014-12-01
tree.c: update read_tree_recursive callback to pass strbuf as base
Nguyễn Thái Ngọc Duy
1
-9
/
+6
2014-10-30
get_merge_bases(): always clean-up object flags
Junio C Hamano
1
-1
/
+1
2014-10-14
Merge branch 'mh/lockfile'
Junio C Hamano
1
-0
/
+1
2014-10-14
Merge branch 'da/include-compat-util-first-in-c'
Junio C Hamano
1
-1
/
+1
2014-10-01
lockfile.h: extract new header file for the functions in lockfile.c
Michael Haggerty
1
-0
/
+1
2014-09-29
Merge branch 'sb/merge-recursive-copy-paste-fix'
Junio C Hamano
1
-5
/
+1
2014-09-23
merge-recursive: remove stale commented debugging code
Stefan Beller
1
-4
/
+0
2014-09-23
merge-recursive: fix copy-paste mistake
Stefan Beller
1
-1
/
+1
2014-09-19
Merge branch 'rs/export-strbuf-addchars'
Junio C Hamano
1
-3
/
+1
2014-09-15
cleanups: ensure that git-compat-util.h is included first
David Aguilar
1
-1
/
+1
2014-09-08
strbuf: use strbuf_addchars() for adding a char multiple times
René Scharfe
1
-3
/
+1
2014-08-13
merge-recursive.c: replace `git_config()` with `git_config_get_int()`
Tanay Abhra
1
-16
/
+6
2014-07-23
Merge branch 'ta/string-list-init'
Junio C Hamano
1
-6
/
+3
2014-07-21
replace memset with string-list initializers
Tanay Abhra
1
-6
/
+3
2014-07-16
Merge branch 'rs/code-cleaning'
Junio C Hamano
1
-1
/
+1
2014-07-16
Merge branch 'nd/split-index'
Junio C Hamano
1
-7
/
+4
2014-07-16
Merge branch 'jk/commit-buffer-length' into maint
Junio C Hamano
1
-2
/
+4
2014-07-10
use strbuf_addch for adding single characters
René Scharfe
1
-1
/
+1
2014-07-09
Merge branch 'jk/xstrfmt'
Junio C Hamano
1
-23
/
+30
2014-07-09
Merge branch 'jk/skip-prefix'
Junio C Hamano
1
-7
/
+8
2014-07-02
Merge branch 'jk/commit-buffer-length'
Junio C Hamano
1
-2
/
+4
2014-06-20
use skip_prefix to avoid repeating strings
Jeff King
1
-7
/
+8
2014-06-19
unique_path: fix unlikely heap overflow
Jeff King
1
-15
/
+26
2014-06-19
use xstrfmt to replace xmalloc + sprintf
Jeff King
1
-8
/
+4
2014-06-13
commit: record buffer length in cache
Jeff King
1
-1
/
+1
2014-06-13
use get_commit_buffer everywhere
Jeff King
1
-1
/
+3
2014-06-13
cache-tree: mark istate->cache_changed on cache tree update
Nguyễn Thái Ngọc Duy
1
-3
/
+1
2014-06-13
read-cache: new API write_locked_index instead of write_index/write_cache
Nguyễn Thái Ngọc Duy
1
-4
/
+3
2014-06-12
do not create "struct commit" with xcalloc
Jeff King
1
-1
/
+1
2014-05-07
merge-recursive.c: fix case-changing merge bug
David Turner
1
-0
/
+6
2014-03-18
Merge branch 'bk/refresh-missing-ok-in-merge-recursive' into maint
Junio C Hamano
1
-1
/
+3
2014-02-27
Merge branch 'bk/refresh-missing-ok-in-merge-recursive'
Junio C Hamano
1
-1
/
+3
2014-02-24
merge-recursive.c: tolerate missing files while refreshing index
Brad King
1
-1
/
+2
2014-02-24
read-cache.c: extend make_cache_entry refresh flag with options
Brad King
1
-1
/
+2
2014-01-27
Merge branch 'mh/safe-create-leading-directories'
Junio C Hamano
1
-1
/
+1
2014-01-06
safe_create_leading_directories(): introduce enum for return values
Michael Haggerty
1
-1
/
+1
2013-12-05
replace {pre,suf}fixcmp() with {starts,ends}_with()
Christian Couder
1
-3
/
+3
2013-10-28
Merge branch 'jk/diff-algo' into maint
Junio C Hamano
1
-2
/
+2
2013-10-14
Merge branch 'jk/diff-algo'
Jonathan Nieder
1
-2
/
+2
[prev]
[next]