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-options.txt
Age
Commit message (
Expand
)
Author
2010-04-12
Docs: Add -X option to git-merge's synopsis.
Marc Branchaud
2010-01-21
Merge branch 'ap/merge-backend-opts'
Junio C Hamano
2010-01-18
Document that merge strategies can now take their own options
Junio C Hamano
2010-01-10
Documentation: spell 'git cmd' without dash throughout
Thomas Rast
2009-11-10
Merge branch 'bg/merge-ff-only'
Junio C Hamano
2009-10-31
Teach 'git merge' and 'git pull' the option --ff-only
Björn Gustavsson
2009-10-22
Documentation/merge-options.txt: order options in alphabetical groups
Jari Aalto
2009-05-25
merge-options.txt: Clarify merge --squash
Michael J Gruber
2008-12-10
Improve language in git-merge.txt and related docs
Ralf Wildenhues
2008-11-15
Teach/Fix pull/fetch -q/-v options
Tuncer Ayaz
2008-07-05
manpages: italicize git command names (which were in teletype font)
Jonathan Nieder
2008-06-09
Docs: Use "-l::\n--long\n" format in OPTIONS sections
Stephan Beyer
2008-04-13
merge, pull: add '--(no-)log' command line option
SZEDER Gábor
2008-04-13
add 'merge.stat' config variable
SZEDER Gábor
2008-04-13
merge, pull: introduce '--(no-)stat' option
SZEDER Gábor
2007-09-24
git-merge: add --ff and --no-ff options
Lars Hjemli
2007-09-24
git-merge: add support for --commit and --no-squash
Lars Hjemli
2007-06-07
War on whitespace
Junio C Hamano
2007-05-25
Add a configuration option to control diffstat after merge
Alex Riesen
2006-06-24
git-merge --squash
Junio C Hamano
2005-12-09
Documentation: recursive is the default strategy these days.
Junio C Hamano
2005-11-07
Refactored merge options into separate merge-options.txt.
Jon Loeliger