diff options
| author |  Clemens Buchacher <drizzd@aon.at> | 2009-06-01 11:20:56 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2009-06-01 19:42:17 -0700 |
| commit | c8c562a238071843c64ea0f3a2c85481606da379 (patch) | |
| tree | c6a892cba320d30eb71b10c96a11c3d77ff731a6 /builtin-symbolic-ref.c | |
| parent | fix segfault showing an empty remote (diff) | |
| download | tgif-c8c562a238071843c64ea0f3a2c85481606da379.tar.xz | |
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>
Diffstat (limited to 'builtin-symbolic-ref.c')
0 files changed, 0 insertions, 0 deletions