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
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-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-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
2013-09-26
merge-recursive: fix parsing of "diff-algorithm" option
John Keeping
1
-2
/
+2
2013-09-09
Merge branch 'jl/submodule-mv'
Junio C Hamano
1
-1
/
+1
2013-07-15
remove init_pathspec() in favor of parse_pathspec()
Nguyễn Thái Ngọc Duy
1
-1
/
+1
2013-07-09
Convert "struct cache_entry *" to "const ..." wherever possible
Nguyễn Thái Ngọc Duy
1
-3
/
+4
2013-01-16
diff: Introduce --diff-algorithm command line option
Michal Privoznik
1
-0
/
+9
2012-12-09
Which merge_file() function do you mean?
Junio C Hamano
1
-3
/
+3
2012-09-14
Merge branch 'rj/path-cleanup'
Junio C Hamano
1
-6
/
+7
2012-09-04
Call mkpathdup() rather than xstrdup(mkpath(...))
Ramsay Jones
1
-6
/
+7
2012-08-22
Merge branch 'tr/void-diff-setup-done'
Junio C Hamano
1
-2
/
+1
2012-08-22
Merge branch 'tr/merge-recursive-flush'
Junio C Hamano
1
-18
/
+1
2012-08-05
merge-recursive: separate message for common ancestors
Ralf Thielow
1
-1
/
+4
2012-08-03
merge-recursive: eliminate flush_buffer() in favor of write_in_full()
Thomas Rast
1
-18
/
+1
2012-08-03
diff_setup_done(): return void
Thomas Rast
1
-2
/
+1
2012-07-26
i18n: merge-recursive: mark strings for translation
Jiang Xin
1
-69
/
+79
2012-04-16
Merge branch 'jk/diff-no-rename-empty'
Junio C Hamano
1
-1
/
+2
2012-04-15
Merge branch 'jc/diff-algo-cleanup'
Junio C Hamano
1
-2
/
+2
2012-03-23
merge-recursive: don't detect renames of empty files
Jeff King
1
-0
/
+1
2012-03-23
drop casts from users EMPTY_TREE_SHA1_BIN
Jeff King
1
-1
/
+1
2012-02-19
xdiff: PATIENCE/HISTOGRAM are not independent option bits
Junio C Hamano
1
-2
/
+2
2012-02-07
cache-tree: update API to take abitrary flags
Nguyễn Thái Ngọc Duy
1
-1
/
+1
2011-12-19
Merge branch 'tr/cache-tree'
Junio C Hamano
1
-1
/
+1
2011-12-06
Refactor cache_tree_update idiom from commit
Thomas Rast
1
-1
/
+1
2011-11-08
merge: make usage of commit->util more extensible
Junio C Hamano
1
-7
/
+6
2011-10-13
submodule: Search for merges only at end of recursive merge
Brad King
1
-2
/
+4
2011-10-05
Merge branch 'cn/eradicate-working-copy'
Junio C Hamano
1
-1
/
+1
2011-09-23
merge-recursive: Do not look at working tree during a virtual ancestor merge
Junio C Hamano
1
-1
/
+1
2011-09-21
Remove 'working copy' from the documentation and C code
Carlos Martín Nieto
1
-1
/
+1
2011-09-02
Merge branch 'en/merge-recursive-2'
Junio C Hamano
1
-384
/
+695
2011-08-25
Merge branch 'jn/plug-empty-tree-leak'
Junio C Hamano
1
-5
/
+3
2011-08-16
merge-recursive: take advantage of hardcoded empty tree
Jonathan Nieder
1
-5
/
+3
2011-08-14
merge-recursive: Don't re-sort a list whose order we depend upon
Elijah Newren
1
-4
/
+12
2011-08-14
merge-recursive: Fix virtual merge base for rename/rename(1to2)/add-dest
Elijah Newren
1
-2
/
+21
2011-08-14
merge-recursive: Avoid unnecessary file rewrites
Elijah Newren
1
-6
/
+24
2011-08-14
merge-recursive: Fix spurious 'refusing to lose untracked file...' messages
Elijah Newren
1
-14
/
+20
2011-08-14
merge-recursive: Fix working copy handling for rename/rename/add/add
Elijah Newren
1
-25
/
+48
2011-08-14
merge-recursive: add handling for rename/rename/add-dest/add-dest
Elijah Newren
1
-2
/
+19
2011-08-14
merge-recursive: Have conflict_rename_delete reuse modify/delete code
Elijah Newren
1
-16
/
+30
2011-08-14
merge-recursive: Make modify/delete handling code reusable
Elijah Newren
1
-34
/
+48
2011-08-14
merge-recursive: Consider modifications in rename/rename(2to1) conflicts
Elijah Newren
1
-9
/
+21
[next]