diff options
| author |  Junio C Hamano <junkio@cox.net> | 2007-03-05 21:23:46 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-03-05 21:23:46 -0800 |
| commit | 99e6ac503b175ef38ca98e88a6ec1e290ad79d69 (patch) | |
| tree | 205e95dd21c7d431839476c562c66a6015d0e2b2 | |
| parent | contrib/emacs: Use non-interactive function to byte-compile files (diff) | |
| parent | Merge branch 'maint' (diff) | |
| parent | Fix diff-options references in git-diff and git-format-patch (diff) | |
| download | tgif-99e6ac503b175ef38ca98e88a6ec1e290ad79d69.tar.xz | |
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