]> git.ipfire.org Git - thirdparty/git.git/commit - git-merge-one-file.sh
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: b70070f) | patch
[PATCH] SCSI trees, merges and git status
authorJames Bottomley <James.Bottomley@SteelEye.com>
Tue, 19 Apr 2005 02:55:19 +0000 (19:55 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org.(none)>
Tue, 19 Apr 2005 02:55:19 +0000 (19:55 -0700)
commit0a9ea850005de0fb74b6288d281eb0417e869b00
tree8448ea54267e04be5961bb3a41b6361eb15a2771tree | snapshot
parentb70070f0208be5d5d7b7a3b259e7ff3da19307d0commit | diff
[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.
git-merge-one-file-script diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.