From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 14 Oct 2010 03:23:08 +0000 (-0700)
Subject: Merge branch 'sn/doc-opt-notation' into next
X-Git-Tag: ko-next~191
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=53ea256ab9071d54b4f09772408e442ad43bc73a;p=git.git

Merge branch 'sn/doc-opt-notation' into next

* sn/doc-opt-notation:
  Fix {update,checkout}-index usage strings
  Put a space between `<' and argument in pack-objects usage string
  Remove stray quotes in --pretty and --format documentation
  Use parentheses and `...' where appropriate
  Fix odd markup in --diff-filter documentation
  Use angles for placeholders consistently

Conflicts:
	Documentation/git-repack.txt
	Documentation/merge-strategies.txt
---

53ea256ab9071d54b4f09772408e442ad43bc73a
diff --cc Documentation/git-daemon.txt
index 685aa58ce,2f0ddf6fe..5054f790a
--- a/Documentation/git-daemon.txt
+++ b/Documentation/git-daemon.txt
@@@ -85,13 -85,12 +85,13 @@@ OPTION
  	be either an IPv4 address or an IPv6 address if supported.  If IPv6
  	is not supported, then --listen=hostname is also not supported and
  	--listen must be given an IPv4 address.
 +	Can be given more than once.
  	Incompatible with '--inetd' option.
  
- --port=n::
+ --port=<n>::
  	Listen on an alternative port.  Incompatible with '--inetd' option.
  
- --init-timeout=n::
+ --init-timeout=<n>::
  	Timeout between the moment the connection is established and the
  	client request is received (typically a rather low value, since
  	that should be basically immediate).
diff --cc Documentation/git-repack.txt
index 9566727f7,af79b8651..27f7865b0
--- a/Documentation/git-repack.txt
+++ b/Documentation/git-repack.txt
@@@ -8,7 -8,7 +8,7 @@@ git-repack - Pack unpacked objects in 
  
  SYNOPSIS
  --------
- 'git repack' [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [--window=N] [--depth=N]
 -'git repack' [-a] [-A] [-d] [-f] [-l] [-n] [-q] [--window=<n>] [--depth=<n>]
++'git repack' [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [--window=<n>] [--depth=<n>]
  
  DESCRIPTION
  -----------
diff --cc Documentation/merge-strategies.txt
index 77f26061d,8676e26ca..595a3cf1a
--- a/Documentation/merge-strategies.txt
+++ b/Documentation/merge-strategies.txt
@@@ -74,11 -52,7 +74,11 @@@ no-renormalize;
  	Disables the `renormalize` option.  This overrides the
  	`merge.renormalize` configuration variable.
  
 +rename-threshold=<n>;;
 +	Controls the similarity threshold used for rename detection.
 +	See also linkgit:git-diff[1] `-M`.
 +
- subtree[=path];;
+ subtree[=<path>];;
  	This option is a more advanced form of 'subtree' strategy, where
  	the strategy makes a guess on how two trees must be shifted to
  	match with each other when merging.  Instead, the specified path