| Commit message (Expand) | Author | Age |
|---|
| * | Documentation: fix misuses of "nor" | Justin Lebar | 2014-03-31 |
| * | Merge branch 'jc/maint-pull-docfix' | Junio C Hamano | 2014-01-27 |
| |\ |
|
| | * | Documentation: "git pull" does not have the "-m" option | Junio C Hamano | 2014-01-14 |
| * | | Merge branch 'rh/merge-options-doc-fix' | Junio C Hamano | 2013-06-02 |
| |\ \
| |/ |
|
| | * | Documentation/merge-options.txt: restore `-e` option | Richard Hansen | 2013-05-16 |
| * | | Merge branch 'sg/gpg-sig' | Junio C Hamano | 2013-04-05 |
| |\ \
| |/
|/| |
|
| | * | merge/pull Check for untrusted good GPG signatures | Sebastian Götte | 2013-03-31 |
| | * | merge/pull: verify GPG signatures of commits being merged | Sebastian Götte | 2013-03-31 |
| * | | Documentation: merging a tag is a special case | Junio C Hamano | 2013-03-21 |
| |/ |
|
| * | Merge branch 'jc/doc-merge-options' | Junio C Hamano | 2012-02-26 |
| |\ |
|
| | * | Documentation/merge-options.txt: group "ff" related options together | Junio C Hamano | 2012-02-22 |
| | * | Documentation: fix formatting error in merge-options.txt | Jack Nagel | 2011-12-05 |
| * | | merge: use editor by default in interactive sessions | Junio C Hamano | 2012-01-23 |
| |/ |
|
| * | Teach merge the '[-e|--edit]' option | Jay Soffian | 2011-10-12 |
| * | merge: enable progress reporting for rename detection | Jeff King | 2011-02-21 |
| * | merge: Make '--log' an integer option for number of shortlog entries | Ramkumar Ramachandra | 2010-09-09 |
| * | Merge branch 'maint' | Junio C Hamano | 2010-04-13 |
| |\ |
|
| | * | Docs: Add -X option to git-merge's synopsis. | Marc Branchaud | 2010-04-12 |
| * | | Documentation/git-pull: put verbosity options before merge/fetch ones | Tay Ray Chuan | 2010-02-24 |
| |/ |
|
| * | Merge branch 'ap/merge-backend-opts' | Junio C Hamano | 2010-01-20 |
| |\ |
|
| | * | Document that merge strategies can now take their own options | Junio C Hamano | 2010-01-17 |
| * | | Documentation: spell 'git cmd' without dash throughout | Thomas Rast | 2010-01-10 |
| |/ |
|
| * | Merge branch 'bg/merge-ff-only' | Junio C Hamano | 2009-11-10 |
| |\ |
|
| | * | Teach 'git merge' and 'git pull' the option --ff-only | Björn Gustavsson | 2009-10-30 |
| * | | Documentation/merge-options.txt: order options in alphabetical groups | Jari Aalto | 2009-10-22 |
| |/ |
|
| * | merge-options.txt: Clarify merge --squash | Michael J Gruber | 2009-05-25 |
| * | Improve language in git-merge.txt and related docs | Ralf Wildenhues | 2008-12-09 |
| * | Teach/Fix pull/fetch -q/-v options | Tuncer Ayaz | 2008-11-14 |
| * | manpages: italicize git command names (which were in teletype font) | Jonathan Nieder | 2008-07-05 |
| * | Docs: Use "-l::\n--long\n" format in OPTIONS sections | Stephan Beyer | 2008-06-08 |
| * | merge, pull: add '--(no-)log' command line option | SZEDER Gábor | 2008-04-12 |
| * | add 'merge.stat' config variable | SZEDER Gábor | 2008-04-12 |
| * | merge, pull: introduce '--(no-)stat' option | SZEDER Gábor | 2008-04-12 |
| * | git-merge: add --ff and --no-ff options | Lars Hjemli | 2007-09-23 |
| * | git-merge: add support for --commit and --no-squash | Lars Hjemli | 2007-09-23 |
| * | War on whitespace | Junio C Hamano | 2007-06-07 |
| * | Add a configuration option to control diffstat after merge | Alex Riesen | 2007-05-24 |
| * | git-merge --squash | Junio C Hamano | 2006-06-24 |
| * | Documentation: recursive is the default strategy these days. | Junio C Hamano | 2005-12-08 |
| * | Refactored merge options into separate merge-options.txt. | Jon Loeliger | 2005-11-06 |
