|
From: | Tom Jakubowski |
Subject: | Re: After a git merge and manual correction of a conflict, how do I tell git the conflict is fixed? |
Date: | Tue, 26 May 2015 17:18:46 -0700 (PDT) |
You might like to know about the git "exclude" file. It is a local, per-clone file that lives in .git/info from the root of the repository's directory tree. The syntax of the file are the same as .gitignore, and it has the same effect with regards to making files unknown to git, but since it's a per-clone file you don't have to worry about accidentally committing your own private changes and pushing them to someone else.
No. The file is not to be committed. It is my own personal copy of
.gitignore with my idiosyncratic filenames in it, something I will not
impose upon fellow Emacs hackers.
[Prev in Thread] | Current Thread | [Next in Thread] |