From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 22 Jul 2013 18:23:06 +0000 (-0700)
Subject: Merge branch 'jc/simple-add-must-be-a-no-op'
X-Git-Tag: v1.8.4-rc0~37
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=06cbc13c6cb8867af1127ac52e005b3c36506320;p=thirdparty%2Fgit.git

Merge branch 'jc/simple-add-must-be-a-no-op'

This detected a mismerge of one of "add-2.0" topics to the 'jch'
and 'pu' branches.

* jc/simple-add-must-be-a-no-op:
  t2202: make sure "git add" (no args) stays a no-op
---

06cbc13c6cb8867af1127ac52e005b3c36506320