rerere with modified/deleted conflicts

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Subject: rerere with modified/deleted conflicts
From: Nicolas Pitre <nico@xxxxxxxxxxx>
Date: Mon, 26 Sep 2011 19:06:06 -0400 (EDT)
User-agent: Alpine 2.00 (LFD 1167 2008-08-23)

Is this supported already?


Nicolas
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Follow-Ups:
- Re: rerere with modified/deleted conflicts
  - From: Junio C Hamano

Prev by Date: Re: [BUG?] git fetch -p -t prunes all non-tag refs
Next by Date: Re: [PATCH] gitweb: Add js=1 before an URI fragment to fix line number links
Previous by thread: [PATCH] git-submodule: a small fix
Next by thread: Re: rerere with modified/deleted conflicts
Index(es):
- Date
- Thread

[Index of Archives] [Linux Kernel Development] [Gcc Help] [IETF Annouce] [DCCP] [Netdev] [Networking] [Security] [V4L] [Bugtraq] [Yosemite] [MIPS Linux] [ARM Linux] [Linux Security] [Linux RAID] [Linux SCSI] [Fedora Users]