-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 27/02/15 20:34, Gert Doering wrote: > Hi, > > On Fri, Feb 27, 2015 at 10:27:46PM +0300, Vasily Kulikov wrote: [...snip...] >> I've included .gitignore changes as my patch adds Makefile >> changes. It would be rather uncomfortable for openvpn developers >> to see Makefile and be not able to change it. > > Mmmh. Actually we don't usually do Makefile changes, as this is > always generated by configure for us - so normally, it is good to > have it in .gitignore. Of course your subdirectory has a Makefile > in it for MacOS X only... > > So - git experts to the rescue - how's this normally done?
I agree with Arne, do 'git add -f contrib/keychain-mcd/Makefile' instead. And git will keep track of this file, regardless of .gitignore. I don't recall now if -f was always required or just recent versions needs it. I've double checked the .gitignore behaviour on git 1.8.3.1, which required the -f argument. And everything works as expected in this version. - -- kind regards, David Sommerseth -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iEYEARECAAYFAlUZIIEACgkQDC186MBRfrrZOQCgoTh3PmYViPxP4NAl2aqQMDBJ tqoAn3vtnvwhN6qX1/bPhDjxjKTPdbgR =qJIy -----END PGP SIGNATURE-----
