diff options
| author | James Bottomley <James.Bottomley@SteelEye.com> | 2005-04-18 19:55:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org.(none)> | 2005-04-18 19:55:19 -0700 |
| commit | 0a9ea850005de0fb74b6288d281eb0417e869b00 (patch) | |
| tree | 8448ea54267e04be5961bb3a41b6361eb15a2771 /rev-tree.c | |
| parent | b70070f0208be5d5d7b7a3b259e7ff3da19307d0 (diff) | |
| download | git-0a9ea850005de0fb74b6288d281eb0417e869b00.tar.gz | |
[PATCH] SCSI trees, merges and git status
Doing the latest SCSI merge exposed two bugs in your merge script:
1) It doesn't like a completely new directory (the misc tree contains a
new drivers/scsi/lpfc)
2) the merge testing logic is wrong. You only want to exit 1 if the
merge fails.
Diffstat (limited to 'rev-tree.c')
0 files changed, 0 insertions, 0 deletions