development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-07-17 02:57:48 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse source 
* maint:
  Documentation/config.txt: default gc.aggressiveWindow is 250, not 10
  Docs: Add -X option to git-merge's synopsis.

Conflicts:
	Documentation/merge-options.txt
This commit is contained in:
Junio C Hamano 2010-04-13 18:21:29 -07:00
parent 4553d58f37 f78683f3a8
commit a6018bbdca
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Documentation/config.txt
View file

@ -914,7 +914,7 @@ format.signoff::
gc.aggressiveWindow::
The window size parameter used in the delta compression
algorithm used by 'git gc --aggressive'. This defaults
to 10.
to 250.
gc.auto::
When there are approximately more than this many loose

3
Documentation/git-merge.txt
View file

@ -9,7 +9,8 @@ git-merge - Join two or more development histories together
SYNOPSIS
--------
[verse]
'git merge' [-n] [--stat] [--no-commit] [--squash] [-s <strategy>]...
'git merge' [-n] [--stat] [--no-commit] [--squash]
[-s <strategy>] [-X <strategy-option>]
[--[no-]rerere-autoupdate] [-m <msg>] <commit>...
'git merge' <msg> HEAD <commit>...

10
Documentation/merge-options.txt
View file

@ -62,6 +62,11 @@ option can be used to override --squash.
is used instead ('git merge-recursive' when merging a single
head, 'git merge-octopus' otherwise).
-X <option>::
--strategy-option=<option>::
Pass merge strategy specific option through to the merge
strategy.
--summary::
--no-summary::
Synonyms to --stat and --no-stat; these are deprecated and will be
@ -76,8 +81,3 @@ ifndef::git-pull[]
--verbose::
Be verbose.
endif::git-pull[]
-X <option>::
--strategy-option=<option>::
Pass merge strategy specific option through to the merge
strategy.