Welcome to
mirror list
, hosted at
ThFree Co
, Russian Federation.
git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
index
:
git.kernel.org/pub/scm/git/git.git
main
maint
master
next
seen
todo
Unnamed repository; edit this file 'description' to name the repository.
root
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
Documentation
/
merge-strategies.txt
Age
Commit message (
Expand
)
Author
2016-02-22
merge-strategies.txt: fix typo
Felipe Gonçalves Assis
2016-02-17
merge-recursive: more consistent interface
Felipe Gonçalves Assis
2016-02-17
merge-recursive: option to disable renames
Felipe Gonçalves Assis
2014-03-25
Merge branch 'rr/doc-merge-strategies'
Junio C Hamano
2014-03-18
Documentation/merge-strategies: avoid hyphenated commands
Ramkumar Ramachandra
2014-02-11
docs/merge-strategies: remove hyphen from mis-merges
Albert L. Lash, IV
2013-12-10
Documentation: document pitfalls with 3-way merge
brian m. carlson
2013-04-05
git-merge(1): document diff-algorithm option to merge-recursive
John Keeping
2012-09-09
merge: teach -Xours/-Xtheirs to binary ll-merge driver
Junio C Hamano
2010-10-27
Merge branch 'kb/merge-recursive-rename-threshold'
Junio C Hamano
2010-10-27
Merge branch 'jf/merge-ignore-ws'
Junio C Hamano
2010-10-08
Use angles for placeholders consistently
Štěpán Němec
2010-09-30
merge-recursive: option to specify rename threshold
Kevin Ballard
2010-08-27
merge-recursive: options to ignore whitespace changes
Justin Frankel
2010-08-26
merge-recursive --patience
Justin Frankel
2010-08-06
merge-recursive --renormalize
Jonathan Nieder
2010-01-18
Document that merge strategies can now take their own options
Junio C Hamano
2009-11-15
Documentation: clarify 'ours' merge strategy
Thomas Rast
2009-03-26
Grammar fixes to "merge" and "patch-id" docs
Wincent Colaiuta
2008-03-19
Documentation/git-merge: document subtree strategy.
Miklos Vajna
2005-12-09
Documentation: recursive is the default strategy these days.
Junio C Hamano
2005-11-06
Refactor merge strategies into separate includable file.
Jon Loeliger