Hello, The migration to Git is complete. Please, clone the repository with:
git clone ssh://[email protected]/srv/git/inetutils.git The ChangeLog file is going to create conflicts on *each* pull from the master. To prevent this, follow these steps: 1. In the gnulib directory, run gnulib-tool --create-testdir --dir=/tmp/merge-changelog git-merge-changelog 2. cd /tmp/merge-changelog ./configure make make install 3. Change to inetutils working directory 4. Add the following to the .git/config: [merge "merge-changelog"] name = GNU-style ChangeLog merge driver driver = /usr/local/bin/git-merge-changelog %O %A %B 5. Create the file .gitattributes with the following contents: ChangeLog merge=merge-changelog Regards, Sergey
