Thread (2 messages) flat view 2 messages, 2 authors, 2016-06-15

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.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help