bug-inetutils
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[bug-inetutils] Git migration is complete.


From: Sergey Poznyakoff
Subject: [bug-inetutils] Git migration is complete.
Date: Thu, 20 Aug 2009 12:52:50 +0300

Hello,

The migration to Git is complete. Please, clone the repository with:

   git clone ssh://address@hidden/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

     







reply via email to

[Prev in Thread] Current Thread [Next in Thread]