index
:
git
master
git
Fast-forward packages
summary
refs
log
tree
commit
diff
stats
log msg
author
committer
range
path:
root
/
Documentation
/
merge-options.txt
(
follow
)
Commit message (
Expand
)
Author
Age
Files
Lines
*
Improve language in git-merge.txt and related docs
Ralf Wildenhues
2008-12-10
1
-1
/
+1
*
Teach/Fix pull/fetch -q/-v options
Tuncer Ayaz
2008-11-15
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-13
1
-0
/
+9
*
add 'merge.stat' config variable
SZEDER Gábor
2008-04-13
1
-1
/
+1
*
merge, pull: introduce '--(no-)stat' option
SZEDER Gábor
2008-04-13
1
-2
/
+6
*
git-merge: add --ff and --no-ff options
Lars Hjemli
2007-09-24
1
-0
/
+9
*
git-merge: add support for --commit and --no-squash
Lars Hjemli
2007-09-24
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-25
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-07
1
-0
/
+16