Age | Commit message (Expand) | Author | Files | Lines |
2008-12-09 | Improve language in git-merge.txt and related docs | Ralf Wildenhues | 1 | -1/+1 |
2008-11-14 | Teach/Fix pull/fetch -q/-v options | Tuncer Ayaz | 1 | -0/+8 |
2008-07-05 | manpages: italicize git command names (which were in teletype font) | Jonathan Nieder | 1 | -2/+2 |
2008-06-08 | Docs: Use "-l::\n--long\n" format in OPTIONS sections | Stephan Beyer | 1 | -3/+6 |
2008-04-12 | merge, pull: add '--(no-)log' command line option | SZEDER Gábor | 1 | -0/+9 |
2008-04-12 | add 'merge.stat' config variable | SZEDER Gábor | 1 | -1/+1 |
2008-04-12 | merge, pull: introduce '--(no-)stat' option | SZEDER Gábor | 1 | -2/+6 |
2007-09-23 | git-merge: add --ff and --no-ff options | Lars Hjemli | 1 | -0/+9 |
2007-09-23 | git-merge: add support for --commit and --no-squash | Lars Hjemli | 1 | -0/+8 |
2007-06-07 | War on whitespace | Junio C Hamano | 1 | -1/+0 |
2007-05-24 | Add a configuration option to control diffstat after merge | Alex Riesen | 1 | -0/+4 |
2006-06-24 | git-merge --squash | Junio C Hamano | 1 | -0/+8 |
2005-12-08 | Documentation: recursive is the default strategy these days. | Junio C Hamano | 1 | -1/+1 |
2005-11-06 | Refactored merge options into separate merge-options.txt. | Jon Loeliger | 1 | -0/+16 |