summaryrefslogtreecommitdiff
path: root/Documentation/git-diff.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-03-06 05:23:46 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-03-06 05:23:46 (GMT)
commit99e6ac503b175ef38ca98e88a6ec1e290ad79d69 (patch)
tree205e95dd21c7d431839476c562c66a6015d0e2b2 /Documentation/git-diff.txt
parent5ced0572217f82f20c4a3460492768e07c08aeea (diff)
parent6b4318e604ca729d5d7508a744f0155555094fae (diff)
parentb8105375abfeee54e0a34e1c290983fd15e743cf (diff)
downloadgit-99e6ac503b175ef38ca98e88a6ec1e290ad79d69.zip
git-99e6ac503b175ef38ca98e88a6ec1e290ad79d69.tar.gz
git-99e6ac503b175ef38ca98e88a6ec1e290ad79d69.tar.bz2
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