mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
* '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
This commit is contained in:
Junio C Hamano
2007-03-05 21:23:46 -08:00
parent 5ced057221 6b4318e604 b8105375ab
commit 99e6ac503b
5 changed files with 57 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/git-diff.txt
View File

@ -8,7 +8,7 @@ git-diff - Show changes between commits, commit and working tree, etc
SYNOPSIS
--------
'git-diff' [ --diff-options ] <commit>{0,2} [--] [<path>...]
'git-diff' [<common diff options>] <commit>{0,2} [--] [<path>...]
DESCRIPTION
-----------