Re: merging .gitignore

2 messages, 2 authors, 2016-06-15 · open the first message on its own page

Re: merging .gitignore

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:43:37

martin f krafft [off-list ref] writes:
Basically I am saying that it should be

  cat $gitignore_files | sort -u

and obviously, this is something for a specific merge driver, as
Johannes suggested.
Perhaps you can use the existing union merge there.

Re: merging .gitignore

From: martin f krafft <hidden>
Date: 2016-06-15 22:43:38

also sprach Junio C Hamano [off-list ref] [2007.10.02.2055 +0100]:
Perhaps you can use the existing union merge there.
Many thanks for the pointer, I did not even have time to look at
gitattributes.txt yet...

-- 
martin;              (greetings from the heart of the sun.)
  \____ echo mailto: !#^."<*>"|tr "<*> mailto:" net@madduck
 
"self-denial is the shining sore
 on the leprous body of christianity."
                                                        -- oscar wilde
 
spamtraps: madduck.bogus@madduck.net
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help