index
:
git
main
maint
master
next
seen
todo
Git: sistema de control de versiones
mirror
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
builtin
/
merge-recursive.c
Age
Commit message (
Expand
)
Author
2018-07-16
builtin/merge-recursive: make hash independent
brian m. carlson
2016-09-15
i18n: merge-recursive: mark verbose message for translation
Vasco Almeida
2016-09-15
i18n: merge-recursive: mark error messages for translation
Vasco Almeida
2016-06-28
merge-recursive: convert merge_recursive_generic() to object_id
brian m. carlson
2015-09-25
convert trivial sprintf / strcpy calls to xsnprintf
Jeff King
2013-12-05
replace {pre,suf}fixcmp() with {starts,ends}_with()
Christian Couder
2011-03-22
Fix sparse warnings
Stephen Boyd
2010-10-27
Merge branch 'jf/merge-ignore-ws'
Junio C Hamano
2010-09-03
Merge branch 'jn/merge-renormalize'
Junio C Hamano
2010-09-03
builtin/merge_recursive.c: Add an usage string and make use of it.
Thiago Farina
2010-08-26
merge-recursive --patience
Justin Frankel
2010-08-26
merge-recursive: expose merge options for builtin merge
Jonathan Nieder
2010-08-06
merge-recursive --renormalize
Jonathan Nieder
2010-02-22
Move 'builtin-*' into a 'builtin/' subdirectory
Linus Torvalds