[Top][All Lists]
[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
- [bug-inetutils] Git migration is complete.,
Sergey Poznyakoff <=
- [bug-inetutils] Re: Git migration is complete., Simon Josefsson, 2009/08/20
- [bug-inetutils] Re: Git migration is complete., Sergey Poznyakoff, 2009/08/21
- Re: [bug-inetutils] Re: Git migration is complete., Alfred M. Szmidt, 2009/08/21
- Re: [bug-inetutils] Re: Git migration is complete., Sergey Poznyakoff, 2009/08/21
- Re: [bug-inetutils] Re: Git migration is complete., Karl Berry, 2009/08/21
- Re: [bug-inetutils] Re: Git migration is complete., Sergey Poznyakoff, 2009/08/22
- Message not available
- Re: [bug-inetutils] Re: Git migration is complete., Jeff Bailey, 2009/08/22
- Re: [bug-inetutils] Re: Git migration is complete., Sergey Poznyakoff, 2009/08/23
- Re: [bug-inetutils] Re: Git migration is complete., Alfred M. Szmidt, 2009/08/25