From: Junio C Hamano <junkio@cox.net>
Date: Wed, 5 Oct 2005 23:57:23 +0000 (-0700)
Subject: Merge branch 'fixes'
X-Git-Tag: v0.99.9~193
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d67c4af41f7975940e8fec6405411581570eb672?ds=inline;hp=-c

Merge branch 'fixes'
---

d67c4af41f7975940e8fec6405411581570eb672
diff --combined Documentation/git-apply.txt
index cb676348f8,8cbbb4b853..e095f93c08
--- a/Documentation/git-apply.txt
+++ b/Documentation/git-apply.txt
@@@ -9,11 -9,11 +9,11 @@@ git-apply - Apply patch on a GIT index 
  
  SYNOPSIS
  --------
 -'git-apply' [--no-merge] [--stat] [--summary] [--check] [--index] [--show-files] [--apply] [<patch>...]
 +'git-apply' [--stat] [--summary] [--check] [--index] [--show-files] [--apply] [<patch>...]
  
  DESCRIPTION
  -----------
- Reads supplied diff output and applies it on a GIT index file
+ Reads supplied diff output and applies it on a git index file
  and a work tree.
  
  OPTIONS
@@@ -22,6 -22,11 +22,6 @@@
  	The files to read patch from.  '-' can be used to read
  	from the standard input.
  
 ---no-merge::
 -	The default mode of operation is the merge behaviour
 -	which is not implemented yet.  This flag explicitly
 -	tells the program not to use the merge behaviour.
 -
  --stat::
  	Instead of applying the patch, output diffstat for the
  	input.  Turns off "apply".