From: Junio C Hamano <junkio@cox.net>
Date: Tue, 6 Mar 2007 05:23:46 +0000 (-0800)
Subject: Merge branch 'master-for-junio' of git://repo.or.cz/git/fastimport; branch 'maint'
X-Git-Tag: v1.5.1-rc1~92
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/99e6ac503b175ef38ca98e88a6ec1e290ad79d69?ds=inline;hp=-c

Merge branch 'master-for-junio' of git://repo.or.cz/git/fastimport; branch 'maint'

* 'master-for-junio' of git://repo.or.cz/git/fastimport:
fast-import: Fail if a non-existant commit is used for merge
fast-import: Avoid infinite loop after reset

* maint:
Fix diff-options references in git-diff and git-format-patch
Add definition of <commit-ish> to the main git man page.
Begin SubmittingPatches with a check list
fast-import: Fail if a non-existant commit is used for merge
fast-import: Avoid infinite loop after reset
---

99e6ac503b175ef38ca98e88a6ec1e290ad79d69
diff --combined Documentation/git-diff.txt
index 12a531d1e9,12a531d1e9,b88764f45f..044cee9b42
--- a/Documentation/git-diff.txt
+++ b/Documentation/git-diff.txt
@@@@ -8,7 -8,7 -8,7 +8,7 @@@@ git-diff - Show changes between commits
   
   SYNOPSIS
   --------
-- 'git-diff' [ --diff-options ] <commit>{0,2} [--] [<path>...]
++ 'git-diff' [<common diff options>] <commit>{0,2} [--] [<path>...]
   
   DESCRIPTION
   -----------
@@@@ -23,10 -23,10 -23,6 +23,10 @@@@ tree and the index file, or the index f
   	further add to the index but you still haven't.  You can
   	stage these changes by using gitlink:git-add[1].
   
  +	If exactly two paths are given, and at least one is untracked,
  +	compare the two files / directories. This behavior can be
  +	forced by --no-index.
  +
   'git-diff' [--options] --cached [<commit>] [--] [<path>...]::
   
   	This form is to view the changes you staged for the next
diff --combined Documentation/git.txt
index 0577ad0a8c,0577ad0a8c,e514588bd3..e875e8318d
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@@@ -35,16 -35,16 -35,6 +35,16 @@@@ ifdef::stalenotes[
   You are reading the documentation for the latest version of git.
   Documentation for older releases are available here:
   
  +* link:v1.5.0.3/git.html[documentation for release 1.5.0.3]
  +
  +* link:v1.5.0.3/RelNotes-1.5.0.3.txt[release notes for 1.5.0.3]
  +
  +* link:v1.5.0.2/RelNotes-1.5.0.2.txt[release notes for 1.5.0.2]
  +
  +* link:v1.5.0.1/RelNotes-1.5.0.1.txt[release notes for 1.5.0.1]
  +
  +* link:v1.5.0/RelNotes-1.5.0.txt[release notes for 1.5.0]
  +
   * link:v1.4.4.4/git.html[documentation for release 1.4.4.4]
   
   * link:v1.3.3/git.html[documentation for release 1.3.3]
@@@@ -241,6 -241,6 -231,12 +241,12 @@@@ Identifier Terminolog
   	operate on a <tree> object but automatically dereferences
   	<commit> and <tag> objects that point at a <tree>.
   
++ <commit-ish>::
++ 	Indicates a commit or tag object name.  A
++ 	command that takes a <commit-ish> argument ultimately wants to
++ 	operate on a <commit> object but automatically dereferences
++ 	<tag> objects that point at a <commit>.
++ 
   <type>::
   	Indicates that an object type is required.
   	Currently one of: `blob`, `tree`, `commit`, or `tag`.