@@ -5,6 +5,8 @@
 * Fix `Scalastyle` pre-commit hook to capture messages with no line number
 * Fix `CoffeeLint` pre-commit hook detection of modified lines
 * Fix `Jscs` pre-commit hook to work with `jscs` 3.0.0+
+* Fix `CapitalizedSubject` pre-commit hook to ignore commit message subjects
+  starting with `fixup!` or `squash!` special prefixes
 
 ## 0.33.0
 
 
@@ -4,12 +4,19 @@ class CapitalizedSubject < Base
     def run
       return :pass if empty_message?
 
-      first_letter = commit_message_lines[0].to_s.match(/^[[:punct:]]*(.)/)[1]
-      unless first_letter =~ /[[:upper:]]/
+      subject = commit_message_lines[0].to_s
+      first_letter = subject.match(/^[[:punct:]]*(.)/)[1]
+      unless special_prefix?(subject) || first_letter =~ /[[:upper:]]/
         return :warn, 'Subject should start with a capital letter'
       end
 
       :pass
     end
+
+    private
+
+    def special_prefix?(subject)
+      subject =~ /^(fixup|squash)!/
+    end
   end
 end
@@ -79,4 +79,24 @@
 
     it { should warn }
   end
+
+  context 'when subject starts with special "fixup!" prefix' do
+    let(:commit_msg) { <<-MSG }
+fixup! commit
+
+This was created by running git commit --fixup=...
+    MSG
+
+    it { should pass }
+  end
+
+  context 'when subject starts with special "squash!" prefix' do
+    let(:commit_msg) { <<-MSG }
+squash! commit
+
+This was created by running git commit --squash=...
+    MSG
+
+    it { should pass }
+  end
 end