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-config.txt
Age
Commit message (
Expand
)
Author
2013-02-02
Documentation: the name of the system is 'Git', not 'git'
Thomas Ackermann
2012-10-25
Documentation: remote tracking branch -> remote-tracking branch
Matthieu Moy
2011-05-07
merge: introduce merge.ff configuration variable
Junio C Hamano
2011-04-02
Merge branch 'jc/merge-sans-branch'
Junio C Hamano
2011-03-24
merge: merge with the default upstream branch without argument
Junio C Hamano
2011-02-28
mergetool--lib: Add Beyond Compare 3 as a tool
Sebastian Schuberth
2011-02-28
mergetool--lib: Sort tools alphabetically for easier lookup
Sebastian Schuberth
2011-01-04
Fix typos in the documentation
Ralf Wildenhues
2010-09-30
Merge branch 'rr/fmt-merge-msg'
Junio C Hamano
2010-09-09
merge: Make 'merge.log' an integer or boolean option
Ramkumar Ramachandra
2010-07-03
Avoid conflicts when merging branches with mixed normalization
Eyvind Bernhardsen
2009-10-29
mergetool--lib: add p4merge as a pre-configured mergetool option
Scott Chacon
2009-05-24
mergetool--lib: add support for araxis merge
David Aguilar
2009-04-08
difftool/mergetool: add diffuse as merge and diff tool
Sebastian Pipping
2009-04-08
git-mergetool: add new merge tool TortoiseMerge
Markus Heidelberg
2009-04-08
doc/merge-config: list ecmerge as a built-in merge tool
Markus Heidelberg
2008-12-10
Improve language in git-merge.txt and related docs
Ralf Wildenhues
2008-11-26
Merge branch 'mm/maint-sort-config-doc' into mm/sort-config-doc
Junio C Hamano
2008-09-13
Fix some manual typos.
Ralf Wildenhues
2008-08-06
Documentation: typos / spelling fixes
Mike Ralphson
2008-05-04
add merge.renamelimit config option
Jeff King
2008-04-13
fmt-merge-msg: add '--(no-)log' options and 'merge.log' config variable
SZEDER Gábor
2008-04-13
add 'merge.stat' config variable
SZEDER Gábor
2008-04-13
doc: moved merge.* config variables into separate merge-config.txt
SZEDER Gábor