From 12e41d03bd49a60da9238694b5d8bd0bde3eff97 Mon Sep 17 00:00:00 2001 From: David Lamparter Date: Wed, 4 Feb 2015 07:01:14 +0100 Subject: pimd: merge pimd as of 2015-01-19 Welcome pimd to the Quagga daemon zoo! This is a merge of commit 77ae369 ("pimd: Log ifindex found for an interface when zebra lib reports a new connected address."), with the intermediate "reconnect" changes removed (c9adf00...d274381). d274381 is replaced with b162ab7, which includes some changes. In addition, 4 reconnect-related changes and 1 cosmetic one have been bumped out. The rebase command used to produce the branch that is merged here is: git rebase --onto b162ab7 c9adf00 77ae369 Note that 3 patches had their author rewritten from "Anonymous SR#108542 <>" (which is not a valid git author ID) to: "Savannah SR#108542 " (which is the e-mail address listed in the associated Savannah ticket) Signed-off-by: David Lamparter --- pimd/git-clone-github.sh | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100755 pimd/git-clone-github.sh (limited to 'pimd/git-clone-github.sh') diff --git a/pimd/git-clone-github.sh b/pimd/git-clone-github.sh new file mode 100755 index 0000000000..ae2362a739 --- /dev/null +++ b/pimd/git-clone-github.sh @@ -0,0 +1,27 @@ +#! /bin/bash +# +# Github Developer Git Checkout +# +# Delete remote branch qpimd: git push origin :qpimd +# (git push origin :refs/heads/branch_to_delete) +# Delete remote tag v0.139: git push origin :v0.139 +# (git push origin :refs/tags/tag_to_delete) +# Create remote-tracking branch: git checkout -b pim0.142 origin/pim0.142 +# Rename branch qpimd to pim: git branch -m qpimd pim +# Commit changes: git commit -a +# Send changes: git push --all +# +# Recipe to re-sync with Quagga repository: +# git clone https://github.com/udhos/qpimd quagga +# cd quagga +# git checkout master +# git pull http://git.sv.gnu.org/r/quagga.git master +# git checkout -b pim origin/pim +# git rebase master pim +# # Test, then push back into Github repository: +# git push origin :pim ;# delete remote branch pim +# git push --all +# +# $QuaggaId: $Format:%an, %ai, %h$ $ + +git clone https://github.com/udhos/qpimd -- cgit v1.2.3