| Commit message (Expand) | Author | Age | Files | Lines |
* | merge: Make '--log' an integer option for number of shortlog entries | Ramkumar Ramachandra | 2010-09-09 | 1 | -3/+3 |
* | Merge branch 'maint' | Junio C Hamano | 2010-04-13 | 1 | -5/+5 |
|\ |
|
| * | Docs: Add -X option to git-merge's synopsis. | Marc Branchaud | 2010-04-12 | 1 | -5/+5 |
* | | Documentation/git-pull: put verbosity options before merge/fetch ones | Tay Ray Chuan | 2010-02-24 | 1 | -0/+2 |
|/ |
|
* | Merge branch 'ap/merge-backend-opts' | Junio C Hamano | 2010-01-20 | 1 | -0/+5 |
|\ |
|
| * | Document that merge strategies can now take their own options | Junio C Hamano | 2010-01-17 | 1 | -0/+5 |
* | | Documentation: spell 'git cmd' without dash throughout | Thomas Rast | 2010-01-10 | 1 | -2/+2 |
|/ |
|
* | Merge branch 'bg/merge-ff-only' | Junio C Hamano | 2009-11-10 | 1 | -0/+5 |
|\ |
|
| * | Teach 'git merge' and 'git pull' the option --ff-only | Björn Gustavsson | 2009-10-30 | 1 | -0/+5 |
* | | Documentation/merge-options.txt: order options in alphabetical groups | Jari Aalto | 2009-10-22 | 1 | -43/+45 |
|/ |
|
* | merge-options.txt: Clarify merge --squash | Michael J Gruber | 2009-05-25 | 1 | -1/+2 |
* | Improve language in git-merge.txt and related docs | Ralf Wildenhues | 2008-12-09 | 1 | -1/+1 |
* | Teach/Fix pull/fetch -q/-v options | Tuncer Ayaz | 2008-11-14 | 1 | -0/+8 |
* | manpages: italicize git command names (which were in teletype font) | Jonathan Nieder | 2008-07-05 | 1 | -2/+2 |
* | Docs: Use "-l::\n--long\n" format in OPTIONS sections | Stephan Beyer | 2008-06-08 | 1 | -3/+6 |
* | merge, pull: add '--(no-)log' command line option | SZEDER Gábor | 2008-04-12 | 1 | -0/+9 |
* | add 'merge.stat' config variable | SZEDER Gábor | 2008-04-12 | 1 | -1/+1 |
* | merge, pull: introduce '--(no-)stat' option | SZEDER Gábor | 2008-04-12 | 1 | -2/+6 |
* | git-merge: add --ff and --no-ff options | Lars Hjemli | 2007-09-23 | 1 | -0/+9 |
* | git-merge: add support for --commit and --no-squash | Lars Hjemli | 2007-09-23 | 1 | -0/+8 |
* | War on whitespace | Junio C Hamano | 2007-06-07 | 1 | -1/+0 |
* | Add a configuration option to control diffstat after merge | Alex Riesen | 2007-05-24 | 1 | -0/+4 |
* | git-merge --squash | Junio C Hamano | 2006-06-24 | 1 | -0/+8 |
* | Documentation: recursive is the default strategy these days. | Junio C Hamano | 2005-12-08 | 1 | -1/+1 |
* | Refactored merge options into separate merge-options.txt. | Jon Loeliger | 2005-11-06 | 1 | -0/+16 |