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
2018-02-16
merge: allow fast-forward when merging a tracked tag
Junio C Hamano
2017-11-06
Merge branch 'wk/pull-signoff'
Junio C Hamano
2017-10-19
Merge branch 'wk/merge-options-gpg-sign-doc'
Junio C Hamano
2017-10-13
pull: pass --signoff/--no-signoff to "git merge"
W. Trevor King
2017-10-12
Documentation/merge-options.txt: describe -S/--gpg-sign for 'pull'
W. Trevor King
2017-08-23
treewide: correct several "up-to-date" to "up to date"
Martin Ågren
2016-05-18
Merge branch 'kf/gpg-sig-verification-doc'
Junio C Hamano
2016-05-13
Documentation: clarify signature verification
Keller Fuchs
2016-04-21
pull: pass --allow-unrelated-histories to "git merge"
Junio C Hamano
2014-04-01
Documentation: fix misuses of "nor"
Justin Lebar
2014-01-27
Merge branch 'jc/maint-pull-docfix'
Junio C Hamano
2014-01-14
Documentation: "git pull" does not have the "-m" option
Junio C Hamano
2013-06-03
Merge branch 'rh/merge-options-doc-fix'
Junio C Hamano
2013-05-17
Documentation/merge-options.txt: restore `-e` option
Richard Hansen
2013-04-06
Merge branch 'sg/gpg-sig'
Junio C Hamano
2013-04-01
merge/pull Check for untrusted good GPG signatures
Sebastian Götte
2013-04-01
merge/pull: verify GPG signatures of commits being merged
Sebastian Götte
2013-03-22
Documentation: merging a tag is a special case
Junio C Hamano
2012-02-27
Merge branch 'jc/doc-merge-options'
Junio C Hamano
2012-02-23
Documentation/merge-options.txt: group "ff" related options together
Junio C Hamano
2012-01-24
merge: use editor by default in interactive sessions
Junio C Hamano
2011-12-05
Documentation: fix formatting error in merge-options.txt
Jack Nagel
2011-10-13
Teach merge the '[-e|--edit]' option
Jay Soffian
2011-02-21
merge: enable progress reporting for rename detection
Jeff King
2010-09-09
merge: Make '--log' an integer option for number of shortlog entries
Ramkumar Ramachandra
2010-04-14
Merge branch 'maint'
Junio C Hamano
2010-04-12
Docs: Add -X option to git-merge's synopsis.
Marc Branchaud
2010-02-24
Documentation/git-pull: put verbosity options before merge/fetch ones
Tay Ray Chuan
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