From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Yuri Khan Newsgroups: gmane.emacs.devel Subject: Re: After a git merge and manual correction of a conflict, how do I tell git the conflict is fixed? Date: Thu, 28 May 2015 11:27:42 +0600 Message-ID: References: <20150526223928.GA4675@acm.fritz.box> <5564F723.7060309@yandex.ru> <20150526225641.GB4675@acm.fritz.box> <86twuxiyp6.fsf@dod.no> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1432790903 10898 80.91.229.3 (28 May 2015 05:28:23 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 28 May 2015 05:28:23 +0000 (UTC) To: Emacs developers Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu May 28 07:28:22 2015 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1YxqMf-0004lN-6L for ged-emacs-devel@m.gmane.org; Thu, 28 May 2015 07:28:21 +0200 Original-Received: from localhost ([::1]:56411 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxqMe-0005xX-CC for ged-emacs-devel@m.gmane.org; Thu, 28 May 2015 01:28:20 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:37550) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxqMS-0005x2-Lv for emacs-devel@gnu.org; Thu, 28 May 2015 01:28:09 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YxqMP-0002yg-94 for emacs-devel@gnu.org; Thu, 28 May 2015 01:28:08 -0400 Original-Received: from mail-la0-x229.google.com ([2a00:1450:4010:c03::229]:35200) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxqMP-0002xu-2I for emacs-devel@gnu.org; Thu, 28 May 2015 01:28:05 -0400 Original-Received: by labko7 with SMTP id ko7so19399561lab.2 for ; Wed, 27 May 2015 22:28:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:content-type:content-transfer-encoding; bh=NvxqsOdmnptM7jq9FAMlx1shmxNjEXKtAbvdBWtWOgA=; b=QAsd9cfermHWVQ+P6njVQnLReI50a4Ut0/yJPyXAFwBR8hllyzvbB5kx5ULX49/Maa FBvqziokZ5Ki9HeaOOzQMDGMRl+clI60ZkC7KE2CzIYvmXbACXaDoGxItXTsFw93e1qb qz8jn6eOfyQ+ocdXoViNdxVo3TZuCZSy0dmfZq0D4qwI+9Daf4HXHvP/XMDjyavmdPtC 5pOk8ZyyflFgWJM7ndkWZI5LgNF4sPTfN56/LT742V0QO1Gpuu0/R8awlYTo8gZ/pInx QxAmB6nodug8tlZdX2Qf7pJqvOjFGTrrp9Hcf8PixLcDCpYUMrLPZ9yiadv53PBbl9YR bEjg== X-Received: by 10.112.162.38 with SMTP id xx6mr949849lbb.110.1432790882871; Wed, 27 May 2015 22:28:02 -0700 (PDT) Original-Received: by 10.25.43.65 with HTTP; Wed, 27 May 2015 22:27:42 -0700 (PDT) In-Reply-To: <86twuxiyp6.fsf@dod.no> X-Google-Sender-Auth: Qp9Dg8RtN23SiJmQaJ3-_xeHyfc X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4010:c03::229 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:186893 Archived-At: On Thu, May 28, 2015 at 1:53 AM, Steinar Bang wrote: > I ignore files that way with 'I' in magit (as opposed to 'i' which puts > it in .gitignore), so I don't actually know the git command to do so, > but the ignores end up in > .git/info/exclude > (which is a text file that can be opened and edited in emacs) As far as I can tell, Git doesn=E2=80=99t have a dedicated command to manipulate gitignore files. The user is supposed to edit them directly.