From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Brand Subject: Re: git diff: hunk header config Date: Wed, 24 Aug 2011 21:20:45 +0200 Message-ID: References: Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable Return-path: Received: from eggs.gnu.org ([140.186.70.92]:34693) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QwJ0K-0004Oo-0X for emacs-orgmode@gnu.org; Wed, 24 Aug 2011 15:20:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QwJ0J-0006c0-2Y for emacs-orgmode@gnu.org; Wed, 24 Aug 2011 15:20:47 -0400 Received: from mail-ww0-f49.google.com ([74.125.82.49]:55510) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QwJ0I-0006bp-UQ for emacs-orgmode@gnu.org; Wed, 24 Aug 2011 15:20:47 -0400 Received: by wwf10 with SMTP id 10so1290854wwf.30 for ; Wed, 24 Aug 2011 12:20:45 -0700 (PDT) In-Reply-To: List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: Org Mode Cc: Bastien , Jason Dunsmore , Andrea Crotti , Carsten Dominik On Sat, Aug 20, 2011 at 23:47, suvayu ali wro= te: > On Sat, Aug 20, 2011 at 6:12 PM, Michael Brand >> [...] >> "@@ -12991,7 +12991,7 @@ (defun org-align-tags-here (to-col)" >> instead of the current >> "@@ -12991,7 +12991,7 @@ If ONOFF is `on' or `off', don't toggle but set= to thi" > > [...] > To make this a server side setting, you would have to add .git/config > and .gitattributes to the repo. But I think that is not correct as > many users might have their own settings that will have to be remerged > at every update. According to the git manual there is a cleaner way for local changes: - gitattributes(5) Manual Page: - "Attributes which should be version-controlled and distributed to other repositories (i.e., attributes of interest to all users) should go into .gitattributes files." - "If you wish to affect only a single repository (i.e., to assign attributes to files that are particular to one user=92s workflow for that repository), then attributes should be placed in the $GIT_DIR/info/attributes file." - git-config(1) Manual Page: - "$GIT_DIR/config: Repository specific configuration file." and "The .git/config file in each repository is used to store the configuration for that repository" - "~/.gitconfig: User-specific configuration file." and "$HOME/.gitconfig is used to store a per-user configuration as fallback values for the .git/config file." For .gitattributes it seems to be ok to make it a versioned git repo element. Proposal for the content (changed from first post): #+begin_src # This file is intended to be effective for all users of this repository. # Use ".git/info/attributes" for changes specific to the local user(s). *.el diff=3Del *.texi diff=3Dtexinfo #+end_src For .git/config I am not sure if it can be made a versioned git repo element. If not, I don't know how it can become part of the transfer during git pull which it should be in any case. Proposal for the content (changed from first post): #+begin_src # This file is intended to be effective for all users of this repository. # Use "$HOME/.gitconfig" for changes specific to one user. [core] repositoryformatversion =3D 0 filemode =3D true bare =3D false logallrefupdates =3D true [remote "origin"] fetch =3D +refs/heads/*:refs/remotes/origin/* url =3D git://orgmode.org/org-mode.git [branch "master"] remote =3D origin merge =3D refs/heads/master [diff "el"] xfuncname =3D "^(\\(def[a-z]+ .+)$" [diff "texinfo"] xfuncname =3D "^(@(sub)*section.*)$" #+end_src > What do you think? In any case, I think this would be a wonderful > addition to org-faq.org on Worg. What I would like is that the hunk headers of all future patches from all contributers look like proposed. Without requiring them to change their config now and with every new git clone. For me it is not enough if only a few contributers that stumble upon this FAQ entry and then even care about, change their config. Michael