commit | c8c562a238071843c64ea0f3a2c85481606da379 | [log] [tgz] |
---|---|---|
author | Clemens Buchacher <drizzd@aon.at> | Mon Jun 01 11:20:56 2009 +0200 |
committer | Junio C Hamano <gitster@pobox.com> | Mon Jun 01 19:42:17 2009 -0700 |
tree | c6a892cba320d30eb71b10c96a11c3d77ff731a6 | |
parent | 6a01554e6350123c78de805d820e90f1c56e5fdc [diff] |
refuse to merge during a merge The following is an easy mistake to make for users coming from version control systems with an "update and commit"-style workflow. 1. git pull 2. resolve conflicts 3. git pull Step 3 overrides MERGE_HEAD, starting a new merge with dirty index. IOW, probably not what the user intended. Instead, refuse to merge again if a merge is in progress. Reported-by: Dave Olszewski <cxreg@pobox.com> Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Junio C Hamano <gitster@pobox.com>