![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5ced057 6b4318e b810537)
raw | combined (merge: 5ced057 6b4318e b810537)
| author | Junio C Hamano <junkio@cox.net> | |
| Tue, 6 Mar 2007 05:23:46 +0000 (21:23 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Tue, 6 Mar 2007 05:23:46 +0000 (21:23 -0800) |
* '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
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
| 1 | 2 | 3 | |||
|---|---|---|---|---|---|
| Documentation/git-diff.txt | patch | | diff1 | | diff2 | | diff3 | | blob | history |
| Documentation/git.txt | patch | | diff1 | | diff2 | | diff3 | | blob | history |
diff --cc Documentation/git-diff.txt
Simple merge
diff --cc Documentation/git.txt
Simple merge