From: Thomas Rast <trast@student.ethz.ch>
Date: Thu, 7 Jan 2010 16:42:27 +0000 (+0100)
Subject: Documentation: warn prominently against merging with dirty trees
X-Git-Tag: v1.7.0-rc0~57^2~2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e330d8ca1a9ec38ce40b0f67123b1dd893f0b31c?hp=e330d8ca1a9ec38ce40b0f67123b1dd893f0b31c

Documentation: warn prominently against merging with dirty trees

We do this for both git-merge and git-pull, so as to hopefully alert
(over)users of git-pull to the issue.

Signed-off-by: Thomas Rast <trast@student.ethz.ch>
---