diff options
848 files changed, 6970 insertions, 7178 deletions
diff --git a/0bs1d1an.html b/0bs1d1an.html index 3a812a2e6d9b..8b9caa4d8956 100644 --- a/0bs1d1an.html +++ b/0bs1d1an.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync 0bs1d1an </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing 0bs1d1an </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing 0bs1d1an + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced 0bs1d1an </pre></td></tr> diff --git a/0bs1d1an.txt b/0bs1d1an.txt index 6d49a2ad10dd..87094925298c 100644 --- a/0bs1d1an.txt +++ b/0bs1d1an.txt @@ -12,6 +12,7 @@ 'uri': 'git+ssh://git@gitlab.com/0bs1d1an/0bs1d1an-overlay.git'}], 'status': 'unofficial'} $ pmaint sync 0bs1d1an +*** syncing 0bs1d1an warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing 0bs1d1an *** synced 0bs1d1an * Sync succeeded $ git log --format=%ci -1 diff --git a/0x4d4c.html b/0x4d4c.html index 9f246ad122c1..1fd693f86337 100644 --- a/0x4d4c.html +++ b/0x4d4c.html @@ -40,35 +40,35 @@ </pre></td></tr> <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync 0x4d4c </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing 0x4d4c </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing 0x4d4c + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced 0x4d4c </pre></td></tr> diff --git a/0x4d4c.txt b/0x4d4c.txt index c19303ca4f1b..59348463e0a4 100644 --- a/0x4d4c.txt +++ b/0x4d4c.txt @@ -13,6 +13,7 @@ {'type': 'git', 'uri': 'git@github.com:0x4d4c/gentoo-overlay.git'}], 'status': 'unofficial'} $ pmaint sync 0x4d4c +*** syncing 0x4d4c warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -27,7 +28,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing 0x4d4c *** synced 0x4d4c * Sync succeeded $ git log --format=%ci -1 diff --git a/2xsaiko.html b/2xsaiko.html index d04507045bd5..f7f7ddde5aab 100644 --- a/2xsaiko.html +++ b/2xsaiko.html @@ -34,35 +34,35 @@ </pre></td></tr> <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync 2xsaiko </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing 2xsaiko </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing 2xsaiko + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced 2xsaiko </pre></td></tr> diff --git a/2xsaiko.txt b/2xsaiko.txt index 1b1673f92e3a..6c7e8899d0df 100644 --- a/2xsaiko.txt +++ b/2xsaiko.txt @@ -10,6 +10,7 @@ {'type': 'git', 'uri': 'git@git.sr.ht:~dblsaiko/ebuilds'}], 'status': 'unofficial'} $ pmaint sync 2xsaiko +*** syncing 2xsaiko warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -24,7 +25,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing 2xsaiko *** synced 2xsaiko * Sync succeeded $ git log --format=%ci -1 diff --git a/4nykey.html b/4nykey.html index 9f63e7cdc3b3..fe7331ca5490 100644 --- a/4nykey.html +++ b/4nykey.html @@ -36,35 +36,35 @@ </pre></td></tr> <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync 4nykey </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing 4nykey </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** syncing 4nykey + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced 4nykey </pre></td></tr> diff --git a/4nykey.txt b/4nykey.txt index 8c9f4ae9fac0..e287ceeeb1ac 100644 --- a/4nykey.txt +++ b/4nykey.txt @@ -11,6 +11,7 @@ {'type': 'git', 'uri': 'git@github.com:4nykey/4nykey.git'}], 'status': 'unofficial'} $ pmaint sync 4nykey +*** syncing 4nykey warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -25,7 +26,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing 4nykey *** synced 4nykey * Sync succeeded $ git log --format=%ci -1 diff --git a/AlexandreFournier.html b/AlexandreFournier.html index a678454b221a..e915acbbb407 100644 --- a/AlexandreFournier.html +++ b/AlexandreFournier.html @@ -42,35 +42,35 @@ </pre></td></tr> <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync AlexandreFournier </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing AlexandreFournier </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing AlexandreFournier + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced AlexandreFournier </pre></td></tr> diff --git a/AlexandreFournier.txt b/AlexandreFournier.txt index 9b435ac27e28..f3637d060797 100644 --- a/AlexandreFournier.txt +++ b/AlexandreFournier.txt @@ -14,6 +14,7 @@ 'uri': 'git@github.com:AlexandreFournier/gentoo-overlay.git'}], 'status': 'unofficial'} $ pmaint sync AlexandreFournier +*** syncing AlexandreFournier warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -28,7 +29,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing AlexandreFournier *** synced AlexandreFournier * Sync succeeded $ git log --format=%ci -1 diff --git a/ArchFeh.html b/ArchFeh.html index 7cf53546bad1..119410fa4bfb 100644 --- a/ArchFeh.html +++ b/ArchFeh.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync ArchFeh </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing ArchFeh </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing ArchFeh + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced ArchFeh </pre></td></tr> diff --git a/ArchFeh.txt b/ArchFeh.txt index 055c700c10af..17e68a0ace50 100644 --- a/ArchFeh.txt +++ b/ArchFeh.txt @@ -12,6 +12,7 @@ 'uri': 'git+ssh://git@github.com/ArchFeh/ArchFeh-overlay.git'}], 'status': 'unofficial'} $ pmaint sync ArchFeh +*** syncing ArchFeh warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing ArchFeh *** synced ArchFeh * Sync succeeded $ git log --format=%ci -1 diff --git a/AstroFloyd.html b/AstroFloyd.html index 7592a4e977c5..d06d05e58faa 100644 --- a/AstroFloyd.html +++ b/AstroFloyd.html @@ -42,35 +42,35 @@ </pre></td></tr> <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync AstroFloyd </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing AstroFloyd </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing AstroFloyd + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced AstroFloyd </pre></td></tr> diff --git a/AstroFloyd.txt b/AstroFloyd.txt index c40406a5c917..cd1a5b85f8c4 100644 --- a/AstroFloyd.txt +++ b/AstroFloyd.txt @@ -14,6 +14,7 @@ 'uri': 'git+ssh://git@git.gentoo.org/user/AstroFloyd.git'}], 'status': 'unofficial'} $ pmaint sync AstroFloyd +*** syncing AstroFloyd warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -28,7 +29,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing AstroFloyd *** synced AstroFloyd * Sync succeeded $ git log --format=%ci -1 @@ -40,35 +40,35 @@ </pre></td></tr> <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync AzP </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing AzP </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing AzP + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced AzP </pre></td></tr> @@ -13,6 +13,7 @@ 'uri': 'git+ssh://git@git.gentoo.org/user/AzP.git'}], 'status': 'unofficial'} $ pmaint sync AzP +*** syncing AzP warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -27,7 +28,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing AzP *** synced AzP * Sync succeeded $ git log --format=%ci -1 diff --git a/Case_Of.html b/Case_Of.html index 311ebd02e408..828bad5d769d 100644 --- a/Case_Of.html +++ b/Case_Of.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync Case_Of </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing Case_Of </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing Case_Of + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced Case_Of </pre></td></tr> diff --git a/Case_Of.txt b/Case_Of.txt index 9e234148cd62..0f793cd70926 100644 --- a/Case_Of.txt +++ b/Case_Of.txt @@ -12,6 +12,7 @@ 'uri': 'git+ssh://git@framagit.org/Case_Of/gentoo-overlay.git'}], 'status': 'unofficial'} $ pmaint sync Case_Of +*** syncing Case_Of warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing Case_Of *** synced Case_Of * Sync succeeded $ git log --format=%ci -1 diff --git a/Drauthius.html b/Drauthius.html index 03246b8a276b..775b57d6c445 100644 --- a/Drauthius.html +++ b/Drauthius.html @@ -42,35 +42,35 @@ </pre></td></tr> <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync Drauthius </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing Drauthius </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing Drauthius + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced Drauthius </pre></td></tr> diff --git a/Drauthius.txt b/Drauthius.txt index bc775320c0ad..ff297d6ea184 100644 --- a/Drauthius.txt +++ b/Drauthius.txt @@ -14,6 +14,7 @@ 'uri': 'git+ssh://git@git.gentoo.org/repo/user/Drauthius.git'}], 'status': 'unofficial'} $ pmaint sync Drauthius +*** syncing Drauthius warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -28,7 +29,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing Drauthius *** synced Drauthius * Sync succeeded $ git log --format=%ci -1 diff --git a/DuPol.html b/DuPol.html index 531a685f0744..52b0cb1a5da7 100644 --- a/DuPol.html +++ b/DuPol.html @@ -36,35 +36,35 @@ </pre></td></tr> <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync DuPol </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing DuPol </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** syncing DuPol + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced DuPol </pre></td></tr> diff --git a/DuPol.txt b/DuPol.txt index 04013a9c7558..02a143ee1a55 100644 --- a/DuPol.txt +++ b/DuPol.txt @@ -11,6 +11,7 @@ 'uri': 'git+ssh://git@git.gentoo.org/user/DuPol.git'}], 'status': 'unofficial'} $ pmaint sync DuPol +*** syncing DuPol warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -25,7 +26,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing DuPol *** synced DuPol * Sync succeeded $ git log --format=%ci -1 diff --git a/FireBurn.html b/FireBurn.html index beb6648f1a36..3ae8e2025cfb 100644 --- a/FireBurn.html +++ b/FireBurn.html @@ -32,35 +32,35 @@ </pre></td></tr> <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync FireBurn </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>*** syncing FireBurn </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>invocation. + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Already up to date. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** syncing FireBurn + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced FireBurn </pre></td></tr> diff --git a/FireBurn.txt b/FireBurn.txt index 2cd8cf69ee19..86ff9250e446 100644 --- a/FireBurn.txt +++ b/FireBurn.txt @@ -9,6 +9,7 @@ 'source': [{'type': 'git', 'uri': 'git://github.com/FireBurn/Overlay.git'}], 'status': 'unofficial'} $ pmaint sync FireBurn +*** syncing FireBurn warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -23,7 +24,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing FireBurn *** synced FireBurn * Sync succeeded $ git log --format=%ci -1 diff --git a/HomeAssistantRepository.html b/HomeAssistantRepository.html index 280dfa61d8cd..ed845ef38eff 100644 --- a/HomeAssistantRepository.html +++ b/HomeAssistantRepository.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync HomeAssistantRepository </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing HomeAssistantRepository </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing HomeAssistantRepository + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced HomeAssistantRepository </pre></td></tr> diff --git a/HomeAssistantRepository.txt b/HomeAssistantRepository.txt index b0ea97af40f9..366210b54f13 100644 --- a/HomeAssistantRepository.txt +++ b/HomeAssistantRepository.txt @@ -12,6 +12,7 @@ 'uri': 'https://github.com/onkelbeh/HomeAssistantRepository.git'}], 'status': 'unofficial'} $ pmaint sync HomeAssistantRepository +*** syncing HomeAssistantRepository warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing HomeAssistantRepository *** synced HomeAssistantRepository * Sync succeeded $ git log --format=%ci -1 @@ -42,35 +42,35 @@ </pre></td></tr> <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync JRG </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing JRG </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing JRG + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced JRG </pre></td></tr> @@ -14,6 +14,7 @@ 'uri': 'git@github.com:john-r-graham/jrg-overlay.git'}], 'status': 'unofficial'} $ pmaint sync JRG +*** syncing JRG warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -28,7 +29,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing JRG *** synced JRG * Sync succeeded $ git log --format=%ci -1 diff --git a/KBrown-pub.html b/KBrown-pub.html index 9209c2535e61..988c6cc4ea6f 100644 --- a/KBrown-pub.html +++ b/KBrown-pub.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync KBrown-pub </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing KBrown-pub </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing KBrown-pub + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced KBrown-pub </pre></td></tr> diff --git a/KBrown-pub.txt b/KBrown-pub.txt index 631c619199ad..0b04f804c8ec 100644 --- a/KBrown-pub.txt +++ b/KBrown-pub.txt @@ -12,6 +12,7 @@ 'uri': 'https://github.com/KenjiBrown/gentoo-overlay.git'}], 'status': 'unofficial'} $ pmaint sync KBrown-pub +*** syncing KBrown-pub warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing KBrown-pub *** synced KBrown-pub * Sync succeeded $ git log --format=%ci -1 diff --git a/Krontage.html b/Krontage.html index 7d1f76755d6a..4fa485e9e9c9 100644 --- a/Krontage.html +++ b/Krontage.html @@ -32,35 +32,35 @@ </pre></td></tr> <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync Krontage </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>*** syncing Krontage </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>invocation. + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Already up to date. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** syncing Krontage + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced Krontage </pre></td></tr> diff --git a/Krontage.txt b/Krontage.txt index 647ddcdc94e1..576f595706f6 100644 --- a/Krontage.txt +++ b/Krontage.txt @@ -9,6 +9,7 @@ {'type': 'git', 'uri': 'git@github.com:undying/krontage.git'}], 'status': 'unofficial'} $ pmaint sync Krontage +*** syncing Krontage warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -23,7 +24,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing Krontage *** synced Krontage * Sync succeeded $ git log --format=%ci -1 diff --git a/ROKO__.html b/ROKO__.html index 97ec0c74f23f..f096bc10e376 100644 --- a/ROKO__.html +++ b/ROKO__.html @@ -34,35 +34,35 @@ </pre></td></tr> <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync ROKO__ </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing ROKO__ </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing ROKO__ + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced ROKO__ </pre></td></tr> diff --git a/ROKO__.txt b/ROKO__.txt index 991130af5501..869ff8016b3d 100644 --- a/ROKO__.txt +++ b/ROKO__.txt @@ -10,6 +10,7 @@ {'type': 'git', 'uri': 'git://github.com/sandikata/ROKO__.git'}], 'status': 'unofficial'} $ pmaint sync ROKO__ +*** syncing ROKO__ warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -24,7 +25,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing ROKO__ *** synced ROKO__ * Sync succeeded $ git log --format=%ci -1 diff --git a/R_Overlay.html b/R_Overlay.html index 8725d08f3bb0..5d7fc6690ef0 100644 --- a/R_Overlay.html +++ b/R_Overlay.html @@ -32,41 +32,41 @@ </pre></td></tr> <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync R_Overlay </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>*** syncing R_Overlay </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>Number of files: 92,316 (reg: 75,157, dir: 17,159) + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>Number of created files: 0 + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>Number of files: 92,316 (reg: 75,157, dir: 17,159) </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>Number of deleted files: 0 + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>Number of created files: 0 </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>Number of regular files transferred: 0 + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>Number of deleted files: 0 </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>Total file size: 62.66M bytes + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>Number of regular files transferred: 0 </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>Total transferred file size: 0 bytes + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>Total file size: 62.66M bytes </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>Literal data: 0 bytes + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>Total transferred file size: 0 bytes </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>Matched data: 0 bytes + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>Literal data: 0 bytes </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>File list size: 2.13M + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>Matched data: 0 bytes </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>File list generation time: 0.001 seconds + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>File list size: 2.37M </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>File list transfer time: 0.000 seconds + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>File list generation time: 0.001 seconds </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>Total bytes sent: 17.70K + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>File list transfer time: 0.000 seconds </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Total bytes received: 2.66M + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Total bytes sent: 17.70K </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Total bytes received: 2.66M </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>sent 17.70K bytes received 2.66M bytes 1.79M bytes/sec + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>total size is 62.66M speedup is 23.39 + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>sent 17.70K bytes received 2.66M bytes 1.79M bytes/sec </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing R_Overlay + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>total size is 62.66M speedup is 23.39 </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced R_Overlay </pre></td></tr> diff --git a/R_Overlay.txt b/R_Overlay.txt index 88e5686af3e4..c8ffaec8a01f 100644 --- a/R_Overlay.txt +++ b/R_Overlay.txt @@ -9,6 +9,7 @@ 'uri': 'rsync://roverlay.dev.gentoo.org/roverlay'}], 'status': 'official'} $ pmaint sync R_Overlay +*** syncing R_Overlay Number of files: 92,316 (reg: 75,157, dir: 17,159) Number of created files: 0 @@ -18,7 +19,7 @@ Total file size: 62.66M bytes Total transferred file size: 0 bytes Literal data: 0 bytes Matched data: 0 bytes -File list size: 2.13M +File list size: 2.37M File list generation time: 0.001 seconds File list transfer time: 0.000 seconds Total bytes sent: 17.70K @@ -26,7 +27,6 @@ Total bytes received: 2.66M sent 17.70K bytes received 2.66M bytes 1.79M bytes/sec total size is 62.66M speedup is 23.39 -*** syncing R_Overlay *** synced R_Overlay * Sync succeeded $ stat --format=%y . diff --git a/SwordArMor.html b/SwordArMor.html index 721b525940f7..0cb4bf9bab05 100644 --- a/SwordArMor.html +++ b/SwordArMor.html @@ -36,35 +36,35 @@ </pre></td></tr> <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync SwordArMor </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing SwordArMor </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>fatal: unable to access 'https://git.grifon.fr/alarig/SwordArMor-gentoo-overlay.git/': The requested URL returned error: 500 + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** syncing SwordArMor + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>fatal: unable to access 'https://git.grifon.fr/alarig/SwordArMor-gentoo-overlay.git/': The requested URL returned error: 500 </pre></td></tr> <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>!!! failed syncing SwordArMor </pre></td></tr> @@ -74,9 +74,9 @@ </pre></td></tr> <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ pmaint sync SwordArMor </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>Cloning into '/var/lib/repo-mirror-ci/sync/SwordArMor'... + <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** syncing SwordArMor </pre></td></tr> - <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>*** syncing SwordArMor + <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>Cloning into '/var/lib/repo-mirror-ci/sync/SwordArMor'... </pre></td></tr> <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>*** synced SwordArMor </pre></td></tr> diff --git a/SwordArMor.txt b/SwordArMor.txt index 6b0dd151c181..1c17b81acf67 100644 --- a/SwordArMor.txt +++ b/SwordArMor.txt @@ -11,6 +11,7 @@ 'uri': 'git+ssh://git@git.grifon.fr:alarig/SwordArMor-gentoo-overlay.git'}], 'status': 'unofficial'} $ pmaint sync SwordArMor +*** syncing SwordArMor warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -25,13 +26,12 @@ or --ff-only on the command line to override the configured default per invocation. fatal: unable to access 'https://git.grifon.fr/alarig/SwordArMor-gentoo-overlay.git/': The requested URL returned error: 500 -*** syncing SwordArMor !!! failed syncing SwordArMor * Sync failed with 1 * Will try to re-create $ pmaint sync SwordArMor -Cloning into '/var/lib/repo-mirror-ci/sync/SwordArMor'... *** syncing SwordArMor +Cloning into '/var/lib/repo-mirror-ci/sync/SwordArMor'... *** synced SwordArMor * Sync succeeded after re-adding $ git log --format=%ci -1 @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync ace </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing ace </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing ace + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced ace </pre></td></tr> @@ -12,6 +12,7 @@ {'type': 'git', 'uri': 'git@github.com:ananace/overlay.git'}], 'status': 'unofficial'} $ pmaint sync ace +*** syncing ace warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing ace *** synced ace * Sync succeeded $ git log --format=%ci -1 diff --git a/activehome.html b/activehome.html index 8ca98ed0fba3..3b44cda3ca2c 100644 --- a/activehome.html +++ b/activehome.html @@ -48,35 +48,35 @@ </pre></td></tr> <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>$ pmaint sync activehome </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** syncing activehome </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>invocation. + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>Already up to date. + <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>*** syncing activehome + <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>*** synced activehome </pre></td></tr> diff --git a/activehome.txt b/activehome.txt index 8ab0155a9e6f..fd1897aba4f7 100644 --- a/activehome.txt +++ b/activehome.txt @@ -17,6 +17,7 @@ 'uri': 'git+ssh://git@git.gentoo.org/user/activehome.git'}], 'status': 'unofficial'} $ pmaint sync activehome +*** syncing activehome warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -31,7 +32,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing activehome *** synced activehome * Sync succeeded $ git log --format=%ci -1 diff --git a/aeon-gentoo-overlay.html b/aeon-gentoo-overlay.html index 47e7b5690510..7b5291315550 100644 --- a/aeon-gentoo-overlay.html +++ b/aeon-gentoo-overlay.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync aeon-gentoo-overlay </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing aeon-gentoo-overlay </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing aeon-gentoo-overlay + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced aeon-gentoo-overlay </pre></td></tr> diff --git a/aeon-gentoo-overlay.txt b/aeon-gentoo-overlay.txt index 8ae4aa3953f3..3ab9b5491502 100644 --- a/aeon-gentoo-overlay.txt +++ b/aeon-gentoo-overlay.txt @@ -12,6 +12,7 @@ 'uri': 'git+ssh://git@github.com/aeon-engine/aeon-gentoo-overlay.git'}], 'status': 'unofficial'} $ pmaint sync aeon-gentoo-overlay +*** syncing aeon-gentoo-overlay warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing aeon-gentoo-overlay *** synced aeon-gentoo-overlay * Sync succeeded $ git log --format=%ci -1 diff --git a/ag-ops.html b/ag-ops.html index 5792f0eedb2d..35dc42660651 100644 --- a/ag-ops.html +++ b/ag-ops.html @@ -36,35 +36,35 @@ </pre></td></tr> <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync ag-ops </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing ag-ops </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** syncing ag-ops + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced ag-ops </pre></td></tr> diff --git a/ag-ops.txt b/ag-ops.txt index 7fe417b6759f..e74f6e86a96c 100644 --- a/ag-ops.txt +++ b/ag-ops.txt @@ -11,6 +11,7 @@ 'uri': 'git+ssh://git@gitlab.com/ILMostro/ag-ops.git'}], 'status': 'unofficial'} $ pmaint sync ag-ops +*** syncing ag-ops warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -25,7 +26,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing ag-ops *** synced ag-ops * Sync succeeded $ git log --format=%ci -1 @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync ago </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing ago </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing ago + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced ago </pre></td></tr> @@ -12,6 +12,7 @@ {'type': 'git', 'uri': 'git+ssh://git@git.gentoo.org/dev/ago.git'}], 'status': 'official'} $ pmaint sync ago +*** syncing ago warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing ago *** synced ago * Sync succeeded $ git log --format=%ci -1 diff --git a/ahyangyi-overlay.html b/ahyangyi-overlay.html index 79a4fd2d606b..f6e1777826c3 100644 --- a/ahyangyi-overlay.html +++ b/ahyangyi-overlay.html @@ -34,35 +34,35 @@ </pre></td></tr> <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync ahyangyi-overlay </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing ahyangyi-overlay </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing ahyangyi-overlay + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced ahyangyi-overlay </pre></td></tr> diff --git a/ahyangyi-overlay.txt b/ahyangyi-overlay.txt index 5d8335681732..337102d33d19 100644 --- a/ahyangyi-overlay.txt +++ b/ahyangyi-overlay.txt @@ -10,6 +10,7 @@ 'uri': 'https://github.com/ahyangyi/ahyangyi-overlay.git'}], 'status': 'unofficial'} $ pmaint sync ahyangyi-overlay +*** syncing ahyangyi-overlay warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -24,7 +25,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing ahyangyi-overlay *** synced ahyangyi-overlay * Sync succeeded $ git log --format=%ci -1 diff --git a/alatar-lay.html b/alatar-lay.html index f91ff44927fd..18abb5c8c938 100644 --- a/alatar-lay.html +++ b/alatar-lay.html @@ -34,35 +34,35 @@ </pre></td></tr> <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync alatar-lay </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing alatar-lay </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing alatar-lay + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced alatar-lay </pre></td></tr> diff --git a/alatar-lay.txt b/alatar-lay.txt index d8cf128e7e4e..d22e4e5beb7b 100644 --- a/alatar-lay.txt +++ b/alatar-lay.txt @@ -10,6 +10,7 @@ {'type': 'git', 'uri': 'git@github.com:alatarum/alatar-lay.git'}], 'status': 'unofficial'} $ pmaint sync alatar-lay +*** syncing alatar-lay warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -24,7 +25,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing alatar-lay *** synced alatar-lay * Sync succeeded $ git log --format=%ci -1 diff --git a/alesharik.html b/alesharik.html index 47641ad4cf78..16bb6456c4aa 100644 --- a/alesharik.html +++ b/alesharik.html @@ -36,35 +36,35 @@ </pre></td></tr> <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync alesharik </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing alesharik </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** syncing alesharik + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced alesharik </pre></td></tr> diff --git a/alesharik.txt b/alesharik.txt index f1822ce4784d..f882ef61532a 100644 --- a/alesharik.txt +++ b/alesharik.txt @@ -11,6 +11,7 @@ 'uri': 'git+ssh://git@github.com/alesharik/alesharik-overlay.git'}], 'status': 'unofficial'} $ pmaint sync alesharik +*** syncing alesharik warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -25,7 +26,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing alesharik *** synced alesharik * Sync succeeded $ git log --format=%ci -1 diff --git a/alexcepoi.html b/alexcepoi.html index ab4f15b69265..0c80eb7fed1e 100644 --- a/alexcepoi.html +++ b/alexcepoi.html @@ -42,35 +42,35 @@ </pre></td></tr> <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync alexcepoi </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing alexcepoi </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing alexcepoi + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced alexcepoi </pre></td></tr> diff --git a/alexcepoi.txt b/alexcepoi.txt index 7969b4e0a28d..f62c0d349677 100644 --- a/alexcepoi.txt +++ b/alexcepoi.txt @@ -14,6 +14,7 @@ 'uri': 'git+ssh://git@git.gentoo.org/user/alexcepoi.git'}], 'status': 'unofficial'} $ pmaint sync alexcepoi +*** syncing alexcepoi warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -28,7 +29,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing alexcepoi *** synced alexcepoi * Sync succeeded $ git log --format=%ci -1 diff --git a/alexxy.html b/alexxy.html index 1c12d267aad5..1cd6b266f5e6 100644 --- a/alexxy.html +++ b/alexxy.html @@ -40,35 +40,35 @@ </pre></td></tr> <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync alexxy </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing alexxy </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing alexxy + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced alexxy </pre></td></tr> diff --git a/alexxy.txt b/alexxy.txt index 9a3b4cc991a5..43c8775a8868 100644 --- a/alexxy.txt +++ b/alexxy.txt @@ -13,6 +13,7 @@ 'uri': 'git+ssh://git@git.gentoo.org/dev/alexxy.git'}], 'status': 'official'} $ pmaint sync alexxy +*** syncing alexxy warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -27,7 +28,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing alexxy *** synced alexxy * Sync succeeded $ git log --format=%ci -1 diff --git a/aluco.html b/aluco.html index e5336e244c1e..20f3ee0ce5c4 100644 --- a/aluco.html +++ b/aluco.html @@ -40,35 +40,35 @@ </pre></td></tr> <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync aluco </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing aluco </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing aluco + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced aluco </pre></td></tr> diff --git a/aluco.txt b/aluco.txt index 3592070b2648..7edaf0a4e977 100644 --- a/aluco.txt +++ b/aluco.txt @@ -13,6 +13,7 @@ 'uri': 'git+ssh://git@git.gentoo.org/user/aluco.git'}], 'status': 'unofficial'} $ pmaint sync aluco +*** syncing aluco warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -27,7 +28,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing aluco *** synced aluco * Sync succeeded $ git log --format=%ci -1 diff --git a/alxu.html b/alxu.html index 1ca4ebe26a33..86da187d125c 100644 --- a/alxu.html +++ b/alxu.html @@ -32,35 +32,35 @@ </pre></td></tr> <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync alxu </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>*** syncing alxu </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>invocation. + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Already up to date. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** syncing alxu + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced alxu </pre></td></tr> @@ -9,6 +9,7 @@ 'source': [{'type': 'git', 'uri': 'https://git.alxu.ca/gentoo-overlay.git'}], 'status': 'unofficial'} $ pmaint sync alxu +*** syncing alxu warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -23,7 +24,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing alxu *** synced alxu * Sync succeeded $ git log --format=%ci -1 diff --git a/amedeos.html b/amedeos.html index f4d97ea93bfd..c2fe8794479b 100644 --- a/amedeos.html +++ b/amedeos.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync amedeos </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing amedeos </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing amedeos + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced amedeos </pre></td></tr> diff --git a/amedeos.txt b/amedeos.txt index 55d80071d44c..dd4f315fc184 100644 --- a/amedeos.txt +++ b/amedeos.txt @@ -12,6 +12,7 @@ 'uri': 'git+ssh://git@github.com/amedeos/amedeos-overlay.git'}], 'status': 'unofficial'} $ pmaint sync amedeos +*** syncing amedeos warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing amedeos *** synced amedeos * Sync succeeded $ git log --format=%ci -1 diff --git a/anarchy.html b/anarchy.html index 86c8a98ab598..5e40e3b4e54e 100644 --- a/anarchy.html +++ b/anarchy.html @@ -40,35 +40,35 @@ </pre></td></tr> <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync anarchy </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing anarchy </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing anarchy + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced anarchy </pre></td></tr> diff --git a/anarchy.txt b/anarchy.txt index e0acca5a4851..6cc8358d1bd5 100644 --- a/anarchy.txt +++ b/anarchy.txt @@ -13,6 +13,7 @@ 'uri': 'git+ssh://git@git.gentoo.org/dev/anarchy.git'}], 'status': 'official'} $ pmaint sync anarchy +*** syncing anarchy warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -27,7 +28,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing anarchy *** synced anarchy * Sync succeeded $ git log --format=%ci -1 diff --git a/anard.html b/anard.html index 256c9626d327..2241a259caa8 100644 --- a/anard.html +++ b/anard.html @@ -34,35 +34,35 @@ </pre></td></tr> <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync anard </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing anard </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing anard + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced anard </pre></td></tr> diff --git a/anard.txt b/anard.txt index e0a947b1fa4c..632c945bed40 100644 --- a/anard.txt +++ b/anard.txt @@ -10,6 +10,7 @@ 'uri': 'git+ssh://git@github.com/Anard/anard-overlay.git'}], 'status': 'unofficial'} $ pmaint sync anard +*** syncing anard warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -24,7 +25,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing anard *** synced anard * Sync succeeded $ git log --format=%ci -1 diff --git a/anaximander.html b/anaximander.html index bf4f3afc4610..ec12131664b6 100644 --- a/anaximander.html +++ b/anaximander.html @@ -42,35 +42,35 @@ </pre></td></tr> <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync anaximander </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing anaximander </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing anaximander + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced anaximander </pre></td></tr> diff --git a/anaximander.txt b/anaximander.txt index f76dc983fdb4..03a5f8e69cc7 100644 --- a/anaximander.txt +++ b/anaximander.txt @@ -14,6 +14,7 @@ 'uri': 'git+ssh://git@git.gentoo.org/user/anaximander.git'}], 'status': 'unofficial'} $ pmaint sync anaximander +*** syncing anaximander warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -28,7 +29,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing anaximander *** synced anaximander * Sync succeeded $ git log --format=%ci -1 diff --git a/anders-larsson.html b/anders-larsson.html index ba37da6ef8bb..bee2851b3781 100644 --- a/anders-larsson.html +++ b/anders-larsson.html @@ -32,35 +32,35 @@ </pre></td></tr> <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync anders-larsson </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>*** syncing anders-larsson </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>invocation. + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Already up to date. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** syncing anders-larsson + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced anders-larsson </pre></td></tr> diff --git a/anders-larsson.txt b/anders-larsson.txt index 4a3bd55f9c36..ed7978c4eca1 100644 --- a/anders-larsson.txt +++ b/anders-larsson.txt @@ -9,6 +9,7 @@ 'uri': 'https://github.com/anders-larsson/gentoo-overlay.git'}], 'status': 'unofficial'} $ pmaint sync anders-larsson +*** syncing anders-larsson warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -23,7 +24,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing anders-larsson *** synced anders-larsson * Sync succeeded $ git log --format=%ci -1 diff --git a/andrey_utkin.html b/andrey_utkin.html index 6549d4a6efed..7ff1f2bb9764 100644 --- a/andrey_utkin.html +++ b/andrey_utkin.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync andrey_utkin </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing andrey_utkin </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing andrey_utkin + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced andrey_utkin </pre></td></tr> diff --git a/andrey_utkin.txt b/andrey_utkin.txt index 923e319a532e..0d3a2327e926 100644 --- a/andrey_utkin.txt +++ b/andrey_utkin.txt @@ -12,6 +12,7 @@ 'uri': 'git+ssh://git@github.com/andrey-utkin/gentoo-overlay.git'}], 'status': 'official'} $ pmaint sync andrey_utkin +*** syncing andrey_utkin warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing andrey_utkin *** synced andrey_utkin * Sync succeeded $ git log --format=%ci -1 diff --git a/anomen.html b/anomen.html index 4b43d75cf50e..b738a7df12de 100644 --- a/anomen.html +++ b/anomen.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync anomen </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing anomen </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing anomen + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced anomen </pre></td></tr> diff --git a/anomen.txt b/anomen.txt index d83022fc8255..6147732fccaf 100644 --- a/anomen.txt +++ b/anomen.txt @@ -12,6 +12,7 @@ 'uri': 'git@github.com:anomen-s/anomen-overlay.git'}], 'status': 'unofficial'} $ pmaint sync anomen +*** syncing anomen warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing anomen *** synced anomen * Sync succeeded $ git log --format=%ci -1 diff --git a/anyc.html b/anyc.html index c13df87aefc7..754a1a268fff 100644 --- a/anyc.html +++ b/anyc.html @@ -36,35 +36,35 @@ </pre></td></tr> <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync anyc </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing anyc </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** syncing anyc + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced anyc </pre></td></tr> @@ -11,6 +11,7 @@ {'type': 'git', 'uri': 'git@github.com:anyc/anyc-overlay.git'}], 'status': 'unofficial'} $ pmaint sync anyc +*** syncing anyc warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -25,7 +26,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing anyc *** synced anyc * Sync succeeded $ git log --format=%ci -1 diff --git a/apriluwu.html b/apriluwu.html index ed184d21426b..70dfcf67c92b 100644 --- a/apriluwu.html +++ b/apriluwu.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync apriluwu </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing apriluwu </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing apriluwu + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced apriluwu </pre></td></tr> diff --git a/apriluwu.txt b/apriluwu.txt index c7d088718c88..4a4b74e423c3 100644 --- a/apriluwu.txt +++ b/apriluwu.txt @@ -12,6 +12,7 @@ 'uri': 'git+ssh://git@github.com/apriluwu/gentoo-overlay.git'}], 'status': 'unofficial'} $ pmaint sync apriluwu +*** syncing apriluwu warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing apriluwu *** synced apriluwu * Sync succeeded $ git log --format=%ci -1 diff --git a/archenroot.html b/archenroot.html index 966fcc58019f..a0c54a2f0d05 100644 --- a/archenroot.html +++ b/archenroot.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync archenroot </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing archenroot </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing archenroot + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced archenroot </pre></td></tr> diff --git a/archenroot.txt b/archenroot.txt index 5b6feccfc445..466b6b6c9794 100644 --- a/archenroot.txt +++ b/archenroot.txt @@ -12,6 +12,7 @@ 'uri': 'git+ssh://git@github.com/archenroot/gentoo-overlay.git'}], 'status': 'unofficial'} $ pmaint sync archenroot +*** syncing archenroot warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing archenroot *** synced archenroot * Sync succeeded $ git log --format=%ci -1 diff --git a/argent-main.html b/argent-main.html index 7c0734a92297..92b169195ef2 100644 --- a/argent-main.html +++ b/argent-main.html @@ -34,35 +34,35 @@ </pre></td></tr> <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync argent-main </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing argent-main </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing argent-main + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced argent-main </pre></td></tr> diff --git a/argent-main.txt b/argent-main.txt index ab3fbe067f57..692a4aea1f4b 100644 --- a/argent-main.txt +++ b/argent-main.txt @@ -10,6 +10,7 @@ 'uri': 'https://gitlab.com/argent/argent-main.git'}], 'status': 'unofficial'} $ pmaint sync argent-main +*** syncing argent-main warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -24,7 +25,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing argent-main *** synced argent-main * Sync succeeded $ git log --format=%ci -1 diff --git a/arx-libertatis.html b/arx-libertatis.html index a8f33653d7ce..e2976ee4d03f 100644 --- a/arx-libertatis.html +++ b/arx-libertatis.html @@ -32,35 +32,35 @@ </pre></td></tr> <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync arx-libertatis </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>*** syncing arx-libertatis </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>invocation. + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Already up to date. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** syncing arx-libertatis + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced arx-libertatis </pre></td></tr> diff --git a/arx-libertatis.txt b/arx-libertatis.txt index 81e969f2d513..b80825917831 100644 --- a/arx-libertatis.txt +++ b/arx-libertatis.txt @@ -9,6 +9,7 @@ {'type': 'git', 'uri': 'git://github.com/arx/ArxGentoo.git'}], 'status': 'unofficial'} $ pmaint sync arx-libertatis +*** syncing arx-libertatis warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -23,7 +24,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing arx-libertatis *** synced arx-libertatis * Sync succeeded $ git log --format=%ci -1 diff --git a/audio-overlay.html b/audio-overlay.html index 1e5949c434ac..44509900f465 100644 --- a/audio-overlay.html +++ b/audio-overlay.html @@ -46,35 +46,35 @@ </pre></td></tr> <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>$ pmaint sync audio-overlay </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** syncing audio-overlay </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>invocation. + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date. + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** syncing audio-overlay + <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>*** synced audio-overlay </pre></td></tr> diff --git a/audio-overlay.txt b/audio-overlay.txt index 903248796370..c871938c46a6 100644 --- a/audio-overlay.txt +++ b/audio-overlay.txt @@ -16,6 +16,7 @@ 'uri': 'git@github.com:gentoo-audio/audio-overlay.git'}], 'status': 'unofficial'} $ pmaint sync audio-overlay +*** syncing audio-overlay warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -30,7 +31,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing audio-overlay *** synced audio-overlay * Sync succeeded $ git log --format=%ci -1 diff --git a/average.html b/average.html index e717ec4cc82b..783e59190459 100644 --- a/average.html +++ b/average.html @@ -40,35 +40,35 @@ </pre></td></tr> <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync average </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing average </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing average + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced average </pre></td></tr> diff --git a/average.txt b/average.txt index 07c5376c7b2e..6ce668a0dbb9 100644 --- a/average.txt +++ b/average.txt @@ -13,6 +13,7 @@ 'uri': 'git+ssh://git@github.com/AnAverageHuman/average.git'}], 'status': 'unofficial'} $ pmaint sync average +*** syncing average warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -27,7 +28,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing average *** synced average * Sync succeeded $ git log --format=%ci -1 diff --git a/awesome.html b/awesome.html index a8e62a8cba30..d323e7f84230 100644 --- a/awesome.html +++ b/awesome.html @@ -32,35 +32,35 @@ </pre></td></tr> <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync awesome </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>*** syncing awesome </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>invocation. + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Already up to date. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** syncing awesome + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced awesome </pre></td></tr> diff --git a/awesome.txt b/awesome.txt index 3a936dd64df3..0b9948c73716 100644 --- a/awesome.txt +++ b/awesome.txt @@ -9,6 +9,7 @@ 'uri': 'https://gitlab.awesome-it.de/overlays/awesome.git'}], 'status': 'unofficial'} $ pmaint sync awesome +*** syncing awesome warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -23,7 +24,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing awesome *** synced awesome * Sync succeeded $ git log --format=%ci -1 diff --git a/barnowl.html b/barnowl.html index 9cc63b08d6fa..44f4b22e2caf 100644 --- a/barnowl.html +++ b/barnowl.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync barnowl </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing barnowl </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing barnowl + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced barnowl </pre></td></tr> diff --git a/barnowl.txt b/barnowl.txt index 345344f83feb..10293d302c14 100644 --- a/barnowl.txt +++ b/barnowl.txt @@ -12,6 +12,7 @@ 'uri': 'git://github.com/wthrowe/barnowl-overlay.git'}], 'status': 'unofficial'} $ pmaint sync barnowl +*** syncing barnowl warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing barnowl *** synced barnowl * Sync succeeded $ git log --format=%ci -1 diff --git a/beatussum-overlay.html b/beatussum-overlay.html index 62e504b8f5c6..d35f2550d4e5 100644 --- a/beatussum-overlay.html +++ b/beatussum-overlay.html @@ -58,35 +58,35 @@ </pre></td></tr> <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>$ pmaint sync beatussum-overlay </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>*** syncing beatussum-overlay </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>invocation. + <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> + <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>Already up to date. + <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>*** syncing beatussum-overlay + <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>*** synced beatussum-overlay </pre></td></tr> diff --git a/beatussum-overlay.txt b/beatussum-overlay.txt index 3d03d8e4f52a..f3562c00f469 100644 --- a/beatussum-overlay.txt +++ b/beatussum-overlay.txt @@ -22,6 +22,7 @@ 'uri': 'ssh://git@github.com/beatussum/beatussum-overlay.git'}], 'status': 'unofficial'} $ pmaint sync beatussum-overlay +*** syncing beatussum-overlay warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -36,7 +37,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing beatussum-overlay *** synced beatussum-overlay * Sync succeeded $ git log --format=%ci -1 diff --git a/benzene-overlay.html b/benzene-overlay.html index 12d738bd2e60..11e53468c554 100644 --- a/benzene-overlay.html +++ b/benzene-overlay.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync benzene-overlay </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing benzene-overlay </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing benzene-overlay + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced benzene-overlay </pre></td></tr> diff --git a/benzene-overlay.txt b/benzene-overlay.txt index 38607f8e879a..cda2d93be231 100644 --- a/benzene-overlay.txt +++ b/benzene-overlay.txt @@ -12,6 +12,7 @@ 'uri': 'git+ssh://git@github.com/Universebenzene/benzene-overlay.git'}], 'status': 'unofficial'} $ pmaint sync benzene-overlay +*** syncing benzene-overlay warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing benzene-overlay *** synced benzene-overlay * Sync succeeded $ git log --format=%ci -1 @@ -42,35 +42,35 @@ </pre></td></tr> <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync bes </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing bes </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing bes + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced bes </pre></td></tr> @@ -14,6 +14,7 @@ 'uri': 'git@github.com:bes-internal/gentoo-overlay-bes.git'}], 'status': 'unofficial'} $ pmaint sync bes +*** syncing bes warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -28,7 +29,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing bes *** synced bes * Sync succeeded $ git log --format=%ci -1 diff --git a/bezerker.html b/bezerker.html index 3578de615375..c2e28663c8f2 100644 --- a/bezerker.html +++ b/bezerker.html @@ -32,35 +32,35 @@ </pre></td></tr> <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync bezerker </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>*** syncing bezerker </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>invocation. + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Already up to date. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** syncing bezerker + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced bezerker </pre></td></tr> diff --git a/bezerker.txt b/bezerker.txt index 4da7187e76b1..364ee2765444 100644 --- a/bezerker.txt +++ b/bezerker.txt @@ -9,6 +9,7 @@ 'uri': 'https://github.com/bezerker/gentoo-overlay.git'}], 'status': 'unofficial'} $ pmaint sync bezerker +*** syncing bezerker warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -23,7 +24,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing bezerker *** synced bezerker * Sync succeeded $ git log --format=%ci -1 diff --git a/bibletime.html b/bibletime.html index ccc9549e6eaa..c219b9615282 100644 --- a/bibletime.html +++ b/bibletime.html @@ -42,35 +42,35 @@ </pre></td></tr> <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync bibletime </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing bibletime </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing bibletime + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced bibletime </pre></td></tr> diff --git a/bibletime.txt b/bibletime.txt index fbbc5331ba1b..6cf1fa34e4b0 100644 --- a/bibletime.txt +++ b/bibletime.txt @@ -14,6 +14,7 @@ 'uri': 'git+ssh://git@git.gentoo.org/user/bibletime.git'}], 'status': 'unofficial'} $ pmaint sync bibletime +*** syncing bibletime warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -28,7 +29,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing bibletime *** synced bibletime * Sync succeeded $ git log --format=%ci -1 diff --git a/binaryden.html b/binaryden.html index 08fc31a8fb2a..ccf609841afa 100644 --- a/binaryden.html +++ b/binaryden.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync binaryden </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing binaryden </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing binaryden + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced binaryden </pre></td></tr> diff --git a/binaryden.txt b/binaryden.txt index 37b56c84aba2..a25bb028f521 100644 --- a/binaryden.txt +++ b/binaryden.txt @@ -12,6 +12,7 @@ 'uri': 'git+ssh://git@github.com/tkemmer/binaryden.git'}], 'status': 'unofficial'} $ pmaint sync binaryden +*** syncing binaryden warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing binaryden *** synced binaryden * Sync succeeded $ git log --format=%ci -1 diff --git a/bircoph.html b/bircoph.html index 75e57dc34ee5..95ca826a0edd 100644 --- a/bircoph.html +++ b/bircoph.html @@ -40,35 +40,35 @@ </pre></td></tr> <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync bircoph </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing bircoph </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing bircoph + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced bircoph </pre></td></tr> diff --git a/bircoph.txt b/bircoph.txt index f8c7a21d2337..19e129273466 100644 --- a/bircoph.txt +++ b/bircoph.txt @@ -13,6 +13,7 @@ 'uri': 'git+ssh://git@git.gentoo.org/dev/bircoph.git'}], 'status': 'official'} $ pmaint sync bircoph +*** syncing bircoph warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -27,7 +28,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing bircoph *** synced bircoph * Sync succeeded $ git log --format=%ci -1 diff --git a/bitcetera.html b/bitcetera.html index 8d33785b5952..7838b78294e2 100644 --- a/bitcetera.html +++ b/bitcetera.html @@ -42,35 +42,35 @@ </pre></td></tr> <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync bitcetera </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing bitcetera </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing bitcetera + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced bitcetera </pre></td></tr> diff --git a/bitcetera.txt b/bitcetera.txt index 1941e0048f40..0296dd83fca6 100644 --- a/bitcetera.txt +++ b/bitcetera.txt @@ -14,6 +14,7 @@ 'uri': 'git@github.com:svoop/bitcetera-overlay.git'}], 'status': 'unofficial'} $ pmaint sync bitcetera +*** syncing bitcetera warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -28,7 +29,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing bitcetera *** synced bitcetera * Sync succeeded $ git log --format=%ci -1 diff --git a/bitcoin.html b/bitcoin.html index b3575b0fa548..4d9683f4e9b5 100644 --- a/bitcoin.html +++ b/bitcoin.html @@ -30,35 +30,35 @@ </pre></td></tr> <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>$ pmaint sync bitcoin </pre></td></tr> - <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>*** syncing bitcoin </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>invocation. + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>Already up to date. + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>*** syncing bitcoin + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** synced bitcoin </pre></td></tr> diff --git a/bitcoin.txt b/bitcoin.txt index 3a2d9bb2e4b9..880e7f865c32 100644 --- a/bitcoin.txt +++ b/bitcoin.txt @@ -8,6 +8,7 @@ 'source': [{'type': 'git', 'uri': 'https://gitlab.com/bitcoin/gentoo.git'}], 'status': 'unofficial'} $ pmaint sync bitcoin +*** syncing bitcoin warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -22,7 +23,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing bitcoin *** synced bitcoin * Sync succeeded $ git log --format=%ci -1 diff --git a/bleeding-edge.html b/bleeding-edge.html index 0be1bb2c8873..cf1eb7d6f8b5 100644 --- a/bleeding-edge.html +++ b/bleeding-edge.html @@ -44,35 +44,35 @@ </pre></td></tr> <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync bleeding-edge </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing bleeding-edge </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date. + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** syncing bleeding-edge + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced bleeding-edge </pre></td></tr> diff --git a/bleeding-edge.txt b/bleeding-edge.txt index 01ec58b56338..ee6ce845165f 100644 --- a/bleeding-edge.txt +++ b/bleeding-edge.txt @@ -15,6 +15,7 @@ 'uri': 'git+ssh://git@git.gentoo.org/repo/user/bleeding-edge.git'}], 'status': 'unofficial'} $ pmaint sync bleeding-edge +*** syncing bleeding-edge warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -29,7 +30,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing bleeding-edge *** synced bleeding-edge * Sync succeeded $ git log --format=%ci -1 diff --git a/blender-gentoo-logo.html b/blender-gentoo-logo.html index dc1720c44457..8225acd5a870 100644 --- a/blender-gentoo-logo.html +++ b/blender-gentoo-logo.html @@ -40,35 +40,35 @@ </pre></td></tr> <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync blender-gentoo-logo </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing blender-gentoo-logo </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing blender-gentoo-logo + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced blender-gentoo-logo </pre></td></tr> diff --git a/blender-gentoo-logo.txt b/blender-gentoo-logo.txt index 9a9fce64cc3f..3c2c5f788f8f 100644 --- a/blender-gentoo-logo.txt +++ b/blender-gentoo-logo.txt @@ -13,6 +13,7 @@ 'uri': 'git+ssh://git@git.gentoo.org/repo/proj/blender-gentoo-logo.git'}], 'status': 'official'} $ pmaint sync blender-gentoo-logo +*** syncing blender-gentoo-logo warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -27,7 +28,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing blender-gentoo-logo *** synced blender-gentoo-logo * Sync succeeded $ git log --format=%ci -1 diff --git a/bloody.html b/bloody.html index 433fc8d8b509..15cc45c888b7 100644 --- a/bloody.html +++ b/bloody.html @@ -36,35 +36,35 @@ </pre></td></tr> <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync bloody </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing bloody </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** syncing bloody + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced bloody </pre></td></tr> diff --git a/bloody.txt b/bloody.txt index 8a1ebeda848d..fee39d4962d7 100644 --- a/bloody.txt +++ b/bloody.txt @@ -11,6 +11,7 @@ {'type': 'git', 'uri': 'git@github.com:bloodywing/bloody.git'}], 'status': 'unofficial'} $ pmaint sync bloody +*** syncing bloody warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -25,7 +26,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing bloody *** synced bloody * Sync succeeded $ git log --format=%ci -1 diff --git a/bobwya.html b/bobwya.html index e3e5576a6366..9566ce6f4663 100644 --- a/bobwya.html +++ b/bobwya.html @@ -42,35 +42,35 @@ </pre></td></tr> <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync bobwya </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing bobwya </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing bobwya + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced bobwya </pre></td></tr> diff --git a/bobwya.txt b/bobwya.txt index 256121cf656f..a055455f7974 100644 --- a/bobwya.txt +++ b/bobwya.txt @@ -14,6 +14,7 @@ 'uri': 'git@github.com:bobwya/miscellaneous_ebuilds.git'}], 'status': 'unofficial'} $ pmaint sync bobwya +*** syncing bobwya warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -28,7 +29,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing bobwya *** synced bobwya * Sync succeeded $ git log --format=%ci -1 diff --git a/bombo82.html b/bombo82.html index c1ef956851ab..6341d1a39446 100644 --- a/bombo82.html +++ b/bombo82.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync bombo82 </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing bombo82 </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing bombo82 + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced bombo82 </pre></td></tr> diff --git a/bombo82.txt b/bombo82.txt index 1896c952019f..8772f0296f80 100644 --- a/bombo82.txt +++ b/bombo82.txt @@ -12,6 +12,7 @@ 'uri': 'git@github.com:bombo82/bombo82-overlay.git'}], 'status': 'unofficial'} $ pmaint sync bombo82 +*** syncing bombo82 warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing bombo82 *** synced bombo82 * Sync succeeded $ git log --format=%ci -1 diff --git a/booboo.html b/booboo.html index 1dd520034a15..6bd3ec52ab44 100644 --- a/booboo.html +++ b/booboo.html @@ -32,35 +32,35 @@ </pre></td></tr> <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync booboo </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>*** syncing booboo </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>invocation. + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Already up to date. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** syncing booboo + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced booboo </pre></td></tr> diff --git a/booboo.txt b/booboo.txt index e27bd01fef25..4b5e441f4b63 100644 --- a/booboo.txt +++ b/booboo.txt @@ -9,6 +9,7 @@ 'source': [{'type': 'git', 'uri': 'https://github.com/l29ah/booboo.git'}], 'status': 'unofficial'} $ pmaint sync booboo +*** syncing booboo warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -23,7 +24,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing booboo *** synced booboo * Sync succeeded $ git log --format=%ci -1 diff --git a/brave-overlay.html b/brave-overlay.html index ec0e36ea360e..df9184464d13 100644 --- a/brave-overlay.html +++ b/brave-overlay.html @@ -34,35 +34,35 @@ </pre></td></tr> <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync brave-overlay </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing brave-overlay </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing brave-overlay + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced brave-overlay </pre></td></tr> diff --git a/brave-overlay.txt b/brave-overlay.txt index 99b7f6d16828..7061e5d45239 100644 --- a/brave-overlay.txt +++ b/brave-overlay.txt @@ -10,6 +10,7 @@ 'uri': 'https://gitlab.com/jason.oliveira/brave-overlay.git'}], 'status': 'unofficial'} $ pmaint sync brave-overlay +*** syncing brave-overlay warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -24,7 +25,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing brave-overlay *** synced brave-overlay * Sync succeeded $ git log --format=%ci -1 diff --git a/bright.html b/bright.html index 1552865b3044..04690ea945a7 100644 --- a/bright.html +++ b/bright.html @@ -32,35 +32,35 @@ </pre></td></tr> <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync bright </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>*** syncing bright </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>invocation. + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Already up to date. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** syncing bright + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced bright </pre></td></tr> diff --git a/bright.txt b/bright.txt index c8cab3cfa5dc..908e49988148 100644 --- a/bright.txt +++ b/bright.txt @@ -9,6 +9,7 @@ 'source': [{'type': 'git', 'uri': 'https://github.com/filalex77/bright.git'}], 'status': 'unofficial'} $ pmaint sync bright +*** syncing bright warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -23,7 +24,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing bright *** synced bright * Sync succeeded $ git log --format=%ci -1 diff --git a/brother-overlay.html b/brother-overlay.html index 05f018c12df9..ba6dde5534b6 100644 --- a/brother-overlay.html +++ b/brother-overlay.html @@ -42,35 +42,35 @@ </pre></td></tr> <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync brother-overlay </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing brother-overlay </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing brother-overlay + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced brother-overlay </pre></td></tr> diff --git a/brother-overlay.txt b/brother-overlay.txt index a330aed2139d..3577a310d942 100644 --- a/brother-overlay.txt +++ b/brother-overlay.txt @@ -14,6 +14,7 @@ 'uri': 'git@github.com:stefan-langenmaier/brother-overlay.git'}], 'status': 'unofficial'} $ pmaint sync brother-overlay +*** syncing brother-overlay warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -28,7 +29,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing brother-overlay *** synced brother-overlay * Sync succeeded $ git log --format=%ci -1 diff --git a/bubba.html b/bubba.html index e97bde18c10a..5d0567b565aa 100644 --- a/bubba.html +++ b/bubba.html @@ -32,35 +32,35 @@ </pre></td></tr> <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync bubba </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>*** syncing bubba </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>invocation. + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Already up to date. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** syncing bubba + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced bubba </pre></td></tr> diff --git a/bubba.txt b/bubba.txt index 0a326f9d305e..b5f51a9de642 100644 --- a/bubba.txt +++ b/bubba.txt @@ -9,6 +9,7 @@ 'uri': 'https://github.com/gordonb3/bubba-overlay.git'}], 'status': 'unofficial'} $ pmaint sync bubba +*** syncing bubba warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -23,7 +24,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing bubba *** synced bubba * Sync succeeded $ git log --format=%ci -1 diff --git a/bumblebee.html b/bumblebee.html index 50689f75b784..9bdd9812c863 100644 --- a/bumblebee.html +++ b/bumblebee.html @@ -34,35 +34,35 @@ </pre></td></tr> <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync bumblebee </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing bumblebee </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing bumblebee + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced bumblebee </pre></td></tr> diff --git a/bumblebee.txt b/bumblebee.txt index be4b91b4f2f4..55adc769b9a9 100644 --- a/bumblebee.txt +++ b/bumblebee.txt @@ -10,6 +10,7 @@ 'uri': 'git://github.com/Bumblebee-Project/bumblebee-gentoo'}], 'status': 'unofficial'} $ pmaint sync bumblebee +*** syncing bumblebee warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -24,7 +25,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing bumblebee *** synced bumblebee * Sync succeeded $ git log --format=%ci -1 diff --git a/buzden.html b/buzden.html index 1200cd5b3245..4331b207c278 100644 --- a/buzden.html +++ b/buzden.html @@ -40,35 +40,35 @@ </pre></td></tr> <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync buzden </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing buzden </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing buzden + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced buzden </pre></td></tr> diff --git a/buzden.txt b/buzden.txt index d98cd2aebfcd..03a298b72ae3 100644 --- a/buzden.txt +++ b/buzden.txt @@ -13,6 +13,7 @@ {'type': 'git', 'uri': 'git@github.com:buzden/buzden-overlay.git'}], 'status': 'unofficial'} $ pmaint sync buzden +*** syncing buzden warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -27,7 +28,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing buzden *** synced buzden * Sync succeeded $ git log --format=%ci -1 diff --git a/calculate.html b/calculate.html index 5e12b151a131..20f65b9a995a 100644 --- a/calculate.html +++ b/calculate.html @@ -28,35 +28,35 @@ </pre></td></tr> <tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre>$ pmaint sync calculate </pre></td></tr> - <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>*** syncing calculate </pre></td></tr> - <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>invocation. + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>Already up to date. + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>*** syncing calculate + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>*** synced calculate </pre></td></tr> diff --git a/calculate.txt b/calculate.txt index afcf11735816..7a4756b42bcf 100644 --- a/calculate.txt +++ b/calculate.txt @@ -7,6 +7,7 @@ 'uri': 'git://git.calculate-linux.org/calculate/calculate-overlay.git'}], 'status': 'unofficial'} $ pmaint sync calculate +*** syncing calculate warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -21,7 +22,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing calculate *** synced calculate * Sync succeeded $ git log --format=%ci -1 diff --git a/canutethegreat-overlay.html b/canutethegreat-overlay.html index 4f6287f578e3..fdecfbeb92b8 100644 --- a/canutethegreat-overlay.html +++ b/canutethegreat-overlay.html @@ -40,35 +40,35 @@ </pre></td></tr> <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync canutethegreat-overlay </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing canutethegreat-overlay </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing canutethegreat-overlay + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced canutethegreat-overlay </pre></td></tr> diff --git a/canutethegreat-overlay.txt b/canutethegreat-overlay.txt index 2d1e54714410..0603304522e5 100644 --- a/canutethegreat-overlay.txt +++ b/canutethegreat-overlay.txt @@ -13,6 +13,7 @@ 'uri': 'git+ssh://git@github.com/CanuteTheGreat/canutethegreat-overlay.git'}], 'status': 'unofficial'} $ pmaint sync canutethegreat-overlay +*** syncing canutethegreat-overlay warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -27,7 +28,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing canutethegreat-overlay *** synced canutethegreat-overlay * Sync succeeded $ git log --format=%ci -1 diff --git a/ceamac.html b/ceamac.html index eacec6bdca74..7a472cd29082 100644 --- a/ceamac.html +++ b/ceamac.html @@ -40,35 +40,35 @@ </pre></td></tr> <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync ceamac </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing ceamac </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing ceamac + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced ceamac </pre></td></tr> diff --git a/ceamac.txt b/ceamac.txt index 3b84a6d22a82..164ada900e28 100644 --- a/ceamac.txt +++ b/ceamac.txt @@ -13,6 +13,7 @@ 'uri': 'git+ssh://git@github.com/ceamac/overlay.git'}], 'status': 'unofficial'} $ pmaint sync ceamac +*** syncing ceamac warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -27,7 +28,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing ceamac *** synced ceamac * Sync succeeded $ git log --format=%ci -1 diff --git a/certbot-dns-plugins.html b/certbot-dns-plugins.html index 36a604fa5c17..b97598bf492e 100644 --- a/certbot-dns-plugins.html +++ b/certbot-dns-plugins.html @@ -40,35 +40,35 @@ </pre></td></tr> <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync certbot-dns-plugins </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing certbot-dns-plugins </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing certbot-dns-plugins + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced certbot-dns-plugins </pre></td></tr> diff --git a/certbot-dns-plugins.txt b/certbot-dns-plugins.txt index 1ddc3031c033..b9ad8435c78c 100644 --- a/certbot-dns-plugins.txt +++ b/certbot-dns-plugins.txt @@ -13,6 +13,7 @@ 'uri': 'git@github.com:osirisinferi/certbot-dns-plugins-overlay.git'}], 'status': 'unofficial'} $ pmaint sync certbot-dns-plugins +*** syncing certbot-dns-plugins warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -27,7 +28,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing certbot-dns-plugins *** synced certbot-dns-plugins * Sync succeeded $ git log --format=%ci -1 @@ -28,35 +28,35 @@ </pre></td></tr> <tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre>$ pmaint sync cg </pre></td></tr> - <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>*** syncing cg </pre></td></tr> - <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>invocation. + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>Already up to date. + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>*** syncing cg + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>*** synced cg </pre></td></tr> @@ -7,6 +7,7 @@ 'uri': 'https://github.com/brothermechanic/cg.git'}], 'status': 'unofficial'} $ pmaint sync cg +*** syncing cg warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -21,7 +22,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing cg *** synced cg * Sync succeeded $ git log --format=%ci -1 diff --git a/chrisadr.html b/chrisadr.html index 2ad5b123f682..123bb28a3154 100644 --- a/chrisadr.html +++ b/chrisadr.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync chrisadr </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing chrisadr </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing chrisadr + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced chrisadr </pre></td></tr> diff --git a/chrisadr.txt b/chrisadr.txt index f11a61bc4bfa..b89e81c869e5 100644 --- a/chrisadr.txt +++ b/chrisadr.txt @@ -12,6 +12,7 @@ 'uri': 'git@github.com:ChrisADR/chrisadr-overlay.git'}], 'status': 'unofficial'} $ pmaint sync chrisadr +*** syncing chrisadr warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing chrisadr *** synced chrisadr * Sync succeeded $ git log --format=%ci -1 diff --git a/chrytoo.html b/chrytoo.html index a61ae047500c..c9225b43174e 100644 --- a/chrytoo.html +++ b/chrytoo.html @@ -44,35 +44,35 @@ </pre></td></tr> <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync chrytoo </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing chrytoo </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date. + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** syncing chrytoo + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced chrytoo </pre></td></tr> diff --git a/chrytoo.txt b/chrytoo.txt index a0538744e8f4..07f6b2ff3c98 100644 --- a/chrytoo.txt +++ b/chrytoo.txt @@ -15,6 +15,7 @@ 'uri': 'git@github.com:chrytoo/gentoo-overlay.git'}], 'status': 'unofficial'} $ pmaint sync chrytoo +*** syncing chrytoo warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -29,7 +30,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing chrytoo *** synced chrytoo * Sync succeeded $ git log --format=%ci -1 diff --git a/chymeric.html b/chymeric.html index 0bf7d39c6fa4..4339efb9e217 100644 --- a/chymeric.html +++ b/chymeric.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync chymeric </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing chymeric </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing chymeric + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced chymeric </pre></td></tr> diff --git a/chymeric.txt b/chymeric.txt index 70815710b85e..e348d053ae75 100644 --- a/chymeric.txt +++ b/chymeric.txt @@ -12,6 +12,7 @@ 'uri': 'git+ssh://git@github.com/TheChymera/overlay.git'}], 'status': 'unofficial'} $ pmaint sync chymeric +*** syncing chymeric warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing chymeric *** synced chymeric * Sync succeeded $ git log --format=%ci -1 diff --git a/cj-overlay.html b/cj-overlay.html index b8f66da993f4..464cc08416ee 100644 --- a/cj-overlay.html +++ b/cj-overlay.html @@ -28,35 +28,35 @@ </pre></td></tr> <tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre>$ pmaint sync cj-overlay </pre></td></tr> - <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>*** syncing cj-overlay </pre></td></tr> - <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>invocation. + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>Already up to date. + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>*** syncing cj-overlay + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>*** synced cj-overlay </pre></td></tr> diff --git a/cj-overlay.txt b/cj-overlay.txt index 2ae3dc8eafb7..92950b0cc27b 100644 --- a/cj-overlay.txt +++ b/cj-overlay.txt @@ -7,6 +7,7 @@ 'source': [{'type': 'git', 'uri': 'git://github.com/junghans/cj-overlay'}], 'status': 'official'} $ pmaint sync cj-overlay +*** syncing cj-overlay warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -21,7 +22,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing cj-overlay *** synced cj-overlay * Sync succeeded $ git log --format=%ci -1 diff --git a/concaveoverlay.html b/concaveoverlay.html index 2a20e0b2108f..176e3dae6321 100644 --- a/concaveoverlay.html +++ b/concaveoverlay.html @@ -30,35 +30,35 @@ </pre></td></tr> <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>$ pmaint sync concaveoverlay </pre></td></tr> - <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>*** syncing concaveoverlay </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>invocation. + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>Already up to date. + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>*** syncing concaveoverlay + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** synced concaveoverlay </pre></td></tr> diff --git a/concaveoverlay.txt b/concaveoverlay.txt index c336987e7e7f..cad202ca450f 100644 --- a/concaveoverlay.txt +++ b/concaveoverlay.txt @@ -8,6 +8,7 @@ 'uri': 'https://gitlab.com/concavegit/concaveoverlay.git'}], 'status': 'unofficial'} $ pmaint sync concaveoverlay +*** syncing concaveoverlay warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -22,7 +23,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing concaveoverlay *** synced concaveoverlay * Sync succeeded $ git log --format=%ci -1 diff --git a/crocket-overlay.html b/crocket-overlay.html index 3f11cbb86e78..4dde0815ee0c 100644 --- a/crocket-overlay.html +++ b/crocket-overlay.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync crocket-overlay </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing crocket-overlay </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing crocket-overlay + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced crocket-overlay </pre></td></tr> diff --git a/crocket-overlay.txt b/crocket-overlay.txt index 21ea1911cb54..ef3547e739be 100644 --- a/crocket-overlay.txt +++ b/crocket-overlay.txt @@ -12,6 +12,7 @@ 'uri': 'git+ssh://git@github.com/crocket/crocket-overlay.git'}], 'status': 'unofficial'} $ pmaint sync crocket-overlay +*** syncing crocket-overlay warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing crocket-overlay *** synced crocket-overlay * Sync succeeded $ git log --format=%ci -1 diff --git a/crossdev.html b/crossdev.html index 1ce5727abd6c..a48d250a06d3 100644 --- a/crossdev.html +++ b/crossdev.html @@ -34,35 +34,35 @@ </pre></td></tr> <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync crossdev </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing crossdev </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing crossdev + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced crossdev </pre></td></tr> diff --git a/crossdev.txt b/crossdev.txt index 430faf7d8584..783eb7e3110f 100644 --- a/crossdev.txt +++ b/crossdev.txt @@ -10,6 +10,7 @@ 'source': [{'type': 'git', 'uri': 'git://github.com/alphallc/crossdev'}], 'status': 'unofficial'} $ pmaint sync crossdev +*** syncing crossdev warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -24,7 +25,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing crossdev *** synced crossdev * Sync succeeded $ git log --format=%ci -1 diff --git a/dMaggot.html b/dMaggot.html index 50f12e95fc21..28b90f500cad 100644 --- a/dMaggot.html +++ b/dMaggot.html @@ -40,35 +40,35 @@ </pre></td></tr> <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync dMaggot </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing dMaggot </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing dMaggot + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced dMaggot </pre></td></tr> diff --git a/dMaggot.txt b/dMaggot.txt index 9e018add8b88..f213d61b94b6 100644 --- a/dMaggot.txt +++ b/dMaggot.txt @@ -13,6 +13,7 @@ 'uri': 'git+ssh://git@git.gentoo.org/user/dMaggot.git'}], 'status': 'unofficial'} $ pmaint sync dMaggot +*** syncing dMaggot warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -27,7 +28,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing dMaggot *** synced dMaggot * Sync succeeded $ git log --format=%ci -1 diff --git a/dargor.html b/dargor.html index e1a0b51578e0..61aef88b94b4 100644 --- a/dargor.html +++ b/dargor.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync dargor </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing dargor </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing dargor + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced dargor </pre></td></tr> diff --git a/dargor.txt b/dargor.txt index f84a616db12d..5ecd30e4e40f 100644 --- a/dargor.txt +++ b/dargor.txt @@ -12,6 +12,7 @@ 'uri': 'git@github.com:dargor/dargor_gentoo_overlay.git'}], 'status': 'unofficial'} $ pmaint sync dargor +*** syncing dargor warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing dargor *** synced dargor * Sync succeeded $ git log --format=%ci -1 diff --git a/darkelf.html b/darkelf.html index aa34962cd7fe..91a305e0124b 100644 --- a/darkelf.html +++ b/darkelf.html @@ -36,35 +36,35 @@ </pre></td></tr> <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync darkelf </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing darkelf </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** syncing darkelf + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced darkelf </pre></td></tr> diff --git a/darkelf.txt b/darkelf.txt index 04642301071c..b027dd0d8074 100644 --- a/darkelf.txt +++ b/darkelf.txt @@ -11,6 +11,7 @@ 'uri': 'git+ssh://git@git.gentoo.org/repo/user/darkelf.git'}], 'status': 'unofficial'} $ pmaint sync darkelf +*** syncing darkelf warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -25,7 +26,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing darkelf *** synced darkelf * Sync succeeded $ git log --format=%ci -1 diff --git a/darthgandalf-overlay.html b/darthgandalf-overlay.html index 1c4cca04520c..fc903e204321 100644 --- a/darthgandalf-overlay.html +++ b/darthgandalf-overlay.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync darthgandalf-overlay </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing darthgandalf-overlay </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing darthgandalf-overlay + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced darthgandalf-overlay </pre></td></tr> diff --git a/darthgandalf-overlay.txt b/darthgandalf-overlay.txt index 5b00610dab1f..3ceeb94741ac 100644 --- a/darthgandalf-overlay.txt +++ b/darthgandalf-overlay.txt @@ -12,6 +12,7 @@ 'uri': 'git+ssh://git@github.com/DarthGandalf/gentoo-overlay.git'}], 'status': 'unofficial'} $ pmaint sync darthgandalf-overlay +*** syncing darthgandalf-overlay warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing darthgandalf-overlay *** synced darthgandalf-overlay * Sync succeeded $ git log --format=%ci -1 diff --git a/deadbeef-overlay.html b/deadbeef-overlay.html index cd741b44c0a5..d29154d84d09 100644 --- a/deadbeef-overlay.html +++ b/deadbeef-overlay.html @@ -34,35 +34,35 @@ </pre></td></tr> <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync deadbeef-overlay </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing deadbeef-overlay </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing deadbeef-overlay + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced deadbeef-overlay </pre></td></tr> diff --git a/deadbeef-overlay.txt b/deadbeef-overlay.txt index 9ef7060548d9..a46d2ebb9579 100644 --- a/deadbeef-overlay.txt +++ b/deadbeef-overlay.txt @@ -10,6 +10,7 @@ 'uri': 'https://github.com/damex/deadbeef-overlay.git'}], 'status': 'unofficial'} $ pmaint sync deadbeef-overlay +*** syncing deadbeef-overlay warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -24,7 +25,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing deadbeef-overlay *** synced deadbeef-overlay * Sync succeeded $ git log --format=%ci -1 diff --git a/decent-im.html b/decent-im.html index 56940ac07b55..89cf2198709c 100644 --- a/decent-im.html +++ b/decent-im.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync decent-im </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing decent-im </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing decent-im + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced decent-im </pre></td></tr> diff --git a/decent-im.txt b/decent-im.txt index d76945ef9db3..12bbd2282dab 100644 --- a/decent-im.txt +++ b/decent-im.txt @@ -12,6 +12,7 @@ 'uri': 'git+ssh://git@github.com/decent-im/gentoo-overlay.git'}], 'status': 'unofficial'} $ pmaint sync decent-im +*** syncing decent-im warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing decent-im *** synced decent-im * Sync succeeded $ git log --format=%ci -1 diff --git a/deepin.html b/deepin.html index b531cdf96d5b..d7f162bc0114 100644 --- a/deepin.html +++ b/deepin.html @@ -34,35 +34,35 @@ </pre></td></tr> <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync deepin </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing deepin </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing deepin + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced deepin </pre></td></tr> diff --git a/deepin.txt b/deepin.txt index dda554e5a598..55d5584c43ba 100644 --- a/deepin.txt +++ b/deepin.txt @@ -10,6 +10,7 @@ 'uri': 'git://github.com/zhtengw/deepin-overlay.git'}], 'status': 'unofficial'} $ pmaint sync deepin +*** syncing deepin warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -24,7 +25,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing deepin *** synced deepin * Sync succeeded $ git log --format=%ci -1 diff --git a/defiance.html b/defiance.html index 5f3c9ff3e85a..4034c730536c 100644 --- a/defiance.html +++ b/defiance.html @@ -36,35 +36,35 @@ </pre></td></tr> <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync defiance </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing defiance </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** syncing defiance + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced defiance </pre></td></tr> diff --git a/defiance.txt b/defiance.txt index c35326a82c67..3b656c2daf4e 100644 --- a/defiance.txt +++ b/defiance.txt @@ -11,6 +11,7 @@ {'type': 'git', 'uri': 'git@github.com:d3fy/defiance-overlay.git'}], 'status': 'unofficial'} $ pmaint sync defiance +*** syncing defiance warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -25,7 +26,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing defiance *** synced defiance * Sync succeeded $ git log --format=%ci -1 diff --git a/delicious-absurdities.html b/delicious-absurdities.html index 3283dd312681..5bc74d34f3ab 100644 --- a/delicious-absurdities.html +++ b/delicious-absurdities.html @@ -42,35 +42,35 @@ </pre></td></tr> <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync delicious-absurdities </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing delicious-absurdities </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing delicious-absurdities + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced delicious-absurdities </pre></td></tr> diff --git a/delicious-absurdities.txt b/delicious-absurdities.txt index d9b83a0b08b9..43a984a7cee5 100644 --- a/delicious-absurdities.txt +++ b/delicious-absurdities.txt @@ -14,6 +14,7 @@ 'uri': 'git@github.com:paraenggu/delicious-absurdities-overlay.git'}], 'status': 'unofficial'} $ pmaint sync delicious-absurdities +*** syncing delicious-absurdities warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -28,7 +29,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing delicious-absurdities *** synced delicious-absurdities * Sync succeeded $ git log --format=%ci -1 diff --git a/dequbed.html b/dequbed.html index 72cd30e74b90..b3179bc3e505 100644 --- a/dequbed.html +++ b/dequbed.html @@ -34,35 +34,35 @@ </pre></td></tr> <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync dequbed </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing dequbed </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing dequbed + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced dequbed </pre></td></tr> diff --git a/dequbed.txt b/dequbed.txt index 522ec16cd6cc..d5bf866e288a 100644 --- a/dequbed.txt +++ b/dequbed.txt @@ -10,6 +10,7 @@ {'type': 'git', 'uri': 'git@github.com:dequbed/overlay.git'}], 'status': 'unofficial'} $ pmaint sync dequbed +*** syncing dequbed warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -24,7 +25,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing dequbed *** synced dequbed * Sync succeeded $ git log --format=%ci -1 diff --git a/dev1990-overlay.html b/dev1990-overlay.html index b78ce9c9caa2..5a41476f3667 100644 --- a/dev1990-overlay.html +++ b/dev1990-overlay.html @@ -34,35 +34,35 @@ </pre></td></tr> <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync dev1990-overlay </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing dev1990-overlay </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing dev1990-overlay + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced dev1990-overlay </pre></td></tr> diff --git a/dev1990-overlay.txt b/dev1990-overlay.txt index f7198a0ffb9e..9b560886d55a 100644 --- a/dev1990-overlay.txt +++ b/dev1990-overlay.txt @@ -10,6 +10,7 @@ 'uri': 'https://github.com/dev-0x7C6/dev1990-overlay.git'}], 'status': 'unofficial'} $ pmaint sync dev1990-overlay +*** syncing dev1990-overlay warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -24,7 +25,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing dev1990-overlay *** synced dev1990-overlay * Sync succeeded $ git log --format=%ci -1 diff --git a/devpump-gor.html b/devpump-gor.html index e0d72cbd68f9..302c35869288 100644 --- a/devpump-gor.html +++ b/devpump-gor.html @@ -32,35 +32,35 @@ </pre></td></tr> <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync devpump-gor </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>*** syncing devpump-gor </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>invocation. + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Already up to date. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** syncing devpump-gor + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced devpump-gor </pre></td></tr> diff --git a/devpump-gor.txt b/devpump-gor.txt index 9516be80195d..4ec114938781 100644 --- a/devpump-gor.txt +++ b/devpump-gor.txt @@ -9,6 +9,7 @@ 'uri': 'https://github.com/DevPump/gentoo-overlay.git'}], 'status': 'unofficial'} $ pmaint sync devpump-gor +*** syncing devpump-gor warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -23,7 +24,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing devpump-gor *** synced devpump-gor * Sync succeeded $ git log --format=%ci -1 diff --git a/didactic-duck.html b/didactic-duck.html index 2f51d2895e65..6bd9ec08efe2 100644 --- a/didactic-duck.html +++ b/didactic-duck.html @@ -34,35 +34,35 @@ </pre></td></tr> <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync didactic-duck </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing didactic-duck </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing didactic-duck + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced didactic-duck </pre></td></tr> diff --git a/didactic-duck.txt b/didactic-duck.txt index 47ad213be7be..650d30c12afd 100644 --- a/didactic-duck.txt +++ b/didactic-duck.txt @@ -10,6 +10,7 @@ 'uri': 'https://github.com/lucianposton/didactic-duck.git'}], 'status': 'unofficial'} $ pmaint sync didactic-duck +*** syncing didactic-duck warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -24,7 +25,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing didactic-duck *** synced didactic-duck * Sync succeeded $ git log --format=%ci -1 diff --git a/dilfridge.html b/dilfridge.html index f78cc0493448..ef6f94068510 100644 --- a/dilfridge.html +++ b/dilfridge.html @@ -44,35 +44,35 @@ </pre></td></tr> <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync dilfridge </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing dilfridge </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date. + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** syncing dilfridge + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced dilfridge </pre></td></tr> diff --git a/dilfridge.txt b/dilfridge.txt index 208172d3485d..19717065da1d 100644 --- a/dilfridge.txt +++ b/dilfridge.txt @@ -15,6 +15,7 @@ 'uri': 'git+ssh://git@git.gentoo.org/dev/dilfridge.git'}], 'status': 'official'} $ pmaint sync dilfridge +*** syncing dilfridge warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -29,7 +30,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing dilfridge *** synced dilfridge * Sync succeeded $ git log --format=%ci -1 diff --git a/displacer.html b/displacer.html index 06782870425e..d5601ffd505a 100644 --- a/displacer.html +++ b/displacer.html @@ -42,35 +42,35 @@ </pre></td></tr> <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync displacer </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing displacer </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing displacer + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced displacer </pre></td></tr> diff --git a/displacer.txt b/displacer.txt index ebe7ce826048..d1bcba6f943b 100644 --- a/displacer.txt +++ b/displacer.txt @@ -14,6 +14,7 @@ 'uri': 'git+ssh://git@git.gentoo.org/user/displacer.git'}], 'status': 'unofficial'} $ pmaint sync displacer +*** syncing displacer warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -28,7 +29,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing displacer *** synced displacer * Sync succeeded $ git log --format=%ci -1 diff --git a/distros.html b/distros.html index 110ec5a00458..17e507e84976 100644 --- a/distros.html +++ b/distros.html @@ -28,35 +28,35 @@ </pre></td></tr> <tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre>$ pmaint sync distros </pre></td></tr> - <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>*** syncing distros </pre></td></tr> - <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>invocation. + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>Already up to date. + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>*** syncing distros + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>*** synced distros </pre></td></tr> diff --git a/distros.txt b/distros.txt index c9685d1e335a..d3c30c1eaae4 100644 --- a/distros.txt +++ b/distros.txt @@ -7,6 +7,7 @@ 'uri': 'git://git.calculate-linux.org/calculate/distros-overlay.git'}], 'status': 'unofficial'} $ pmaint sync distros +*** syncing distros warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -21,7 +22,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing distros *** synced distros * Sync succeeded $ git log --format=%ci -1 @@ -36,35 +36,35 @@ </pre></td></tr> <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync djc </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing djc </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** syncing djc + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced djc </pre></td></tr> @@ -11,6 +11,7 @@ {'type': 'git', 'uri': 'git@github.com:djc/djc-overlay.git'}], 'status': 'unofficial'} $ pmaint sync djc +*** syncing djc warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -25,7 +26,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing djc *** synced djc * Sync succeeded $ git log --format=%ci -1 diff --git a/dlang.html b/dlang.html index 07ce61c3a92f..dacfca2ebf33 100644 --- a/dlang.html +++ b/dlang.html @@ -34,35 +34,35 @@ </pre></td></tr> <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync dlang </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing dlang </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing dlang + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced dlang </pre></td></tr> diff --git a/dlang.txt b/dlang.txt index 72f7ce9719f0..2b7e9c15cb15 100644 --- a/dlang.txt +++ b/dlang.txt @@ -10,6 +10,7 @@ {'type': 'git', 'uri': 'git://github.com/gentoo/dlang.git'}], 'status': 'unofficial'} $ pmaint sync dlang +*** syncing dlang warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -24,7 +25,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing dlang *** synced dlang * Sync succeeded $ git log --format=%ci -1 diff --git a/dm9pZCAq.html b/dm9pZCAq.html index 98215d8e5a46..bdd49256dc7b 100644 --- a/dm9pZCAq.html +++ b/dm9pZCAq.html @@ -30,35 +30,35 @@ </pre></td></tr> <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>$ pmaint sync dm9pZCAq </pre></td></tr> - <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>*** syncing dm9pZCAq </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>invocation. + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>Already up to date. + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>*** syncing dm9pZCAq + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** synced dm9pZCAq </pre></td></tr> diff --git a/dm9pZCAq.txt b/dm9pZCAq.txt index 811950b4f272..44e2f3962d0a 100644 --- a/dm9pZCAq.txt +++ b/dm9pZCAq.txt @@ -8,6 +8,7 @@ 'uri': 'https://notabug.org/dm9pZCAq/dm9pZCAq-overlay.git'}], 'status': 'unofficial'} $ pmaint sync dm9pZCAq +*** syncing dm9pZCAq warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -22,7 +23,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing dm9pZCAq *** synced dm9pZCAq * Sync succeeded $ git log --format=%ci -1 diff --git a/dmchurch.html b/dmchurch.html index c064cb0e5c3e..8f6da6af67b5 100644 --- a/dmchurch.html +++ b/dmchurch.html @@ -42,35 +42,35 @@ </pre></td></tr> <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync dmchurch </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing dmchurch </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing dmchurch + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced dmchurch </pre></td></tr> diff --git a/dmchurch.txt b/dmchurch.txt index 9b4af70e302f..aae37486318e 100644 --- a/dmchurch.txt +++ b/dmchurch.txt @@ -14,6 +14,7 @@ 'uri': 'git@github.com:dmchurch/portage-overlay.git'}], 'status': 'unofficial'} $ pmaint sync dmchurch +*** syncing dmchurch warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -28,7 +29,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing dmchurch *** synced dmchurch * Sync succeeded $ git log --format=%ci -1 diff --git a/dotnet.html b/dotnet.html index 8403f4a6ecd6..68caa9f032b7 100644 --- a/dotnet.html +++ b/dotnet.html @@ -34,35 +34,35 @@ </pre></td></tr> <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync dotnet </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing dotnet </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing dotnet + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced dotnet </pre></td></tr> diff --git a/dotnet.txt b/dotnet.txt index 3e734cde42a9..096438cb2d8f 100644 --- a/dotnet.txt +++ b/dotnet.txt @@ -10,6 +10,7 @@ {'type': 'git', 'uri': 'git@github.com:gentoo/dotnet.git'}], 'status': 'official'} $ pmaint sync dotnet +*** syncing dotnet warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -24,7 +25,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing dotnet *** synced dotnet * Sync succeeded $ git log --format=%ci -1 diff --git a/drdim.html b/drdim.html index 230a371482c6..3e5cc60dc2b1 100644 --- a/drdim.html +++ b/drdim.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync drdim </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing drdim </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing drdim + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced drdim </pre></td></tr> diff --git a/drdim.txt b/drdim.txt index 68f4b01219ba..0ae620d949bd 100644 --- a/drdim.txt +++ b/drdim.txt @@ -12,6 +12,7 @@ {'type': 'git', 'uri': 'git@github.com:drdim/layman.git'}], 'status': 'unofficial'} $ pmaint sync drdim +*** syncing drdim warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing drdim *** synced drdim * Sync succeeded $ git log --format=%ci -1 diff --git a/dwfreed.html b/dwfreed.html index cacc631cce57..b08679819303 100644 --- a/dwfreed.html +++ b/dwfreed.html @@ -34,35 +34,35 @@ </pre></td></tr> <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync dwfreed </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing dwfreed </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing dwfreed + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced dwfreed </pre></td></tr> diff --git a/dwfreed.txt b/dwfreed.txt index 4caa20d090bd..3d9c78859b2f 100644 --- a/dwfreed.txt +++ b/dwfreed.txt @@ -10,6 +10,7 @@ 'uri': 'https://bitbucket.org/dwfreed/dwfreed.gentoo'}], 'status': 'unofficial'} $ pmaint sync dwfreed +*** syncing dwfreed warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -24,7 +25,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing dwfreed *** synced dwfreed * Sync succeeded $ git log --format=%ci -1 diff --git a/dwosky.html b/dwosky.html index 8c62b4b9d645..427e2275071e 100644 --- a/dwosky.html +++ b/dwosky.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync dwosky </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing dwosky </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing dwosky + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced dwosky </pre></td></tr> diff --git a/dwosky.txt b/dwosky.txt index 263c8a86ce1e..ae2be8fa6565 100644 --- a/dwosky.txt +++ b/dwosky.txt @@ -12,6 +12,7 @@ 'uri': 'git+ssh://git@github.com/Dwosky/Dwosky-overlay.git'}], 'status': 'unofficial'} $ pmaint sync dwosky +*** syncing dwosky warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing dwosky *** synced dwosky * Sync succeeded $ git log --format=%ci -1 diff --git a/earshark.html b/earshark.html index 2950298d8af6..3164f434d87f 100644 --- a/earshark.html +++ b/earshark.html @@ -34,35 +34,35 @@ </pre></td></tr> <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync earshark </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing earshark </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing earshark + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced earshark </pre></td></tr> diff --git a/earshark.txt b/earshark.txt index 29cb13645b93..ba7b8e4317e8 100644 --- a/earshark.txt +++ b/earshark.txt @@ -10,6 +10,7 @@ {'type': 'git', 'uri': 'git://github.com/Chemrat/overlay.git'}], 'status': 'unofficial'} $ pmaint sync earshark +*** syncing earshark warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -24,7 +25,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing earshark *** synced earshark * Sync succeeded $ git log --format=%ci -1 diff --git a/eclipse.html b/eclipse.html index 716ac2442fbc..fd1b838a8f99 100644 --- a/eclipse.html +++ b/eclipse.html @@ -42,35 +42,35 @@ </pre></td></tr> <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync eclipse </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing eclipse </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing eclipse + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced eclipse </pre></td></tr> diff --git a/eclipse.txt b/eclipse.txt index 4d0fe06f35d1..9c41a593466c 100644 --- a/eclipse.txt +++ b/eclipse.txt @@ -14,6 +14,7 @@ 'uri': 'git@github.com:gentoo/eclipse-overlay.git'}], 'status': 'official'} $ pmaint sync eclipse +*** syncing eclipse warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -28,7 +29,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing eclipse *** synced eclipse * Sync succeeded $ git log --format=%ci -1 diff --git a/edgets.html b/edgets.html index 19d71c4475ac..1349a3fa13fd 100644 --- a/edgets.html +++ b/edgets.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync edgets </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing edgets </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing edgets + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced edgets </pre></td></tr> diff --git a/edgets.txt b/edgets.txt index 21729533114d..8e390a009ef5 100644 --- a/edgets.txt +++ b/edgets.txt @@ -12,6 +12,7 @@ 'uri': 'git+ssh://git@github.com/BlueManCZ/edgets.git'}], 'status': 'unofficial'} $ pmaint sync edgets +*** syncing edgets warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing edgets *** synced edgets * Sync succeeded $ git log --format=%ci -1 diff --git a/eigenlay.html b/eigenlay.html index 7941fbb5c32c..855283ef587a 100644 --- a/eigenlay.html +++ b/eigenlay.html @@ -30,35 +30,35 @@ </pre></td></tr> <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>$ pmaint sync eigenlay </pre></td></tr> - <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>*** syncing eigenlay </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>invocation. + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>Already up to date. + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>*** syncing eigenlay + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** synced eigenlay </pre></td></tr> diff --git a/eigenlay.txt b/eigenlay.txt index 096a878e0c32..4d56fd4b51b2 100644 --- a/eigenlay.txt +++ b/eigenlay.txt @@ -8,6 +8,7 @@ 'source': [{'type': 'git', 'uri': 'https://gitlab.com/eigennet/eigenlay.git'}], 'status': 'unofficial'} $ pmaint sync eigenlay +*** syncing eigenlay warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -22,7 +23,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing eigenlay *** synced eigenlay * Sync succeeded $ git log --format=%ci -1 diff --git a/einflay.html b/einflay.html index c3ada5fe865d..7e30687b4055 100644 --- a/einflay.html +++ b/einflay.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync einflay </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing einflay </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing einflay + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced einflay </pre></td></tr> diff --git a/einflay.txt b/einflay.txt index 330c4807ec1a..a8feb6564f96 100644 --- a/einflay.txt +++ b/einflay.txt @@ -12,6 +12,7 @@ 'uri': 'git+ssh://git@github.com/EinstokFair/einflay.git'}], 'status': 'unofficial'} $ pmaint sync einflay +*** syncing einflay warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing einflay *** synced einflay * Sync succeeded $ git log --format=%ci -1 diff --git a/ejabberd.html b/ejabberd.html index e3a5c81478ac..0a8440985788 100644 --- a/ejabberd.html +++ b/ejabberd.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync ejabberd </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing ejabberd </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing ejabberd + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced ejabberd </pre></td></tr> diff --git a/ejabberd.txt b/ejabberd.txt index b95cfb0256cc..addcee58f9c5 100644 --- a/ejabberd.txt +++ b/ejabberd.txt @@ -12,6 +12,7 @@ 'uri': 'git+ssh://git@github.com/rion-overlay/ejabberd-overlay.git'}], 'status': 'unofficial'} $ pmaint sync ejabberd +*** syncing ejabberd warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing ejabberd *** synced ejabberd * Sync succeeded $ git log --format=%ci -1 diff --git a/electron.html b/electron.html index 9cc9a78fb37c..8a882be5a0f9 100644 --- a/electron.html +++ b/electron.html @@ -34,35 +34,35 @@ </pre></td></tr> <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync electron </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing electron </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing electron + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced electron </pre></td></tr> diff --git a/electron.txt b/electron.txt index 2452145b70a9..d3814f1c0fae 100644 --- a/electron.txt +++ b/electron.txt @@ -10,6 +10,7 @@ 'uri': 'https://github.com/elprans/electron-overlay.git'}], 'status': 'unofficial'} $ pmaint sync electron +*** syncing electron warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -24,7 +25,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing electron *** synced electron * Sync succeeded $ git log --format=%ci -1 diff --git a/elementary.html b/elementary.html index c0cf16dc3497..57d365bcbc2e 100644 --- a/elementary.html +++ b/elementary.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync elementary </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing elementary </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing elementary + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced elementary </pre></td></tr> diff --git a/elementary.txt b/elementary.txt index a5032955a079..8226494baeb4 100644 --- a/elementary.txt +++ b/elementary.txt @@ -12,6 +12,7 @@ 'uri': 'git://github.com/pimvullers/elementary.git'}], 'status': 'unofficial'} $ pmaint sync elementary +*** syncing elementary warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing elementary *** synced elementary * Sync succeeded $ git log --format=%ci -1 diff --git a/elopez-r-overlay.html b/elopez-r-overlay.html index 5b3bec635474..f4876a6ef7ae 100644 --- a/elopez-r-overlay.html +++ b/elopez-r-overlay.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync elopez-r-overlay </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing elopez-r-overlay </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing elopez-r-overlay + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced elopez-r-overlay </pre></td></tr> diff --git a/elopez-r-overlay.txt b/elopez-r-overlay.txt index 62174582856b..9c2fc44fc8cc 100644 --- a/elopez-r-overlay.txt +++ b/elopez-r-overlay.txt @@ -12,6 +12,7 @@ 'uri': 'git+ssh://git@gitlab.com:libre_hackerman/elopez-r-overlay.git'}], 'status': 'unofficial'} $ pmaint sync elopez-r-overlay +*** syncing elopez-r-overlay warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing elopez-r-overlay *** synced elopez-r-overlay * Sync succeeded $ git log --format=%ci -1 diff --git a/emacs.html b/emacs.html index e173c3491e0e..35295b75220d 100644 --- a/emacs.html +++ b/emacs.html @@ -48,35 +48,35 @@ </pre></td></tr> <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>$ pmaint sync emacs </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** syncing emacs </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>invocation. + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>Already up to date. + <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>*** syncing emacs + <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>*** synced emacs </pre></td></tr> diff --git a/emacs.txt b/emacs.txt index 066024ccf9b8..e7b5c29f26e6 100644 --- a/emacs.txt +++ b/emacs.txt @@ -17,6 +17,7 @@ 'uri': 'git+ssh://git@git.gentoo.org/repo/proj/emacs.git'}], 'status': 'official'} $ pmaint sync emacs +*** syncing emacs warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -31,7 +32,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing emacs *** synced emacs * Sync succeeded $ git log --format=%ci -1 diff --git a/enlightenment-live.html b/enlightenment-live.html index f73ccc1795bd..6fbec31509b5 100644 --- a/enlightenment-live.html +++ b/enlightenment-live.html @@ -36,35 +36,35 @@ </pre></td></tr> <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync enlightenment-live </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing enlightenment-live </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** syncing enlightenment-live + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced enlightenment-live </pre></td></tr> diff --git a/enlightenment-live.txt b/enlightenment-live.txt index 93bab41298eb..5afaee67aaa6 100644 --- a/enlightenment-live.txt +++ b/enlightenment-live.txt @@ -11,6 +11,7 @@ 'uri': 'https://github.com/rafspiny/enlightenment-live.git'}], 'status': 'unofficial'} $ pmaint sync enlightenment-live +*** syncing enlightenment-live warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -25,7 +26,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing enlightenment-live *** synced enlightenment-live * Sync succeeded $ git log --format=%ci -1 diff --git a/ennui.html b/ennui.html index b8741ed68ced..81d5165d0f78 100644 --- a/ennui.html +++ b/ennui.html @@ -40,35 +40,35 @@ </pre></td></tr> <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync ennui </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing ennui </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing ennui + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced ennui </pre></td></tr> diff --git a/ennui.txt b/ennui.txt index 7b36869bc6ca..0fafe5e373c6 100644 --- a/ennui.txt +++ b/ennui.txt @@ -13,6 +13,7 @@ 'uri': 'git+ssh://git@git.gentoo.org/user/ennui.git'}], 'status': 'unofficial'} $ pmaint sync ennui +*** syncing ennui warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -27,7 +28,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing ennui *** synced ennui * Sync succeeded $ git log --format=%ci -1 diff --git a/equaeghe.html b/equaeghe.html index a1a40e1f715c..d2adcfd7caad 100644 --- a/equaeghe.html +++ b/equaeghe.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync equaeghe </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing equaeghe </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing equaeghe + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced equaeghe </pre></td></tr> diff --git a/equaeghe.txt b/equaeghe.txt index c1a97ed14c97..e8b578a0ec87 100644 --- a/equaeghe.txt +++ b/equaeghe.txt @@ -12,6 +12,7 @@ 'uri': 'git+ssh://git@github.com/equaeghe/gentoo-overlay.git'}], 'status': 'unofficial'} $ pmaint sync equaeghe +*** syncing equaeghe warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing equaeghe *** synced equaeghe * Sync succeeded $ git log --format=%ci -1 diff --git a/erayd.html b/erayd.html index 240ceb916405..3df13224b54d 100644 --- a/erayd.html +++ b/erayd.html @@ -36,35 +36,35 @@ </pre></td></tr> <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync erayd </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing erayd </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** syncing erayd + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced erayd </pre></td></tr> diff --git a/erayd.txt b/erayd.txt index e6b85efeb217..72911b8e1441 100644 --- a/erayd.txt +++ b/erayd.txt @@ -11,6 +11,7 @@ {'type': 'git', 'uri': 'git@github.com:erayd/overlay.git'}], 'status': 'unofficial'} $ pmaint sync erayd +*** syncing erayd warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -25,7 +26,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing erayd *** synced erayd * Sync succeeded $ git log --format=%ci -1 diff --git a/escpr2.html b/escpr2.html index 7f6fe1ca11cb..581c6442693f 100644 --- a/escpr2.html +++ b/escpr2.html @@ -34,35 +34,35 @@ </pre></td></tr> <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync escpr2 </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing escpr2 </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing escpr2 + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced escpr2 </pre></td></tr> diff --git a/escpr2.txt b/escpr2.txt index e2ad63acef7a..160d45e71c6d 100644 --- a/escpr2.txt +++ b/escpr2.txt @@ -10,6 +10,7 @@ 'uri': 'https://gitlab.com/at.gentoo.repo/epson-inkjet-printer-escpr2.git'}], 'status': 'unofficial'} $ pmaint sync escpr2 +*** syncing escpr2 warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -24,7 +25,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing escpr2 *** synced escpr2 * Sync succeeded $ git log --format=%ci -1 diff --git a/ethereum.html b/ethereum.html index f11913013dfe..9c12958e1a2d 100644 --- a/ethereum.html +++ b/ethereum.html @@ -40,35 +40,35 @@ </pre></td></tr> <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync ethereum </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing ethereum </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing ethereum + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced ethereum </pre></td></tr> diff --git a/ethereum.txt b/ethereum.txt index 8f9e0387c712..8361bf000cc9 100644 --- a/ethereum.txt +++ b/ethereum.txt @@ -13,6 +13,7 @@ 'uri': 'git@github.com:coolparadox/ethereum-gentoo-overlay.git'}], 'status': 'unofficial'} $ pmaint sync ethereum +*** syncing ethereum warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -27,7 +28,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing ethereum *** synced ethereum * Sync succeeded $ git log --format=%ci -1 diff --git a/eugene-bright.html b/eugene-bright.html index 57a5d591c53f..707aac7cb86f 100644 --- a/eugene-bright.html +++ b/eugene-bright.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync eugene-bright </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing eugene-bright </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing eugene-bright + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced eugene-bright </pre></td></tr> diff --git a/eugene-bright.txt b/eugene-bright.txt index 89f72eba510c..ca69f42d7576 100644 --- a/eugene-bright.txt +++ b/eugene-bright.txt @@ -12,6 +12,7 @@ 'uri': 'git@github.com:eugene-bright/eugene-bright-overlay.git'}], 'status': 'unofficial'} $ pmaint sync eugene-bright +*** syncing eugene-bright warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing eugene-bright *** synced eugene-bright * Sync succeeded $ git log --format=%ci -1 diff --git a/ext-devlibs.html b/ext-devlibs.html index e36571fc8a19..3d952ee485ef 100644 --- a/ext-devlibs.html +++ b/ext-devlibs.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync ext-devlibs </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing ext-devlibs </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing ext-devlibs + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced ext-devlibs </pre></td></tr> diff --git a/ext-devlibs.txt b/ext-devlibs.txt index 6cd406d9ad21..aa4386526527 100644 --- a/ext-devlibs.txt +++ b/ext-devlibs.txt @@ -12,6 +12,7 @@ 'uri': 'git@gitlab.com:extsidvind/ext-devlibs.git'}], 'status': 'unofficial'} $ pmaint sync ext-devlibs +*** syncing ext-devlibs warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing ext-devlibs *** synced ext-devlibs * Sync succeeded $ git log --format=%ci -1 diff --git a/farmboy0.html b/farmboy0.html index 447644056ba5..8dab7e3db9ac 100644 --- a/farmboy0.html +++ b/farmboy0.html @@ -42,35 +42,35 @@ </pre></td></tr> <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync farmboy0 </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing farmboy0 </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing farmboy0 + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced farmboy0 </pre></td></tr> diff --git a/farmboy0.txt b/farmboy0.txt index 70652e50f46e..129d2a462be5 100644 --- a/farmboy0.txt +++ b/farmboy0.txt @@ -14,6 +14,7 @@ 'uri': 'git@github.com:farmboy0/portage-overlay.git'}], 'status': 'unofficial'} $ pmaint sync farmboy0 +*** syncing farmboy0 warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -28,7 +29,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing farmboy0 *** synced farmboy0 * Sync succeeded $ git log --format=%ci -1 diff --git a/fem-overlay.html b/fem-overlay.html index aade2770f4a5..a8665f8c76ad 100644 --- a/fem-overlay.html +++ b/fem-overlay.html @@ -32,35 +32,35 @@ </pre></td></tr> <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync fem-overlay </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>*** syncing fem-overlay </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>invocation. + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Already up to date. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** syncing fem-overlay + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced fem-overlay </pre></td></tr> diff --git a/fem-overlay.txt b/fem-overlay.txt index 25022f3cd1b0..0569ba2445eb 100644 --- a/fem-overlay.txt +++ b/fem-overlay.txt @@ -9,6 +9,7 @@ 'uri': 'https://bitbucket.fem.tu-ilmenau.de/scm/gentoo/fem-overlay.git'}], 'status': 'unofficial'} $ pmaint sync fem-overlay +*** syncing fem-overlay warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -23,7 +24,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing fem-overlay *** synced fem-overlay * Sync succeeded $ git log --format=%ci -1 diff --git a/ferki.html b/ferki.html index 11322403694f..627ea2092d5e 100644 --- a/ferki.html +++ b/ferki.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync ferki </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing ferki </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing ferki + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced ferki </pre></td></tr> diff --git a/ferki.txt b/ferki.txt index 9dd9d616ec77..86a85306ae42 100644 --- a/ferki.txt +++ b/ferki.txt @@ -12,6 +12,7 @@ 'uri': 'git+ssh://git@github.com/ferki/gentoo-overlay.git'}], 'status': 'unofficial'} $ pmaint sync ferki +*** syncing ferki warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing ferki *** synced ferki * Sync succeeded $ git log --format=%ci -1 diff --git a/fidonet.html b/fidonet.html index 5d44b055ad8f..7c943af241c3 100644 --- a/fidonet.html +++ b/fidonet.html @@ -30,45 +30,45 @@ </pre></td></tr> <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>$ pmaint sync fidonet </pre></td></tr> - <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>This is overlay.junc.org. + <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>*** syncing fidonet </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>This is overlay.junc.org. </pre></td></tr> <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>Number of files: 1 (reg: 1) + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>Number of created files: 0 + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>Number of files: 1 (reg: 1) </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>Number of deleted files: 0 + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>Number of created files: 0 </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>Number of regular files transferred: 1 + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>Number of deleted files: 0 </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>Total file size: 32 bytes + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>Number of regular files transferred: 1 </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>Total transferred file size: 32 bytes + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>Total file size: 32 bytes </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>Literal data: 32 bytes + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>Total transferred file size: 32 bytes </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>Matched data: 0 bytes + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>Literal data: 32 bytes </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>File list size: 48 + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>Matched data: 0 bytes </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>File list generation time: 0.001 seconds + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>File list size: 48 </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>File list transfer time: 0.000 seconds + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>File list generation time: 0.001 seconds </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Total bytes sent: 85 + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>File list transfer time: 0.000 seconds </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Total bytes received: 134 + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Total bytes sent: 85 </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Total bytes received: 134 </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>sent 85 bytes received 134 bytes 87.60 bytes/sec + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>total size is 32 speedup is 0.15 + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>sent 85 bytes received 134 bytes 87.60 bytes/sec </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing fidonet + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>total size is 32 speedup is 0.15 </pre></td></tr> <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced fidonet </pre></td></tr> diff --git a/fidonet.txt b/fidonet.txt index f092d6b98946..37b1daf34448 100644 --- a/fidonet.txt +++ b/fidonet.txt @@ -8,6 +8,7 @@ 'uri': 'rsync://fidonet.overlay.junc.org/fidonet/'}], 'status': 'unofficial'} $ pmaint sync fidonet +*** syncing fidonet This is overlay.junc.org. @@ -27,7 +28,6 @@ Total bytes received: 134 sent 85 bytes received 134 bytes 87.60 bytes/sec total size is 32 speedup is 0.15 -*** syncing fidonet *** synced fidonet * Sync succeeded $ stat --format=%y . diff --git a/fkmclane.html b/fkmclane.html index 6f860d0a5ca3..d10bbb17143d 100644 --- a/fkmclane.html +++ b/fkmclane.html @@ -36,35 +36,35 @@ </pre></td></tr> <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync fkmclane </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing fkmclane </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** syncing fkmclane + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced fkmclane </pre></td></tr> diff --git a/fkmclane.txt b/fkmclane.txt index ae559bb73a49..e997d4b38418 100644 --- a/fkmclane.txt +++ b/fkmclane.txt @@ -11,6 +11,7 @@ {'type': 'git', 'uri': 'git://github.com/fkmclane/overlay.git'}], 'status': 'unofficial'} $ pmaint sync fkmclane +*** syncing fkmclane warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -25,7 +26,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing fkmclane *** synced fkmclane * Sync succeeded $ git log --format=%ci -1 diff --git a/flammie.html b/flammie.html index 26ed221faac0..4165b26e2efd 100644 --- a/flammie.html +++ b/flammie.html @@ -42,35 +42,35 @@ </pre></td></tr> <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync flammie </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing flammie </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing flammie + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced flammie </pre></td></tr> diff --git a/flammie.txt b/flammie.txt index c9be2be771e1..80f9f21d33d8 100644 --- a/flammie.txt +++ b/flammie.txt @@ -14,6 +14,7 @@ 'uri': 'git://github.com/flammie/flammie-overlay.git'}], 'status': 'unofficial'} $ pmaint sync flammie +*** syncing flammie warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -28,7 +29,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing flammie *** synced flammie * Sync succeeded $ git log --format=%ci -1 diff --git a/flavour.html b/flavour.html index 5cc15af08135..833e26dcecc8 100644 --- a/flavour.html +++ b/flavour.html @@ -32,35 +32,35 @@ </pre></td></tr> <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync flavour </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>*** syncing flavour </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>invocation. + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Already up to date. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** syncing flavour + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced flavour </pre></td></tr> diff --git a/flavour.txt b/flavour.txt index 1cd9406dbed5..4191916daf14 100644 --- a/flavour.txt +++ b/flavour.txt @@ -9,6 +9,7 @@ {'type': 'git', 'uri': 'git://github.com/wimmuskee/flavour.git'}], 'status': 'unofficial'} $ pmaint sync flavour +*** syncing flavour warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -23,7 +24,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing flavour *** synced flavour * Sync succeeded $ git log --format=%ci -1 diff --git a/flewkey-overlay.html b/flewkey-overlay.html index 056f86fcf62a..c403a73e688a 100644 --- a/flewkey-overlay.html +++ b/flewkey-overlay.html @@ -32,35 +32,35 @@ </pre></td></tr> <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync flewkey-overlay </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>*** syncing flewkey-overlay </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>invocation. + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Already up to date. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** syncing flewkey-overlay + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced flewkey-overlay </pre></td></tr> diff --git a/flewkey-overlay.txt b/flewkey-overlay.txt index fde8db4ae5aa..eaef46d411d0 100644 --- a/flewkey-overlay.txt +++ b/flewkey-overlay.txt @@ -9,6 +9,7 @@ 'uri': 'https://git.sdf.org/flewkey/flewkey-overlay.git'}], 'status': 'unofficial'} $ pmaint sync flewkey-overlay +*** syncing flewkey-overlay warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -23,7 +24,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing flewkey-overlay *** synced flewkey-overlay * Sync succeeded $ git log --format=%ci -1 diff --git a/flightsim.html b/flightsim.html index 5e98b8c7903c..c7dbecba8ca0 100644 --- a/flightsim.html +++ b/flightsim.html @@ -44,35 +44,35 @@ </pre></td></tr> <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync flightsim </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing flightsim </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date. + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** syncing flightsim + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced flightsim </pre></td></tr> diff --git a/flightsim.txt b/flightsim.txt index 85ad5090d0bd..86849ddd43f1 100644 --- a/flightsim.txt +++ b/flightsim.txt @@ -15,6 +15,7 @@ 'uri': 'git@github.com:rafaelmartins/flightsim-overlay.git'}], 'status': 'unofficial'} $ pmaint sync flightsim +*** syncing flightsim warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -29,7 +30,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing flightsim *** synced flightsim * Sync succeeded $ git log --format=%ci -1 diff --git a/floppym.html b/floppym.html index 5c721776dcf4..27a7578979ff 100644 --- a/floppym.html +++ b/floppym.html @@ -30,35 +30,35 @@ </pre></td></tr> <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>$ pmaint sync floppym </pre></td></tr> - <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>*** syncing floppym </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>invocation. + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>Already up to date. + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>*** syncing floppym + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** synced floppym </pre></td></tr> diff --git a/floppym.txt b/floppym.txt index 03b251362276..663978503cc5 100644 --- a/floppym.txt +++ b/floppym.txt @@ -8,6 +8,7 @@ 'source': [{'type': 'git', 'uri': 'https://github.com/floppym/floppym'}], 'status': 'unofficial'} $ pmaint sync floppym +*** syncing floppym warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -22,7 +23,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing floppym *** synced floppym * Sync succeeded $ git log --format=%ci -1 diff --git a/flow.html b/flow.html index 541c74dc3e79..729b6e24e9fe 100644 --- a/flow.html +++ b/flow.html @@ -32,35 +32,35 @@ </pre></td></tr> <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync flow </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>*** syncing flow </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>invocation. + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Already up to date. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** syncing flow + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced flow </pre></td></tr> @@ -9,6 +9,7 @@ 'uri': 'https://gitlab.com/Flow/flow-s-ebuilds.git'}], 'status': 'unofficial'} $ pmaint sync flow +*** syncing flow warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -23,7 +24,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing flow *** synced flow * Sync succeeded $ git log --format=%ci -1 diff --git a/flussence.html b/flussence.html index c9d3ff5751a8..9936b3498c8b 100644 --- a/flussence.html +++ b/flussence.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync flussence </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing flussence </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing flussence + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced flussence </pre></td></tr> diff --git a/flussence.txt b/flussence.txt index 5a9155d02750..08134940c70b 100644 --- a/flussence.txt +++ b/flussence.txt @@ -12,6 +12,7 @@ 'uri': 'ssh://git@repo.or.cz/flussence-overlay.git'}], 'status': 'unofficial'} $ pmaint sync flussence +*** syncing flussence warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing flussence *** synced flussence * Sync succeeded $ git log --format=%ci -1 diff --git a/fol4.html b/fol4.html index abdd638a622a..46983191d8ff 100644 --- a/fol4.html +++ b/fol4.html @@ -30,37 +30,37 @@ </pre></td></tr> <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>$ pmaint sync fol4 </pre></td></tr> - <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>*** syncing fol4 </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>invocation. + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>warning: redirecting to https://gitlab.com/madsl/fol4.git/ + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Already up to date. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>warning: redirecting to https://gitlab.com/madsl/fol4.git/ </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** syncing fol4 + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced fol4 </pre></td></tr> @@ -8,6 +8,7 @@ {'type': 'git', 'uri': 'git+ssh://git@gitlab.com/madsl/fol4.git'}], 'status': 'unofficial'} $ pmaint sync fol4 +*** syncing fol4 warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -23,7 +24,6 @@ invocation. warning: redirecting to https://gitlab.com/madsl/fol4.git/ Already up to date. -*** syncing fol4 *** synced fol4 * Sync succeeded $ git log --format=%ci -1 diff --git a/foo-overlay.html b/foo-overlay.html index d7c196a6df0a..0f8d2073de5d 100644 --- a/foo-overlay.html +++ b/foo-overlay.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync foo-overlay </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing foo-overlay </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing foo-overlay + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced foo-overlay </pre></td></tr> diff --git a/foo-overlay.txt b/foo-overlay.txt index e6dd8d42558f..b5a6c5ab6ae3 100644 --- a/foo-overlay.txt +++ b/foo-overlay.txt @@ -12,6 +12,7 @@ 'uri': 'https://github.com/slashbeast/foo-overlay.git'}], 'status': 'unofficial'} $ pmaint sync foo-overlay +*** syncing foo-overlay warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing foo-overlay *** synced foo-overlay * Sync succeeded $ git log --format=%ci -1 diff --git a/fordfrog.html b/fordfrog.html index b4786834d92d..24a12fc593af 100644 --- a/fordfrog.html +++ b/fordfrog.html @@ -40,35 +40,35 @@ </pre></td></tr> <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync fordfrog </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing fordfrog </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing fordfrog + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced fordfrog </pre></td></tr> diff --git a/fordfrog.txt b/fordfrog.txt index 5c9381d8ee14..7cf02503b5ae 100644 --- a/fordfrog.txt +++ b/fordfrog.txt @@ -13,6 +13,7 @@ 'uri': 'git+ssh://git@git.gentoo.org/dev/fordfrog.git'}], 'status': 'official'} $ pmaint sync fordfrog +*** syncing fordfrog warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -27,7 +28,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing fordfrog *** synced fordfrog * Sync succeeded $ git log --format=%ci -1 diff --git a/fowlay.html b/fowlay.html index df860ef79686..8608e04ff1a6 100644 --- a/fowlay.html +++ b/fowlay.html @@ -34,35 +34,35 @@ </pre></td></tr> <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync fowlay </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing fowlay </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing fowlay + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced fowlay </pre></td></tr> diff --git a/fowlay.txt b/fowlay.txt index 6df7f51db0ca..f8b20c8559ee 100644 --- a/fowlay.txt +++ b/fowlay.txt @@ -10,6 +10,7 @@ 'uri': 'https://github.com/fowlay/fowlay-overlay.git'}], 'status': 'unofficial'} $ pmaint sync fowlay +*** syncing fowlay warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -24,7 +25,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing fowlay *** synced fowlay * Sync succeeded $ git log --format=%ci -1 diff --git a/foxiverlay.html b/foxiverlay.html index 22799b4608c3..988594cf8f1a 100644 --- a/foxiverlay.html +++ b/foxiverlay.html @@ -36,35 +36,35 @@ </pre></td></tr> <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync foxiverlay </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing foxiverlay </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** syncing foxiverlay + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced foxiverlay </pre></td></tr> diff --git a/foxiverlay.txt b/foxiverlay.txt index 25c1c462a0fe..c7a76a2f4be1 100644 --- a/foxiverlay.txt +++ b/foxiverlay.txt @@ -11,6 +11,7 @@ {'type': 'git', 'uri': 'git@github.com:Pekkari/foxiverlay.git'}], 'status': 'unofficial'} $ pmaint sync foxiverlay +*** syncing foxiverlay warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -25,7 +26,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing foxiverlay *** synced foxiverlay * Sync succeeded $ git log --format=%ci -1 diff --git a/fritteli.html b/fritteli.html index 24928a3ce3b4..ffd3733d8d5f 100644 --- a/fritteli.html +++ b/fritteli.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync fritteli </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing fritteli </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing fritteli + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced fritteli </pre></td></tr> diff --git a/fritteli.txt b/fritteli.txt index a2f2700ae02f..d106204d624f 100644 --- a/fritteli.txt +++ b/fritteli.txt @@ -12,6 +12,7 @@ 'uri': 'git+ssh://git@github.com/fritteli/gentoo-overlay.git'}], 'status': 'unofficial'} $ pmaint sync fritteli +*** syncing fritteli warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing fritteli *** synced fritteli * Sync succeeded $ git log --format=%ci -1 diff --git a/frr-gentoo.html b/frr-gentoo.html index f6143bdf108f..dbc5a9e83bf6 100644 --- a/frr-gentoo.html +++ b/frr-gentoo.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync frr-gentoo </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing frr-gentoo </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing frr-gentoo + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced frr-gentoo </pre></td></tr> diff --git a/frr-gentoo.txt b/frr-gentoo.txt index e0d79b4c6c45..e8a3345ba8de 100644 --- a/frr-gentoo.txt +++ b/frr-gentoo.txt @@ -12,6 +12,7 @@ 'uri': 'git+ssh://git@github.com:FRRouting/gentoo-overlay.git'}], 'status': 'official'} $ pmaint sync frr-gentoo +*** syncing frr-gentoo warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing frr-gentoo *** synced frr-gentoo * Sync succeeded $ git log --format=%ci -1 diff --git a/fusion809.html b/fusion809.html index 412f20c798f9..35aa28c84892 100644 --- a/fusion809.html +++ b/fusion809.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync fusion809 </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing fusion809 </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing fusion809 + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced fusion809 </pre></td></tr> diff --git a/fusion809.txt b/fusion809.txt index 3d512ecafa7b..43eacb443438 100644 --- a/fusion809.txt +++ b/fusion809.txt @@ -12,6 +12,7 @@ 'uri': 'git://github.com/fusion809/fusion809-overlay.git'}], 'status': 'unofficial'} $ pmaint sync fusion809 +*** syncing fusion809 warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing fusion809 *** synced fusion809 * Sync succeeded $ git log --format=%ci -1 diff --git a/fuverlay.html b/fuverlay.html index f763182a629d..471dd8d37b9c 100644 --- a/fuverlay.html +++ b/fuverlay.html @@ -32,35 +32,35 @@ </pre></td></tr> <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync fuverlay </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>*** syncing fuverlay </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>invocation. + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Already up to date. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** syncing fuverlay + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced fuverlay </pre></td></tr> diff --git a/fuverlay.txt b/fuverlay.txt index 8cea4eda2d91..bcd4b8830ff6 100644 --- a/fuverlay.txt +++ b/fuverlay.txt @@ -9,6 +9,7 @@ 'source': [{'type': 'git', 'uri': 'https://github.com/funkill/fuverlay.git'}], 'status': 'unofficial'} $ pmaint sync fuverlay +*** syncing fuverlay warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -23,7 +24,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing fuverlay *** synced fuverlay * Sync succeeded $ git log --format=%ci -1 diff --git a/gamarouns.html b/gamarouns.html index f3bae2ad5091..dc87a4b7655c 100644 --- a/gamarouns.html +++ b/gamarouns.html @@ -32,35 +32,35 @@ </pre></td></tr> <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync gamarouns </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>*** syncing gamarouns </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>invocation. + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Already up to date. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** syncing gamarouns + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced gamarouns </pre></td></tr> diff --git a/gamarouns.txt b/gamarouns.txt index 1fb58de9c802..9e2c9bb28aac 100644 --- a/gamarouns.txt +++ b/gamarouns.txt @@ -9,6 +9,7 @@ 'source': [{'type': 'git', 'uri': 'https://github.com/Amaroun/gamarouns.git'}], 'status': 'unofficial'} $ pmaint sync gamarouns +*** syncing gamarouns warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -23,7 +24,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing gamarouns *** synced gamarouns * Sync succeeded $ git log --format=%ci -1 diff --git a/gambas-overlay.html b/gambas-overlay.html index b2ba0c908ffd..e56c479b515d 100644 --- a/gambas-overlay.html +++ b/gambas-overlay.html @@ -34,35 +34,35 @@ </pre></td></tr> <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync gambas-overlay </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing gambas-overlay </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing gambas-overlay + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced gambas-overlay </pre></td></tr> diff --git a/gambas-overlay.txt b/gambas-overlay.txt index 88ba325e5627..930391196749 100644 --- a/gambas-overlay.txt +++ b/gambas-overlay.txt @@ -10,6 +10,7 @@ 'uri': 'https://github.com/damex/gambas-overlay.git'}], 'status': 'unofficial'} $ pmaint sync gambas-overlay +*** syncing gambas-overlay warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -24,7 +25,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing gambas-overlay *** synced gambas-overlay * Sync succeeded $ git log --format=%ci -1 diff --git a/gamerlay.html b/gamerlay.html index 8b6b6b291dc6..63e1a7e158d1 100644 --- a/gamerlay.html +++ b/gamerlay.html @@ -48,35 +48,35 @@ </pre></td></tr> <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>$ pmaint sync gamerlay </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** syncing gamerlay </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>invocation. + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>Already up to date. + <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>*** syncing gamerlay + <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>*** synced gamerlay </pre></td></tr> diff --git a/gamerlay.txt b/gamerlay.txt index 2b68fccd6c25..ba21ce2153cd 100644 --- a/gamerlay.txt +++ b/gamerlay.txt @@ -17,6 +17,7 @@ 'uri': 'git+ssh://git@git.gentoo.org/proj/gamerlay.git'}], 'status': 'unofficial'} $ pmaint sync gamerlay +*** syncing gamerlay warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -31,7 +32,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing gamerlay *** synced gamerlay * Sync succeeded $ git log --format=%ci -1 diff --git a/gcarq.html b/gcarq.html index c9bbcc87b8fb..d4142c2ce1cc 100644 --- a/gcarq.html +++ b/gcarq.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync gcarq </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing gcarq </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing gcarq + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced gcarq </pre></td></tr> diff --git a/gcarq.txt b/gcarq.txt index d9d6310796e1..eee31b36edea 100644 --- a/gcarq.txt +++ b/gcarq.txt @@ -12,6 +12,7 @@ 'uri': 'git+ssh://git@github.com/gcarq/gcarq-overlay.git'}], 'status': 'unofficial'} $ pmaint sync gcarq +*** syncing gcarq warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing gcarq *** synced gcarq * Sync succeeded $ git log --format=%ci -1 diff --git a/genthree.html b/genthree.html index 271865eef3f1..82797ad1cc10 100644 --- a/genthree.html +++ b/genthree.html @@ -32,35 +32,35 @@ </pre></td></tr> <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync genthree </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>*** syncing genthree </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>invocation. + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Already up to date. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** syncing genthree + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced genthree </pre></td></tr> diff --git a/genthree.txt b/genthree.txt index 0523c2ae065e..37aa21c107d4 100644 --- a/genthree.txt +++ b/genthree.txt @@ -9,6 +9,7 @@ 'source': [{'type': 'git', 'uri': 'https://gitlab.com/genthree/overlay.git'}], 'status': 'unofficial'} $ pmaint sync genthree +*** syncing genthree warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -23,7 +24,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing genthree *** synced genthree * Sync succeeded $ git log --format=%ci -1 diff --git a/gentoo-bootstrap.html b/gentoo-bootstrap.html index addd4f3365f5..d8044f132674 100644 --- a/gentoo-bootstrap.html +++ b/gentoo-bootstrap.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync gentoo-bootstrap </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing gentoo-bootstrap </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing gentoo-bootstrap + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced gentoo-bootstrap </pre></td></tr> diff --git a/gentoo-bootstrap.txt b/gentoo-bootstrap.txt index d9fce349163d..48b333f4bd20 100644 --- a/gentoo-bootstrap.txt +++ b/gentoo-bootstrap.txt @@ -12,6 +12,7 @@ 'uri': 'git+ssh://git@gitlab.com:stikonas/gentoo-bootstrap.git'}], 'status': 'unofficial'} $ pmaint sync gentoo-bootstrap +*** syncing gentoo-bootstrap warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing gentoo-bootstrap *** synced gentoo-bootstrap * Sync succeeded $ git log --format=%ci -1 diff --git a/gentoo-clang.html b/gentoo-clang.html index 2c741860af25..4dea3fe20017 100644 --- a/gentoo-clang.html +++ b/gentoo-clang.html @@ -40,35 +40,35 @@ </pre></td></tr> <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync gentoo-clang </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing gentoo-clang </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing gentoo-clang + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced gentoo-clang </pre></td></tr> diff --git a/gentoo-clang.txt b/gentoo-clang.txt index b21aee9ed6f0..1c2444fdb611 100644 --- a/gentoo-clang.txt +++ b/gentoo-clang.txt @@ -13,6 +13,7 @@ {'type': 'git', 'uri': 'git@github.com:BilyakA/gentoo-clang.git'}], 'status': 'unofficial'} $ pmaint sync gentoo-clang +*** syncing gentoo-clang warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -27,7 +28,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing gentoo-clang *** synced gentoo-clang * Sync succeeded $ git log --format=%ci -1 diff --git a/gentoo-mate.html b/gentoo-mate.html index 1568c08a9abd..25b85704510e 100644 --- a/gentoo-mate.html +++ b/gentoo-mate.html @@ -42,35 +42,35 @@ </pre></td></tr> <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync gentoo-mate </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing gentoo-mate </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing gentoo-mate + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced gentoo-mate </pre></td></tr> diff --git a/gentoo-mate.txt b/gentoo-mate.txt index 75906aaf9df3..21064a76c3b3 100644 --- a/gentoo-mate.txt +++ b/gentoo-mate.txt @@ -14,6 +14,7 @@ 'uri': 'git+ssh://git@git.gentoo.org/proj/gentoo-mate.git'}], 'status': 'official'} $ pmaint sync gentoo-mate +*** syncing gentoo-mate warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -28,7 +29,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing gentoo-mate *** synced gentoo-mate * Sync succeeded $ git log --format=%ci -1 diff --git a/gentoo-zh.html b/gentoo-zh.html index d8baabd798e7..3c8ccd158fc9 100644 --- a/gentoo-zh.html +++ b/gentoo-zh.html @@ -32,35 +32,35 @@ </pre></td></tr> <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync gentoo-zh </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>*** syncing gentoo-zh </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>invocation. + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Already up to date. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** syncing gentoo-zh + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced gentoo-zh </pre></td></tr> diff --git a/gentoo-zh.txt b/gentoo-zh.txt index 6faec6393d86..a1cab9f55b09 100644 --- a/gentoo-zh.txt +++ b/gentoo-zh.txt @@ -9,6 +9,7 @@ 'source': [{'type': 'git', 'uri': 'git://github.com/microcai/gentoo-zh.git'}], 'status': 'unofficial'} $ pmaint sync gentoo-zh +*** syncing gentoo-zh warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -23,7 +24,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing gentoo-zh *** synced gentoo-zh * Sync succeeded $ git log --format=%ci -1 diff --git a/gentoo.html b/gentoo.html index adb165022dd6..bb1b46122f11 100644 --- a/gentoo.html +++ b/gentoo.html @@ -38,259 +38,103 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync gentoo </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing gentoo </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>From https://anongit.gentoo.org/git/repo/gentoo + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> 6ffdbdfcb67..2cbfd2e8af6 master -> origin/master + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>From https://anongit.gentoo.org/git/repo/gentoo </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>You are not currently on a branch. + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> 2cbfd2e8af6..87c0fe91254 master -> origin/master </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Please specify which branch you want to merge with. + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Updating 2cbfd2e8af6..87c0fe91254 </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>See git-pull(1) for details. + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Fast-forward </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> + <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> .../busted-htest/busted-htest-1.0.0-r100.ebuild | 2 +- </pre></td></tr> - <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> git pull <remote> <branch> + <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> dev-lua/busted/busted-2.0.0-r101.ebuild | 2 +- </pre></td></tr> - <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> + <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> dev-lua/lgi/files/lgi-0.9.2-lua54.patch | 29 ++++++++ </pre></td></tr> - <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>*** syncing gentoo + <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> dev-lua/lgi/lgi-0.9.2-r100.ebuild | 4 +- </pre></td></tr> - <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>!!! failed syncing gentoo + <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> dev-lua/lpeg/lpeg-1.0.2-r101.ebuild | 2 +- </pre></td></tr> - <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * Sync failed with 1 -</pre></td><td>[FATAL]</td></tr> - <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * Will try to re-create + <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> dev-lua/luacheck/Manifest | 1 + </pre></td></tr> - <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>$ pmaint sync gentoo + <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> dev-lua/luacheck/luacheck-0.24.0.ebuild | 65 +++++++++++++++++ </pre></td></tr> - <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>Cloning into '/var/lib/repo-mirror-ci/sync/gentoo'... + <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> dev-lua/luacheck/metadata.xml | 6 +- </pre></td></tr> - <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>Updating files: 14% (12408/85801) + <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> dev-lua/luadbi/luadbi-0.7.2-r102.ebuild | 2 +- </pre></td></tr> - <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>Updating files: 15% (12871/85801) + <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> dev-lua/lualdap/Manifest | 1 + </pre></td></tr> - <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>Updating files: 16% (13729/85801) + <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> ...ldap-1.2.5-r100.ebuild => lualdap-1.2.5.ebuild} | 15 +++- </pre></td></tr> - <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>Updating files: 17% (14587/85801) + <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> dev-lua/luarocks/luarocks-3.5.0.ebuild | 2 +- </pre></td></tr> - <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>Updating files: 18% (15445/85801) + <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> dev-lua/luassert/luassert-1.8.0-r101.ebuild | 2 +- </pre></td></tr> - <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>Updating files: 19% (16303/85801) + <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> dev-lua/luasystem/luasystem-0.2.1_p0-r102.ebuild | 2 +- </pre></td></tr> - <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>Updating files: 20% (17161/85801) + <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> dev-lua/luv/Manifest | 1 - </pre></td></tr> - <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>Updating files: 21% (18019/85801) + <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> dev-lua/luv/luv-1.32.0.0-r102.ebuild | 82 ---------------------- </pre></td></tr> - <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>Updating files: 22% (18877/85801) + <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> dev-lua/luv/metadata.xml | 2 +- </pre></td></tr> - <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>Updating files: 23% (19735/85801) + <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> .../mediator_lua/mediator_lua-1.1.2_p0-r101.ebuild | 2 +- </pre></td></tr> - <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>Updating files: 24% (20593/85801) + <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> dev-lua/mpack/mpack-1.0.8-r100.ebuild | 2 +- </pre></td></tr> - <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>Updating files: 25% (21451/85801) + <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> dev-lua/say/say-1.3_p1-r101.ebuild | 2 +- </pre></td></tr> - <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>Updating files: 26% (22309/85801) + <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> 20 files changed, 126 insertions(+), 100 deletions(-) </pre></td></tr> - <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>Updating files: 27% (23167/85801) + <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> create mode 100644 dev-lua/lgi/files/lgi-0.9.2-lua54.patch </pre></td></tr> - <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>Updating files: 28% (24025/85801) + <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> create mode 100644 dev-lua/luacheck/luacheck-0.24.0.ebuild </pre></td></tr> - <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>Updating files: 29% (24883/85801) + <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> rename dev-lua/lualdap/{lualdap-1.2.5-r100.ebuild => lualdap-1.2.5.ebuild} (72%) </pre></td></tr> - <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>Updating files: 30% (25741/85801) + <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> delete mode 100644 dev-lua/luv/luv-1.32.0.0-r102.ebuild </pre></td></tr> - <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>Updating files: 30% (26546/85801) + <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>*** synced gentoo </pre></td></tr> - <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre>Updating files: 31% (26599/85801) + <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * Sync succeeded </pre></td></tr> - <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre>Updating files: 32% (27457/85801) + <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre>$ git log --format=%ci -1 </pre></td></tr> - <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre>Updating files: 33% (28315/85801) + <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD </pre></td></tr> - <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre>Updating files: 34% (29173/85801) + <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 gentoo </pre></td></tr> - <tr class="" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre>Updating files: 35% (30031/85801) -</pre></td></tr> - <tr class="" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre>Updating files: 36% (30889/85801) -</pre></td></tr> - <tr class="" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre>Updating files: 37% (31747/85801) -</pre></td></tr> - <tr class="" id="l67"><td><a href="#l67"><span>67</span></a></td><td><pre>Updating files: 38% (32605/85801) -</pre></td></tr> - <tr class="" id="l68"><td><a href="#l68"><span>68</span></a></td><td><pre>Updating files: 39% (33463/85801) -</pre></td></tr> - <tr class="" id="l69"><td><a href="#l69"><span>69</span></a></td><td><pre>Updating files: 40% (34321/85801) -</pre></td></tr> - <tr class="" id="l70"><td><a href="#l70"><span>70</span></a></td><td><pre>Updating files: 41% (35179/85801) -</pre></td></tr> - <tr class="" id="l71"><td><a href="#l71"><span>71</span></a></td><td><pre>Updating files: 42% (36037/85801) -</pre></td></tr> - <tr class="" id="l72"><td><a href="#l72"><span>72</span></a></td><td><pre>Updating files: 43% (36895/85801) -</pre></td></tr> - <tr class="" id="l73"><td><a href="#l73"><span>73</span></a></td><td><pre>Updating files: 44% (37753/85801) -</pre></td></tr> - <tr class="" id="l74"><td><a href="#l74"><span>74</span></a></td><td><pre>Updating files: 45% (38611/85801) -</pre></td></tr> - <tr class="" id="l75"><td><a href="#l75"><span>75</span></a></td><td><pre>Updating files: 46% (39469/85801) -</pre></td></tr> - <tr class="" id="l76"><td><a href="#l76"><span>76</span></a></td><td><pre>Updating files: 47% (40327/85801) -</pre></td></tr> - <tr class="" id="l77"><td><a href="#l77"><span>77</span></a></td><td><pre>Updating files: 47% (40632/85801) -</pre></td></tr> - <tr class="" id="l78"><td><a href="#l78"><span>78</span></a></td><td><pre>Updating files: 48% (41185/85801) -</pre></td></tr> - <tr class="" id="l79"><td><a href="#l79"><span>79</span></a></td><td><pre>Updating files: 49% (42043/85801) -</pre></td></tr> - <tr class="" id="l80"><td><a href="#l80"><span>80</span></a></td><td><pre>Updating files: 50% (42901/85801) -</pre></td></tr> - <tr class="" id="l81"><td><a href="#l81"><span>81</span></a></td><td><pre>Updating files: 51% (43759/85801) -</pre></td></tr> - <tr class="" id="l82"><td><a href="#l82"><span>82</span></a></td><td><pre>Updating files: 52% (44617/85801) -</pre></td></tr> - <tr class="" id="l83"><td><a href="#l83"><span>83</span></a></td><td><pre>Updating files: 53% (45475/85801) -</pre></td></tr> - <tr class="" id="l84"><td><a href="#l84"><span>84</span></a></td><td><pre>Updating files: 54% (46333/85801) -</pre></td></tr> - <tr class="" id="l85"><td><a href="#l85"><span>85</span></a></td><td><pre>Updating files: 55% (47191/85801) -</pre></td></tr> - <tr class="" id="l86"><td><a href="#l86"><span>86</span></a></td><td><pre>Updating files: 56% (48049/85801) -</pre></td></tr> - <tr class="" id="l87"><td><a href="#l87"><span>87</span></a></td><td><pre>Updating files: 57% (48907/85801) -</pre></td></tr> - <tr class="" id="l88"><td><a href="#l88"><span>88</span></a></td><td><pre>Updating files: 58% (49765/85801) -</pre></td></tr> - <tr class="" id="l89"><td><a href="#l89"><span>89</span></a></td><td><pre>Updating files: 59% (50623/85801) -</pre></td></tr> - <tr class="" id="l90"><td><a href="#l90"><span>90</span></a></td><td><pre>Updating files: 60% (51481/85801) -</pre></td></tr> - <tr class="" id="l91"><td><a href="#l91"><span>91</span></a></td><td><pre>Updating files: 60% (52193/85801) -</pre></td></tr> - <tr class="" id="l92"><td><a href="#l92"><span>92</span></a></td><td><pre>Updating files: 61% (52339/85801) -</pre></td></tr> - <tr class="" id="l93"><td><a href="#l93"><span>93</span></a></td><td><pre>Updating files: 62% (53197/85801) -</pre></td></tr> - <tr class="" id="l94"><td><a href="#l94"><span>94</span></a></td><td><pre>Updating files: 63% (54055/85801) -</pre></td></tr> - <tr class="" id="l95"><td><a href="#l95"><span>95</span></a></td><td><pre>Updating files: 64% (54913/85801) -</pre></td></tr> - <tr class="" id="l96"><td><a href="#l96"><span>96</span></a></td><td><pre>Updating files: 65% (55771/85801) -</pre></td></tr> - <tr class="" id="l97"><td><a href="#l97"><span>97</span></a></td><td><pre>Updating files: 66% (56629/85801) -</pre></td></tr> - <tr class="" id="l98"><td><a href="#l98"><span>98</span></a></td><td><pre>Updating files: 67% (57487/85801) -</pre></td></tr> - <tr class="" id="l99"><td><a href="#l99"><span>99</span></a></td><td><pre>Updating files: 68% (58345/85801) -</pre></td></tr> - <tr class="" id="l100"><td><a href="#l100"><span>100</span></a></td><td><pre>Updating files: 69% (59203/85801) -</pre></td></tr> - <tr class="" id="l101"><td><a href="#l101"><span>101</span></a></td><td><pre>Updating files: 70% (60061/85801) -</pre></td></tr> - <tr class="" id="l102"><td><a href="#l102"><span>102</span></a></td><td><pre>Updating files: 71% (60919/85801) -</pre></td></tr> - <tr class="" id="l103"><td><a href="#l103"><span>103</span></a></td><td><pre>Updating files: 72% (61777/85801) -</pre></td></tr> - <tr class="" id="l104"><td><a href="#l104"><span>104</span></a></td><td><pre>Updating files: 73% (62635/85801) -</pre></td></tr> - <tr class="" id="l105"><td><a href="#l105"><span>105</span></a></td><td><pre>Updating files: 73% (62948/85801) -</pre></td></tr> - <tr class="" id="l106"><td><a href="#l106"><span>106</span></a></td><td><pre>Updating files: 74% (63493/85801) -</pre></td></tr> - <tr class="" id="l107"><td><a href="#l107"><span>107</span></a></td><td><pre>Updating files: 75% (64351/85801) -</pre></td></tr> - <tr class="" id="l108"><td><a href="#l108"><span>108</span></a></td><td><pre>Updating files: 76% (65209/85801) -</pre></td></tr> - <tr class="" id="l109"><td><a href="#l109"><span>109</span></a></td><td><pre>Updating files: 77% (66067/85801) -</pre></td></tr> - <tr class="" id="l110"><td><a href="#l110"><span>110</span></a></td><td><pre>Updating files: 78% (66925/85801) -</pre></td></tr> - <tr class="" id="l111"><td><a href="#l111"><span>111</span></a></td><td><pre>Updating files: 79% (67783/85801) -</pre></td></tr> - <tr class="" id="l112"><td><a href="#l112"><span>112</span></a></td><td><pre>Updating files: 80% (68641/85801) -</pre></td></tr> - <tr class="" id="l113"><td><a href="#l113"><span>113</span></a></td><td><pre>Updating files: 81% (69499/85801) -</pre></td></tr> - <tr class="" id="l114"><td><a href="#l114"><span>114</span></a></td><td><pre>Updating files: 82% (70357/85801) -</pre></td></tr> - <tr class="" id="l115"><td><a href="#l115"><span>115</span></a></td><td><pre>Updating files: 83% (71215/85801) -</pre></td></tr> - <tr class="" id="l116"><td><a href="#l116"><span>116</span></a></td><td><pre>Updating files: 84% (72073/85801) -</pre></td></tr> - <tr class="" id="l117"><td><a href="#l117"><span>117</span></a></td><td><pre>Updating files: 85% (72931/85801) -</pre></td></tr> - <tr class="" id="l118"><td><a href="#l118"><span>118</span></a></td><td><pre>Updating files: 86% (73789/85801) -</pre></td></tr> - <tr class="" id="l119"><td><a href="#l119"><span>119</span></a></td><td><pre>Updating files: 87% (74647/85801) -</pre></td></tr> - <tr class="" id="l120"><td><a href="#l120"><span>120</span></a></td><td><pre>Updating files: 88% (75505/85801) -</pre></td></tr> - <tr class="" id="l121"><td><a href="#l121"><span>121</span></a></td><td><pre>Updating files: 88% (76165/85801) -</pre></td></tr> - <tr class="" id="l122"><td><a href="#l122"><span>122</span></a></td><td><pre>Updating files: 89% (76363/85801) -</pre></td></tr> - <tr class="" id="l123"><td><a href="#l123"><span>123</span></a></td><td><pre>Updating files: 90% (77221/85801) -</pre></td></tr> - <tr class="" id="l124"><td><a href="#l124"><span>124</span></a></td><td><pre>Updating files: 91% (78079/85801) -</pre></td></tr> - <tr class="" id="l125"><td><a href="#l125"><span>125</span></a></td><td><pre>Updating files: 92% (78937/85801) -</pre></td></tr> - <tr class="" id="l126"><td><a href="#l126"><span>126</span></a></td><td><pre>Updating files: 93% (79795/85801) -</pre></td></tr> - <tr class="" id="l127"><td><a href="#l127"><span>127</span></a></td><td><pre>Updating files: 94% (80653/85801) -</pre></td></tr> - <tr class="" id="l128"><td><a href="#l128"><span>128</span></a></td><td><pre>Updating files: 95% (81511/85801) -</pre></td></tr> - <tr class="" id="l129"><td><a href="#l129"><span>129</span></a></td><td><pre>Updating files: 96% (82369/85801) -</pre></td></tr> - <tr class="" id="l130"><td><a href="#l130"><span>130</span></a></td><td><pre>Updating files: 97% (83227/85801) -</pre></td></tr> - <tr class="" id="l131"><td><a href="#l131"><span>131</span></a></td><td><pre>Updating files: 98% (84085/85801) -</pre></td></tr> - <tr class="" id="l132"><td><a href="#l132"><span>132</span></a></td><td><pre>Updating files: 99% (84943/85801) -</pre></td></tr> - <tr class="" id="l133"><td><a href="#l133"><span>133</span></a></td><td><pre>Updating files: 100% (85801/85801) -</pre></td></tr> - <tr class="" id="l134"><td><a href="#l134"><span>134</span></a></td><td><pre>Updating files: 100% (85801/85801), done. -</pre></td></tr> - <tr class="" id="l135"><td><a href="#l135"><span>135</span></a></td><td><pre>*** syncing gentoo -</pre></td></tr> - <tr class="" id="l136"><td><a href="#l136"><span>136</span></a></td><td><pre>*** synced gentoo -</pre></td></tr> - <tr class="" id="l137"><td><a href="#l137"><span>137</span></a></td><td><pre> * Sync succeeded after re-adding -</pre></td></tr> - <tr class="" id="l138"><td><a href="#l138"><span>138</span></a></td><td><pre>$ git log --format=%ci -1 -</pre></td></tr> - <tr class="" id="l139"><td><a href="#l139"><span>139</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD -</pre></td></tr> - <tr class="" id="l140"><td><a href="#l140"><span>140</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 gentoo -</pre></td></tr> - <tr class="" id="l141"><td><a href="#l141"><span>141</span></a></td><td><pre> * Cache regenerated successfully + <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre> * Cache regenerated successfully </pre></td></tr> </table> diff --git a/gentoo.txt b/gentoo.txt index 2c1a325d1571..0cbc6139ebe6 100644 --- a/gentoo.txt +++ b/gentoo.txt @@ -12,6 +12,7 @@ 'uri': 'git+ssh://git@git.gentoo.org/repo/gentoo.git'}], 'status': 'official'} $ pmaint sync gentoo +*** syncing gentoo warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,23 +27,36 @@ or --ff-only on the command line to override the configured default per invocation. From https://anongit.gentoo.org/git/repo/gentoo - 6ffdbdfcb67..2cbfd2e8af6 master -> origin/master -You are not currently on a branch. -Please specify which branch you want to merge with. -See git-pull(1) for details. - - git pull <remote> <branch> - -*** syncing gentoo -!!! failed syncing gentoo - * Sync failed with 1 - * Will try to re-create -$ pmaint sync gentoo -Cloning into '/var/lib/repo-mirror-ci/sync/gentoo'... -Updating files: 14% (12408/85801)
Updating files: 15% (12871/85801)
Updating files: 16% (13729/85801)
Updating files: 17% (14587/85801)
Updating files: 18% (15445/85801)
Updating files: 19% (16303/85801)
Updating files: 20% (17161/85801)
Updating files: 21% (18019/85801)
Updating files: 22% (18877/85801)
Updating files: 23% (19735/85801)
Updating files: 24% (20593/85801)
Updating files: 25% (21451/85801)
Updating files: 26% (22309/85801)
Updating files: 27% (23167/85801)
Updating files: 28% (24025/85801)
Updating files: 29% (24883/85801)
Updating files: 30% (25741/85801)
Updating files: 30% (26546/85801)
Updating files: 31% (26599/85801)
Updating files: 32% (27457/85801)
Updating files: 33% (28315/85801)
Updating files: 34% (29173/85801)
Updating files: 35% (30031/85801)
Updating files: 36% (30889/85801)
Updating files: 37% (31747/85801)
Updating files: 38% (32605/85801)
Updating files: 39% (33463/85801)
Updating files: 40% (34321/85801)
Updating files: 41% (35179/85801)
Updating files: 42% (36037/85801)
Updating files: 43% (36895/85801)
Updating files: 44% (37753/85801)
Updating files: 45% (38611/85801)
Updating files: 46% (39469/85801)
Updating files: 47% (40327/85801)
Updating files: 47% (40632/85801)
Updating files: 48% (41185/85801)
Updating files: 49% (42043/85801)
Updating files: 50% (42901/85801)
Updating files: 51% (43759/85801)
Updating files: 52% (44617/85801)
Updating files: 53% (45475/85801)
Updating files: 54% (46333/85801)
Updating files: 55% (47191/85801)
Updating files: 56% (48049/85801)
Updating files: 57% (48907/85801)
Updating files: 58% (49765/85801)
Updating files: 59% (50623/85801)
Updating files: 60% (51481/85801)
Updating files: 60% (52193/85801)
Updating files: 61% (52339/85801)
Updating files: 62% (53197/85801)
Updating files: 63% (54055/85801)
Updating files: 64% (54913/85801)
Updating files: 65% (55771/85801)
Updating files: 66% (56629/85801)
Updating files: 67% (57487/85801)
Updating files: 68% (58345/85801)
Updating files: 69% (59203/85801)
Updating files: 70% (60061/85801)
Updating files: 71% (60919/85801)
Updating files: 72% (61777/85801)
Updating files: 73% (62635/85801)
Updating files: 73% (62948/85801)
Updating files: 74% (63493/85801)
Updating files: 75% (64351/85801)
Updating files: 76% (65209/85801)
Updating files: 77% (66067/85801)
Updating files: 78% (66925/85801)
Updating files: 79% (67783/85801)
Updating files: 80% (68641/85801)
Updating files: 81% (69499/85801)
Updating files: 82% (70357/85801)
Updating files: 83% (71215/85801)
Updating files: 84% (72073/85801)
Updating files: 85% (72931/85801)
Updating files: 86% (73789/85801)
Updating files: 87% (74647/85801)
Updating files: 88% (75505/85801)
Updating files: 88% (76165/85801)
Updating files: 89% (76363/85801)
Updating files: 90% (77221/85801)
Updating files: 91% (78079/85801)
Updating files: 92% (78937/85801)
Updating files: 93% (79795/85801)
Updating files: 94% (80653/85801)
Updating files: 95% (81511/85801)
Updating files: 96% (82369/85801)
Updating files: 97% (83227/85801)
Updating files: 98% (84085/85801)
Updating files: 99% (84943/85801)
Updating files: 100% (85801/85801)
Updating files: 100% (85801/85801), done. -*** syncing gentoo + 2cbfd2e8af6..87c0fe91254 master -> origin/master +Updating 2cbfd2e8af6..87c0fe91254 +Fast-forward + .../busted-htest/busted-htest-1.0.0-r100.ebuild | 2 +- + dev-lua/busted/busted-2.0.0-r101.ebuild | 2 +- + dev-lua/lgi/files/lgi-0.9.2-lua54.patch | 29 ++++++++ + dev-lua/lgi/lgi-0.9.2-r100.ebuild | 4 +- + dev-lua/lpeg/lpeg-1.0.2-r101.ebuild | 2 +- + dev-lua/luacheck/Manifest | 1 + + dev-lua/luacheck/luacheck-0.24.0.ebuild | 65 +++++++++++++++++ + dev-lua/luacheck/metadata.xml | 6 +- + dev-lua/luadbi/luadbi-0.7.2-r102.ebuild | 2 +- + dev-lua/lualdap/Manifest | 1 + + ...ldap-1.2.5-r100.ebuild => lualdap-1.2.5.ebuild} | 15 +++- + dev-lua/luarocks/luarocks-3.5.0.ebuild | 2 +- + dev-lua/luassert/luassert-1.8.0-r101.ebuild | 2 +- + dev-lua/luasystem/luasystem-0.2.1_p0-r102.ebuild | 2 +- + dev-lua/luv/Manifest | 1 - + dev-lua/luv/luv-1.32.0.0-r102.ebuild | 82 ---------------------- + dev-lua/luv/metadata.xml | 2 +- + .../mediator_lua/mediator_lua-1.1.2_p0-r101.ebuild | 2 +- + dev-lua/mpack/mpack-1.0.8-r100.ebuild | 2 +- + dev-lua/say/say-1.3_p1-r101.ebuild | 2 +- + 20 files changed, 126 insertions(+), 100 deletions(-) + create mode 100644 dev-lua/lgi/files/lgi-0.9.2-lua54.patch + create mode 100644 dev-lua/luacheck/luacheck-0.24.0.ebuild + rename dev-lua/lualdap/{lualdap-1.2.5-r100.ebuild => lualdap-1.2.5.ebuild} (72%) + delete mode 100644 dev-lua/luv/luv-1.32.0.0-r102.ebuild *** synced gentoo - * Sync succeeded after re-adding + * Sync succeeded $ git log --format=%ci -1 $ git show -q --pretty=format:%G? HEAD $ pmaint regen --use-local-desc --pkg-desc-index -t 32 gentoo diff --git a/gentoobr.html b/gentoobr.html index fb96970d9c28..40eafac0d52b 100644 --- a/gentoobr.html +++ b/gentoobr.html @@ -54,35 +54,35 @@ </pre></td></tr> <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>$ pmaint sync gentoobr </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>*** syncing gentoobr </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>invocation. + <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> + <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>Already up to date. + <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>*** syncing gentoobr + <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>*** synced gentoobr </pre></td></tr> diff --git a/gentoobr.txt b/gentoobr.txt index e25a695827cf..c0d61476b1d2 100644 --- a/gentoobr.txt +++ b/gentoobr.txt @@ -20,6 +20,7 @@ 'uri': 'git+ssh://git@github.com/gentoobr/overlay.git'}], 'status': 'unofficial'} $ pmaint sync gentoobr +*** syncing gentoobr warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -34,7 +35,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing gentoobr *** synced gentoobr * Sync succeeded $ git log --format=%ci -1 diff --git a/gerislay.html b/gerislay.html index c81bc6741b3e..0df48a5a5aa9 100644 --- a/gerislay.html +++ b/gerislay.html @@ -44,35 +44,35 @@ </pre></td></tr> <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync gerislay </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing gerislay </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date. + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** syncing gerislay + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced gerislay </pre></td></tr> diff --git a/gerislay.txt b/gerislay.txt index 7e410d320fd5..7d048b910e70 100644 --- a/gerislay.txt +++ b/gerislay.txt @@ -15,6 +15,7 @@ 'uri': 'git+ssh://git@git.gentoo.org/repo/user/gerislay.git'}], 'status': 'unofficial'} $ pmaint sync gerislay +*** syncing gerislay warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -29,7 +30,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing gerislay *** synced gerislay * Sync succeeded $ git log --format=%ci -1 @@ -28,35 +28,35 @@ </pre></td></tr> <tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre>$ pmaint sync gig </pre></td></tr> - <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>*** syncing gig </pre></td></tr> - <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>invocation. + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>Already up to date. + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>*** syncing gig + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>*** synced gig </pre></td></tr> @@ -7,6 +7,7 @@ 'source': [{'type': 'git', 'uri': 'https://github.com/Gig-OS/gig.git'}], 'status': 'unofficial'} $ pmaint sync gig +*** syncing gig warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -21,7 +22,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing gig *** synced gig * Sync succeeded $ git log --format=%ci -1 diff --git a/gitlab.html b/gitlab.html index ab702c80a5f7..fa172696a08f 100644 --- a/gitlab.html +++ b/gitlab.html @@ -32,35 +32,35 @@ </pre></td></tr> <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync gitlab </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>*** syncing gitlab </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>invocation. + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Already up to date. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** syncing gitlab + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced gitlab </pre></td></tr> diff --git a/gitlab.txt b/gitlab.txt index 2bc01b8160dc..5ac3d8212c7b 100644 --- a/gitlab.txt +++ b/gitlab.txt @@ -9,6 +9,7 @@ 'uri': 'https://gitlab.awesome-it.de/overlays/gitlab.git'}], 'status': 'unofficial'} $ pmaint sync gitlab +*** syncing gitlab warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -23,7 +24,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing gitlab *** synced gitlab * Sync succeeded $ git log --format=%ci -1 diff --git a/glarbs-overlay.html b/glarbs-overlay.html index 5be1ddb5f539..b5ee992c1113 100644 --- a/glarbs-overlay.html +++ b/glarbs-overlay.html @@ -36,35 +36,35 @@ </pre></td></tr> <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync glarbs-overlay </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing glarbs-overlay </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** syncing glarbs-overlay + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced glarbs-overlay </pre></td></tr> diff --git a/glarbs-overlay.txt b/glarbs-overlay.txt index 369729457c82..06878ce38e36 100644 --- a/glarbs-overlay.txt +++ b/glarbs-overlay.txt @@ -11,6 +11,7 @@ 'uri': 'https://gitlab.com/et-8/glarbs-overlay.git'}], 'status': 'unofficial'} $ pmaint sync glarbs-overlay +*** syncing glarbs-overlay warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -25,7 +26,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing glarbs-overlay *** synced glarbs-overlay * Sync succeeded $ git log --format=%ci -1 diff --git a/gnome-next.html b/gnome-next.html index 8d34de6d3563..5d3a463c8f3a 100644 --- a/gnome-next.html +++ b/gnome-next.html @@ -36,35 +36,35 @@ </pre></td></tr> <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync gnome-next </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing gnome-next </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** syncing gnome-next + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced gnome-next </pre></td></tr> diff --git a/gnome-next.txt b/gnome-next.txt index f60ade2bf502..1601eb9df61f 100644 --- a/gnome-next.txt +++ b/gnome-next.txt @@ -11,6 +11,7 @@ {'type': 'git', 'uri': 'git@github.com:Heather/gentoo-gnome.git'}], 'status': 'unofficial'} $ pmaint sync gnome-next +*** syncing gnome-next warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -25,7 +26,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing gnome-next *** synced gnome-next * Sync succeeded $ git log --format=%ci -1 diff --git a/gnome.html b/gnome.html index 4a3cf58c5ede..7dabe84cb317 100644 --- a/gnome.html +++ b/gnome.html @@ -40,35 +40,35 @@ </pre></td></tr> <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync gnome </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing gnome </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing gnome + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced gnome </pre></td></tr> diff --git a/gnome.txt b/gnome.txt index 438da67050b6..15b337d46b57 100644 --- a/gnome.txt +++ b/gnome.txt @@ -13,6 +13,7 @@ 'uri': 'git+ssh://git@git.gentoo.org/proj/gnome.git'}], 'status': 'official'} $ pmaint sync gnome +*** syncing gnome warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -27,7 +28,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing gnome *** synced gnome * Sync succeeded $ git log --format=%ci -1 diff --git a/gnuradio.html b/gnuradio.html index dd0950cd8818..28a81a41a897 100644 --- a/gnuradio.html +++ b/gnuradio.html @@ -30,35 +30,35 @@ </pre></td></tr> <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>$ pmaint sync gnuradio </pre></td></tr> - <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>*** syncing gnuradio </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>invocation. + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>Already up to date. + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>*** syncing gnuradio + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** synced gnuradio </pre></td></tr> diff --git a/gnuradio.txt b/gnuradio.txt index 42e62df7ff53..bb0bc5166d77 100644 --- a/gnuradio.txt +++ b/gnuradio.txt @@ -8,6 +8,7 @@ 'uri': 'https://github.com/hololeap/gentoo-gnuradio'}], 'status': 'unofficial'} $ pmaint sync gnuradio +*** syncing gnuradio warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -22,7 +23,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing gnuradio *** synced gnuradio * Sync succeeded $ git log --format=%ci -1 diff --git a/gnustep.html b/gnustep.html index 27427fe1eab8..626c7bee076b 100644 --- a/gnustep.html +++ b/gnustep.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync gnustep </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing gnustep </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing gnustep + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced gnustep </pre></td></tr> diff --git a/gnustep.txt b/gnustep.txt index a518b7444b1e..60ac8bed6117 100644 --- a/gnustep.txt +++ b/gnustep.txt @@ -12,6 +12,7 @@ 'uri': 'git+ssh://git@git.gentoo.org/proj/gnustep.git'}], 'status': 'official'} $ pmaint sync gnustep +*** syncing gnustep warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing gnustep *** synced gnustep * Sync succeeded $ git log --format=%ci -1 diff --git a/gnux32.html b/gnux32.html index 45eb6236bc55..ec1e7aa28125 100644 --- a/gnux32.html +++ b/gnux32.html @@ -34,35 +34,35 @@ </pre></td></tr> <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync gnux32 </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing gnux32 </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing gnux32 + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced gnux32 </pre></td></tr> diff --git a/gnux32.txt b/gnux32.txt index 52d4606bf161..c96d699b51c4 100644 --- a/gnux32.txt +++ b/gnux32.txt @@ -10,6 +10,7 @@ {'type': 'git', 'uri': 'git://github.com/1camper/gnux32.git'}], 'status': 'unofficial'} $ pmaint sync gnux32 +*** syncing gnux32 warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -24,7 +25,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing gnux32 *** synced gnux32 * Sync succeeded $ git log --format=%ci -1 diff --git a/go-overlay.html b/go-overlay.html index d213b49fed33..de78cc3fcdf4 100644 --- a/go-overlay.html +++ b/go-overlay.html @@ -32,35 +32,35 @@ </pre></td></tr> <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync go-overlay </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>*** syncing go-overlay </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>invocation. + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Already up to date. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** syncing go-overlay + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced go-overlay </pre></td></tr> diff --git a/go-overlay.txt b/go-overlay.txt index 69810ccb5ef8..2024aba88938 100644 --- a/go-overlay.txt +++ b/go-overlay.txt @@ -9,6 +9,7 @@ 'uri': 'https://github.com/Dr-Terrible/go-overlay.git'}], 'status': 'unofficial'} $ pmaint sync go-overlay +*** syncing go-overlay warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -23,7 +24,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing go-overlay *** synced go-overlay * Sync succeeded $ git log --format=%ci -1 diff --git a/godin.html b/godin.html index 40e2637cb9f8..efd4dd7dbe7b 100644 --- a/godin.html +++ b/godin.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync godin </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing godin </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing godin + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced godin </pre></td></tr> diff --git a/godin.txt b/godin.txt index 6b566c11759b..e03b125baa27 100644 --- a/godin.txt +++ b/godin.txt @@ -12,6 +12,7 @@ 'uri': 'git://github.com/Godin/gentoo-overlay.git'}], 'status': 'unofficial'} $ pmaint sync godin +*** syncing godin warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing godin *** synced godin * Sync succeeded $ git log --format=%ci -1 diff --git a/goduck777.html b/goduck777.html index 8e70c699e44d..ca424b761723 100644 --- a/goduck777.html +++ b/goduck777.html @@ -42,35 +42,35 @@ </pre></td></tr> <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync goduck777 </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing goduck777 </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing goduck777 + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced goduck777 </pre></td></tr> diff --git a/goduck777.txt b/goduck777.txt index 6d3dd8ad4acf..4b07576a7b92 100644 --- a/goduck777.txt +++ b/goduck777.txt @@ -14,6 +14,7 @@ 'uri': 'git@github.com:goduck777/gentoo-overlay.git'}], 'status': 'unofficial'} $ pmaint sync goduck777 +*** syncing goduck777 warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -28,7 +29,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing goduck777 *** synced goduck777 * Sync succeeded $ git log --format=%ci -1 diff --git a/goris.html b/goris.html index 716b252ffb2f..2f153db723c1 100644 --- a/goris.html +++ b/goris.html @@ -42,35 +42,35 @@ </pre></td></tr> <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync goris </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing goris </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing goris + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced goris </pre></td></tr> diff --git a/goris.txt b/goris.txt index f8fb536ab019..766303661127 100644 --- a/goris.txt +++ b/goris.txt @@ -14,6 +14,7 @@ 'uri': 'git+ssh://git@git.gentoo.org/repo/user/goris.git'}], 'status': 'unofficial'} $ pmaint sync goris +*** syncing goris warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -28,7 +29,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing goris *** synced goris * Sync succeeded $ git log --format=%ci -1 diff --git a/graaff.html b/graaff.html index d03b8880d72e..3c27ced02892 100644 --- a/graaff.html +++ b/graaff.html @@ -44,35 +44,35 @@ </pre></td></tr> <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync graaff </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing graaff </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date. + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** syncing graaff + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced graaff </pre></td></tr> diff --git a/graaff.txt b/graaff.txt index 97d6128f60c9..df99725fbddb 100644 --- a/graaff.txt +++ b/graaff.txt @@ -15,6 +15,7 @@ 'uri': 'git+ssh://git@git.gentoo.org/dev/graaff.git'}], 'status': 'official'} $ pmaint sync graaff +*** syncing graaff warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -29,7 +30,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing graaff *** synced graaff * Sync succeeded $ git log --format=%ci -1 diff --git a/griffon_overlay.html b/griffon_overlay.html index 81d42cbcb3cd..51964b5730af 100644 --- a/griffon_overlay.html +++ b/griffon_overlay.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync griffon_overlay </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing griffon_overlay </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing griffon_overlay + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced griffon_overlay </pre></td></tr> diff --git a/griffon_overlay.txt b/griffon_overlay.txt index 5bc4773a08c2..42e5554de87b 100644 --- a/griffon_overlay.txt +++ b/griffon_overlay.txt @@ -12,6 +12,7 @@ 'uri': 'git+ssh://git@github.com/windfail/griffon_overlay.git'}], 'status': 'unofficial'} $ pmaint sync griffon_overlay +*** syncing griffon_overlay warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing griffon_overlay *** synced griffon_overlay * Sync succeeded $ git log --format=%ci -1 diff --git a/grub2-themes.html b/grub2-themes.html index e0faaf7a9aaa..cd6e1d76b02f 100644 --- a/grub2-themes.html +++ b/grub2-themes.html @@ -40,35 +40,35 @@ </pre></td></tr> <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync grub2-themes </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing grub2-themes </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing grub2-themes + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced grub2-themes </pre></td></tr> diff --git a/grub2-themes.txt b/grub2-themes.txt index 1e4cd93e97e6..e091433e3636 100644 --- a/grub2-themes.txt +++ b/grub2-themes.txt @@ -13,6 +13,7 @@ 'uri': 'git+ssh://git@git.gentoo.org/repo/proj/grub2-themes.git'}], 'status': 'official'} $ pmaint sync grub2-themes +*** syncing grub2-themes warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -27,7 +28,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing grub2-themes *** synced grub2-themes * Sync succeeded $ git log --format=%ci -1 diff --git a/gsview-overlay.html b/gsview-overlay.html index f6337f0ae60f..23552b2d4b2f 100644 --- a/gsview-overlay.html +++ b/gsview-overlay.html @@ -44,35 +44,35 @@ </pre></td></tr> <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync gsview-overlay </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing gsview-overlay </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date. + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** syncing gsview-overlay + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced gsview-overlay </pre></td></tr> diff --git a/gsview-overlay.txt b/gsview-overlay.txt index ad11b17b72c4..853838e55aa8 100644 --- a/gsview-overlay.txt +++ b/gsview-overlay.txt @@ -15,6 +15,7 @@ 'uri': 'git@github.com:uleysky/gsview-overlay.git'}], 'status': 'unofficial'} $ pmaint sync gsview-overlay +*** syncing gsview-overlay warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -29,7 +30,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing gsview-overlay *** synced gsview-overlay * Sync succeeded $ git log --format=%ci -1 diff --git a/guru.html b/guru.html index eb3ddbe37424..3a85341c2d54 100644 --- a/guru.html +++ b/guru.html @@ -36,35 +36,35 @@ </pre></td></tr> <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync guru </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing guru </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** syncing guru + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced guru </pre></td></tr> @@ -11,6 +11,7 @@ 'uri': 'git+ssh://git@git.gentoo.org/repo/proj/guru.git'}], 'status': 'official'} $ pmaint sync guru +*** syncing guru warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -25,7 +26,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing guru *** synced guru * Sync succeeded $ git log --format=%ci -1 diff --git a/haarp.html b/haarp.html index 931d2d149ffd..1c3ea4f8bd3a 100644 --- a/haarp.html +++ b/haarp.html @@ -30,35 +30,35 @@ </pre></td></tr> <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>$ pmaint sync haarp </pre></td></tr> - <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>*** syncing haarp </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>invocation. + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>Already up to date. + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>*** syncing haarp + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** synced haarp </pre></td></tr> diff --git a/haarp.txt b/haarp.txt index 93c8f0959987..16a23177a90a 100644 --- a/haarp.txt +++ b/haarp.txt @@ -8,6 +8,7 @@ 'source': [{'type': 'git', 'uri': 'git://anongit.gentoo.org/user/haarp.git'}], 'status': 'unofficial'} $ pmaint sync haarp +*** syncing haarp warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -22,7 +23,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing haarp *** synced haarp * Sync succeeded $ git log --format=%ci -1 diff --git a/hamper-overlay.html b/hamper-overlay.html index b096b1fdc544..e3ff5960fcea 100644 --- a/hamper-overlay.html +++ b/hamper-overlay.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync hamper-overlay </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing hamper-overlay </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing hamper-overlay + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced hamper-overlay </pre></td></tr> diff --git a/hamper-overlay.txt b/hamper-overlay.txt index 260a91c15be9..324eabb51270 100644 --- a/hamper-overlay.txt +++ b/hamper-overlay.txt @@ -12,6 +12,7 @@ 'uri': 'git://github.com/hamper/hamper-overlay.git'}], 'status': 'unofficial'} $ pmaint sync hamper-overlay +*** syncing hamper-overlay warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing hamper-overlay *** synced hamper-overlay * Sync succeeded $ git log --format=%ci -1 @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync han </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing han </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing han + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced han </pre></td></tr> @@ -12,6 +12,7 @@ 'uri': 'git+ssh://git@github.com/hanmertens/han-overlay.git'}], 'status': 'unofficial'} $ pmaint sync han +*** syncing han warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing han *** synced han * Sync succeeded $ git log --format=%ci -1 diff --git a/hangul-typing.html b/hangul-typing.html index 610d98e31573..99f36e5fb570 100644 --- a/hangul-typing.html +++ b/hangul-typing.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync hangul-typing </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing hangul-typing </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing hangul-typing + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced hangul-typing </pre></td></tr> diff --git a/hangul-typing.txt b/hangul-typing.txt index 1e34980e8ae8..45189bf80220 100644 --- a/hangul-typing.txt +++ b/hangul-typing.txt @@ -12,6 +12,7 @@ 'uri': 'git+ssh://git@gitlab.com/espresso.tiger/hangul-typing.git'}], 'status': 'unofficial'} $ pmaint sync hangul-typing +*** syncing hangul-typing warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing hangul-typing *** synced hangul-typing * Sync succeeded $ git log --format=%ci -1 diff --git a/haskell.html b/haskell.html index 2b459b621a34..fce95ffae946 100644 --- a/haskell.html +++ b/haskell.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync haskell </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing haskell </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing haskell + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced haskell </pre></td></tr> diff --git a/haskell.txt b/haskell.txt index 65f205357810..2a33bb4df923 100644 --- a/haskell.txt +++ b/haskell.txt @@ -12,6 +12,7 @@ 'uri': 'https://github.com/gentoo-haskell/gentoo-haskell.git'}], 'status': 'official'} $ pmaint sync haskell +*** syncing haskell warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing haskell *** synced haskell * Sync succeeded $ git log --format=%ci -1 diff --git a/heindsight.html b/heindsight.html index 01f8bee228ff..077f7eb263d7 100644 --- a/heindsight.html +++ b/heindsight.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync heindsight </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing heindsight </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing heindsight + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced heindsight </pre></td></tr> diff --git a/heindsight.txt b/heindsight.txt index 1ddc6d9faceb..967b616e319e 100644 --- a/heindsight.txt +++ b/heindsight.txt @@ -12,6 +12,7 @@ 'uri': 'git+ssh://git@github.com/heindsight/gentoo_overlay.git'}], 'status': 'unofficial'} $ pmaint sync heindsight +*** syncing heindsight warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing heindsight *** synced heindsight * Sync succeeded $ git log --format=%ci -1 diff --git a/hering-overlay.html b/hering-overlay.html index 1fb02b8a2429..c0e725832a64 100644 --- a/hering-overlay.html +++ b/hering-overlay.html @@ -34,35 +34,35 @@ </pre></td></tr> <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync hering-overlay </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing hering-overlay </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing hering-overlay + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced hering-overlay </pre></td></tr> diff --git a/hering-overlay.txt b/hering-overlay.txt index 06cd7d50a8a7..0f31fe8c1985 100644 --- a/hering-overlay.txt +++ b/hering-overlay.txt @@ -10,6 +10,7 @@ 'uri': 'https://github.com/internethering/hering-overlay.git'}], 'status': 'unofficial'} $ pmaint sync hering-overlay +*** syncing hering-overlay warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -24,7 +25,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing hering-overlay *** synced hering-overlay * Sync succeeded $ git log --format=%ci -1 diff --git a/hexedit-overlay.html b/hexedit-overlay.html index c05a130395b5..d82374c0d668 100644 --- a/hexedit-overlay.html +++ b/hexedit-overlay.html @@ -36,11 +36,11 @@ </pre></td></tr> <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync hexedit-overlay </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>Cloning into '/var/lib/repo-mirror-ci/sync/hexedit-overlay'... + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing hexedit-overlay </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>fatal: unable to access 'https://git.ifproject.ru/hexedit/gentoo-overlay.git/': The requested URL returned error: 500 + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>Cloning into '/var/lib/repo-mirror-ci/sync/hexedit-overlay'... </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing hexedit-overlay + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>fatal: unable to access 'https://git.ifproject.ru/hexedit/gentoo-overlay.git/': The requested URL returned error: 500 </pre></td></tr> <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>!!! failed syncing hexedit-overlay </pre></td></tr> diff --git a/hexedit-overlay.txt b/hexedit-overlay.txt index a029e3eac7a8..0cb16162aec3 100644 --- a/hexedit-overlay.txt +++ b/hexedit-overlay.txt @@ -11,8 +11,8 @@ 'status': 'unofficial'} * Adding new repository $ pmaint sync hexedit-overlay +*** syncing hexedit-overlay Cloning into '/var/lib/repo-mirror-ci/sync/hexedit-overlay'... fatal: unable to access 'https://git.ifproject.ru/hexedit/gentoo-overlay.git/': The requested URL returned error: 500 -*** syncing hexedit-overlay !!! failed syncing hexedit-overlay * Sync failed with 1 diff --git a/hibiscus.html b/hibiscus.html index 3bda0999bdd1..fa14167e0cd3 100644 --- a/hibiscus.html +++ b/hibiscus.html @@ -42,35 +42,35 @@ </pre></td></tr> <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync hibiscus </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing hibiscus </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing hibiscus + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced hibiscus </pre></td></tr> diff --git a/hibiscus.txt b/hibiscus.txt index 3a1e2c5ceff7..516323ebca69 100644 --- a/hibiscus.txt +++ b/hibiscus.txt @@ -14,6 +14,7 @@ 'uri': 'git+ssh://git@git.gentoo.org/user/hibiscus.git'}], 'status': 'unofficial'} $ pmaint sync hibiscus +*** syncing hibiscus warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -28,7 +29,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing hibiscus *** synced hibiscus * Sync succeeded $ git log --format=%ci -1 diff --git a/holgersson-overlay.html b/holgersson-overlay.html index 0bc5e22e2241..19e7816d7c65 100644 --- a/holgersson-overlay.html +++ b/holgersson-overlay.html @@ -32,35 +32,35 @@ </pre></td></tr> <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync holgersson-overlay </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>*** syncing holgersson-overlay </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>invocation. + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Already up to date. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** syncing holgersson-overlay + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced holgersson-overlay </pre></td></tr> diff --git a/holgersson-overlay.txt b/holgersson-overlay.txt index efac740c2059..1311b8e5a06b 100644 --- a/holgersson-overlay.txt +++ b/holgersson-overlay.txt @@ -9,6 +9,7 @@ 'uri': 'https://git.holgersson.xyz/foss/holgersson-overlay'}], 'status': 'unofficial'} $ pmaint sync holgersson-overlay +*** syncing holgersson-overlay warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -23,7 +24,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing holgersson-overlay *** synced holgersson-overlay * Sync succeeded $ git log --format=%ci -1 diff --git a/hossie.html b/hossie.html index 3b25de7f9479..34177c8a035a 100644 --- a/hossie.html +++ b/hossie.html @@ -28,35 +28,35 @@ </pre></td></tr> <tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre>$ pmaint sync hossie </pre></td></tr> - <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>*** syncing hossie </pre></td></tr> - <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>invocation. + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>Already up to date. + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>*** syncing hossie + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>*** synced hossie </pre></td></tr> diff --git a/hossie.txt b/hossie.txt index dd758e751bdf..d43cc272c26c 100644 --- a/hossie.txt +++ b/hossie.txt @@ -7,6 +7,7 @@ 'uri': 'https://git.hossie.de/scm/gen/gentoo-overlay.git'}], 'status': 'unofficial'} $ pmaint sync hossie +*** syncing hossie warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -21,7 +22,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing hossie *** synced hossie * Sync succeeded $ git log --format=%ci -1 diff --git a/hotstoast.html b/hotstoast.html index e26b2b811f5a..e7796b1d20cf 100644 --- a/hotstoast.html +++ b/hotstoast.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync hotstoast </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing hotstoast </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing hotstoast + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced hotstoast </pre></td></tr> diff --git a/hotstoast.txt b/hotstoast.txt index 97cf82476d86..3c569e186508 100644 --- a/hotstoast.txt +++ b/hotstoast.txt @@ -12,6 +12,7 @@ 'uri': 'git+ssh://git@github.com/TomHotston/hotstoast-overlay.git'}], 'status': 'unofficial'} $ pmaint sync hotstoast +*** syncing hotstoast warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing hotstoast *** synced hotstoast * Sync succeeded $ git log --format=%ci -1 diff --git a/ikelos.html b/ikelos.html index 0e68abe697e8..965baa342912 100644 --- a/ikelos.html +++ b/ikelos.html @@ -40,35 +40,35 @@ </pre></td></tr> <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync ikelos </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing ikelos </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing ikelos + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced ikelos </pre></td></tr> diff --git a/ikelos.txt b/ikelos.txt index dfc04c5a46fb..dd3a875a4bb2 100644 --- a/ikelos.txt +++ b/ikelos.txt @@ -13,6 +13,7 @@ 'uri': 'git+ssh://git@git.gentoo.org/dev/ikelos.git'}], 'status': 'unofficial'} $ pmaint sync ikelos +*** syncing ikelos warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -27,7 +28,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing ikelos *** synced ikelos * Sync succeeded $ git log --format=%ci -1 diff --git a/imaging.html b/imaging.html index ee5a7598c62f..c21b4ca9514e 100644 --- a/imaging.html +++ b/imaging.html @@ -28,35 +28,35 @@ </pre></td></tr> <tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre>$ pmaint sync imaging </pre></td></tr> - <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>*** syncing imaging </pre></td></tr> - <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>invocation. + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>Already up to date. + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>*** syncing imaging + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>*** synced imaging </pre></td></tr> diff --git a/imaging.txt b/imaging.txt index 7411c52c9441..f36e4e5b055c 100644 --- a/imaging.txt +++ b/imaging.txt @@ -7,6 +7,7 @@ 'uri': 'https://github.com/gerddie/gentoo-imaging.git'}], 'status': 'unofficial'} $ pmaint sync imaging +*** syncing imaging warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -21,7 +22,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing imaging *** synced imaging * Sync succeeded $ git log --format=%ci -1 diff --git a/index.html b/index.html index e90b01188ab4..7aa9b551ecc4 100644 --- a/index.html +++ b/index.html @@ -304,7 +304,7 @@ </td><td>8</td><td><a href="https://github.com/gcarq/gcarq-overlay">gcarq</a></td></tr> <tr class="BAD_CACHE"><td><a href="genthree.html">genthree</a></td><td>cache regen failed</td><td>2020-04-18 16:27:50 +0200 </td><td>48</td><td><a href="https://genthree.io/overlay">genthree</a></td></tr> - <tr class="GOOD"><td><a href="gentoo.html">gentoo</a></td><td>all good!</td><td>2021-03-16 17:42:26 +0100 + <tr class="GOOD"><td><a href="gentoo.html">gentoo</a></td><td>all good!</td><td>2021-03-16 18:35:06 +0100 </td><td>29454</td><td><a href="https://gentoo.org/">gentoo</a></td></tr> <tr class="GOOD"><td><a href="gentoo-bootstrap.html">gentoo-bootstrap</a></td><td>all good!</td><td>2020-11-13 21:17:12 +0000 </td><td>48</td><td><a href="https://gitlab.com/stikonas/gentoo-bootstrap">gentoo-bootstrap</a></td></tr> @@ -549,8 +549,8 @@ </td><td>761</td><td><a href="https://github.com/gentoo-perl/perl-experimental-snapshots">perl-experimental-snapshots</a></td></tr> <tr class="BAD_CACHE"><td><a href="petkovich.html">petkovich</a></td><td>cache regen failed</td><td>2021-02-13 14:57:26 -0500 </td><td>47</td><td><a href="https://github.com/jcpetkovich/overlay-petkovich">petkovich</a></td></tr> - <tr class="GOOD"><td><a href="pf4public.html">pf4public</a></td><td>all good!</td><td>2021-03-15 20:00:58 +0300 -</td><td>77</td><td><a href="https://github.com/PF4Public/gentoo-overlay">pf4public</a></td></tr> + <tr class="GOOD"><td><a href="pf4public.html">pf4public</a></td><td>all good!</td><td>2021-03-16 20:42:14 +0300 +</td><td>78</td><td><a href="https://github.com/PF4Public/gentoo-overlay">pf4public</a></td></tr> <tr class="GOOD"><td><a href="pg_overlay.html">pg_overlay</a></td><td>all good!</td><td>2021-03-14 21:42:17 +0700 </td><td>247</td><td><a href="https://gitlab.com/Perfect_Gentleman/PG_Overlay">pg_overlay</a></td></tr> <tr class="BAD_CACHE"><td><a href="phackerlay.html">phackerlay</a></td><td>cache regen failed</td><td>2021-03-13 22:13:15 +0300 @@ -855,7 +855,7 @@ </table> - <address>Generated based on results from 2021-03-16 17:26:19 UTC</address> + <address>Generated based on results from 2021-03-16 17:50:43 UTC</address> </body> </html>
\ No newline at end of file diff --git a/interactive-fiction.html b/interactive-fiction.html index 1ab8b4401d1a..ee47bc049bc7 100644 --- a/interactive-fiction.html +++ b/interactive-fiction.html @@ -30,35 +30,35 @@ </pre></td></tr> <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>$ pmaint sync interactive-fiction </pre></td></tr> - <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>*** syncing interactive-fiction </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>invocation. + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>Already up to date. + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>*** syncing interactive-fiction + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** synced interactive-fiction </pre></td></tr> diff --git a/interactive-fiction.txt b/interactive-fiction.txt index a511cdbf1720..69e3e9e66a69 100644 --- a/interactive-fiction.txt +++ b/interactive-fiction.txt @@ -8,6 +8,7 @@ 'uri': 'git://repo.or.cz/gentoo-interactive-fiction.git'}], 'status': 'unofficial'} $ pmaint sync interactive-fiction +*** syncing interactive-fiction warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -22,7 +23,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing interactive-fiction *** synced interactive-fiction * Sync succeeded $ git log --format=%ci -1 diff --git a/ixit.html b/ixit.html index b226d6abd48c..bdbfae86b13f 100644 --- a/ixit.html +++ b/ixit.html @@ -36,35 +36,35 @@ </pre></td></tr> <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync ixit </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing ixit </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** syncing ixit + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced ixit </pre></td></tr> @@ -11,6 +11,7 @@ {'type': 'git', 'uri': 'git@github.com:okias/ixit.git'}], 'status': 'unofficial'} $ pmaint sync ixit +*** syncing ixit warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -25,7 +26,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing ixit *** synced ixit * Sync succeeded $ git log --format=%ci -1 diff --git a/jacendi-overlay.html b/jacendi-overlay.html index dd068c397ea3..56a637864cd1 100644 --- a/jacendi-overlay.html +++ b/jacendi-overlay.html @@ -34,35 +34,35 @@ </pre></td></tr> <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync jacendi-overlay </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing jacendi-overlay </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing jacendi-overlay + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced jacendi-overlay </pre></td></tr> diff --git a/jacendi-overlay.txt b/jacendi-overlay.txt index f1af7ec27ecc..3ab07f0885f4 100644 --- a/jacendi-overlay.txt +++ b/jacendi-overlay.txt @@ -10,6 +10,7 @@ 'uri': 'https://bitbucket.org/jacendi/jacendi-overlay'}], 'status': 'unofficial'} $ pmaint sync jacendi-overlay +*** syncing jacendi-overlay warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -24,7 +25,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing jacendi-overlay *** synced jacendi-overlay * Sync succeeded $ git log --format=%ci -1 diff --git a/jamesbroadhead.html b/jamesbroadhead.html index 5de26546e769..57762d83f57e 100644 --- a/jamesbroadhead.html +++ b/jamesbroadhead.html @@ -44,7 +44,7 @@ </pre></td></tr> <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync jamesbroadhead </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:hexedit-overlay repo at '/var/lib/repo-mirror-ci/sync/hexedit-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing jamesbroadhead </pre></td></tr> <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> @@ -74,19 +74,17 @@ </pre></td></tr> <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date. </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** syncing jamesbroadhead + <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced jamesbroadhead </pre></td></tr> - <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>*** synced jamesbroadhead + <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Sync succeeded </pre></td></tr> - <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Sync succeeded + <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git log --format=%ci -1 </pre></td></tr> - <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git log --format=%ci -1 + <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD </pre></td></tr> - <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD + <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 jamesbroadhead </pre></td></tr> - <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 jamesbroadhead -</pre></td></tr> - <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * Cache regenerated successfully + <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * Cache regenerated successfully </pre></td></tr> </table> diff --git a/jamesbroadhead.txt b/jamesbroadhead.txt index 08ecde07da33..6e8587a890fb 100644 --- a/jamesbroadhead.txt +++ b/jamesbroadhead.txt @@ -15,7 +15,7 @@ 'uri': 'git+ssh://git@git.gentoo.org/user/jamesbroadhead.git'}], 'status': 'unofficial'} $ pmaint sync jamesbroadhead -WARNING:pkgcore:hexedit-overlay repo at '/var/lib/repo-mirror-ci/sync/hexedit-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). +*** syncing jamesbroadhead warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -30,7 +30,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing jamesbroadhead *** synced jamesbroadhead * Sync succeeded $ git log --format=%ci -1 diff --git a/java.html b/java.html index 8b888db9b61d..007dbbdf2989 100644 --- a/java.html +++ b/java.html @@ -40,7 +40,7 @@ </pre></td></tr> <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync java </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:hexedit-overlay repo at '/var/lib/repo-mirror-ci/sync/hexedit-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing java </pre></td></tr> <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> @@ -70,25 +70,23 @@ </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing java + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced java </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced java + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded + <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1 </pre></td></tr> - <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1 + <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD </pre></td></tr> - <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD + <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 java </pre></td></tr> - <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 java -</pre></td></tr> - <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * dev-python/antlr-python-3.1.3-r2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die) + <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * dev-python/antlr-python-3.1.3-r2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die) </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * games-action/minecraft-1.2.1-r5: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die) + <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * games-action/minecraft-1.2.1-r5: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die) </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * media-sound/tuxguitar-1.1-r1: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass + <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * media-sound/tuxguitar-1.1-r1: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass </pre></td><td>[FATAL]</td></tr> - <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * Cache regen failed with 1 + <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * Cache regen failed with 1 </pre></td></tr> </table> @@ -13,7 +13,7 @@ 'uri': 'git+ssh://git@git.gentoo.org/proj/java.git'}], 'status': 'official'} $ pmaint sync java -WARNING:pkgcore:hexedit-overlay repo at '/var/lib/repo-mirror-ci/sync/hexedit-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). +*** syncing java warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -28,7 +28,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing java *** synced java * Sync succeeded $ git log --format=%ci -1 diff --git a/jboro-overlay.html b/jboro-overlay.html index 7cc2f6af6d27..fc86b43c250d 100644 --- a/jboro-overlay.html +++ b/jboro-overlay.html @@ -30,7 +30,7 @@ </pre></td></tr> <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>$ pmaint sync jboro-overlay </pre></td></tr> - <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>WARNING:pkgcore:hexedit-overlay repo at '/var/lib/repo-mirror-ci/sync/hexedit-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). + <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>*** syncing jboro-overlay </pre></td></tr> <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> @@ -60,19 +60,17 @@ </pre></td></tr> <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Already up to date. </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** syncing jboro-overlay + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** synced jboro-overlay </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced jboro-overlay + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> * Sync succeeded </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * Sync succeeded + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>$ git log --format=%ci -1 </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>$ git log --format=%ci -1 + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 jboro-overlay </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 jboro-overlay -</pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Cache regenerated successfully + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Cache regenerated successfully </pre></td></tr> </table> diff --git a/jboro-overlay.txt b/jboro-overlay.txt index d165c80c1ec7..f10800a47e30 100644 --- a/jboro-overlay.txt +++ b/jboro-overlay.txt @@ -8,7 +8,7 @@ 'source': [{'type': 'git', 'uri': 'https://github.com/JBoro/portage.git'}], 'status': 'unofficial'} $ pmaint sync jboro-overlay -WARNING:pkgcore:hexedit-overlay repo at '/var/lib/repo-mirror-ci/sync/hexedit-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). +*** syncing jboro-overlay warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -23,7 +23,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing jboro-overlay *** synced jboro-overlay * Sync succeeded $ git log --format=%ci -1 diff --git a/jkolo.html b/jkolo.html index 4529a58193c5..d475a2653830 100644 --- a/jkolo.html +++ b/jkolo.html @@ -34,35 +34,35 @@ </pre></td></tr> <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:hexedit-overlay repo at '/var/lib/repo-mirror-ci/sync/hexedit-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing jkolo </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing jkolo + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced jkolo </pre></td></tr> diff --git a/jkolo.txt b/jkolo.txt index 2d0face03b04..c1c599723bc5 100644 --- a/jkolo.txt +++ b/jkolo.txt @@ -10,6 +10,7 @@ 'status': 'unofficial'} $ pmaint sync jkolo WARNING:pkgcore:hexedit-overlay repo at '/var/lib/repo-mirror-ci/sync/hexedit-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). +*** syncing jkolo warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -24,7 +25,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing jkolo *** synced jkolo * Sync succeeded $ git log --format=%ci -1 diff --git a/jm-overlay.html b/jm-overlay.html index 5008d9ebf132..ae128164cae4 100644 --- a/jm-overlay.html +++ b/jm-overlay.html @@ -34,35 +34,35 @@ </pre></td></tr> <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:hexedit-overlay repo at '/var/lib/repo-mirror-ci/sync/hexedit-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing jm-overlay </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing jm-overlay + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced jm-overlay </pre></td></tr> diff --git a/jm-overlay.txt b/jm-overlay.txt index 7edd90856590..9a84632353e9 100644 --- a/jm-overlay.txt +++ b/jm-overlay.txt @@ -10,6 +10,7 @@ 'status': 'unofficial'} $ pmaint sync jm-overlay WARNING:pkgcore:hexedit-overlay repo at '/var/lib/repo-mirror-ci/sync/hexedit-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). +*** syncing jm-overlay warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -24,7 +25,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing jm-overlay *** synced jm-overlay * Sync succeeded $ git log --format=%ci -1 diff --git a/jmbsvicetto.html b/jmbsvicetto.html index 46a3615c50ea..c68a863da3e5 100644 --- a/jmbsvicetto.html +++ b/jmbsvicetto.html @@ -44,35 +44,35 @@ </pre></td></tr> <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:hexedit-overlay repo at '/var/lib/repo-mirror-ci/sync/hexedit-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing jmbsvicetto </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date. + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** syncing jmbsvicetto + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced jmbsvicetto </pre></td></tr> diff --git a/jmbsvicetto.txt b/jmbsvicetto.txt index 2025c5d75c46..982860e8d183 100644 --- a/jmbsvicetto.txt +++ b/jmbsvicetto.txt @@ -15,6 +15,7 @@ 'status': 'official'} $ pmaint sync jmbsvicetto WARNING:pkgcore:hexedit-overlay repo at '/var/lib/repo-mirror-ci/sync/hexedit-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). +*** syncing jmbsvicetto warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -29,7 +30,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing jmbsvicetto *** synced jmbsvicetto * Sync succeeded $ git log --format=%ci -1 diff --git a/johnmh.html b/johnmh.html index d1a052d8fe6e..17a9fafcc727 100644 --- a/johnmh.html +++ b/johnmh.html @@ -42,35 +42,35 @@ </pre></td></tr> <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:hexedit-overlay repo at '/var/lib/repo-mirror-ci/sync/hexedit-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing johnmh </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing johnmh + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced johnmh </pre></td></tr> diff --git a/johnmh.txt b/johnmh.txt index de4c03dbe257..ecec0b5b0786 100644 --- a/johnmh.txt +++ b/johnmh.txt @@ -14,6 +14,7 @@ 'status': 'unofficial'} $ pmaint sync johnmh WARNING:pkgcore:hexedit-overlay repo at '/var/lib/repo-mirror-ci/sync/hexedit-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). +*** syncing johnmh warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -28,7 +29,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing johnmh *** synced johnmh * Sync succeeded $ git log --format=%ci -1 diff --git a/johu.html b/johu.html index ebc68ed8a0b0..8f57831fba36 100644 --- a/johu.html +++ b/johu.html @@ -42,35 +42,35 @@ </pre></td></tr> <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:hexedit-overlay repo at '/var/lib/repo-mirror-ci/sync/hexedit-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing johu </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing johu + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced johu </pre></td></tr> @@ -14,6 +14,7 @@ 'status': 'official'} $ pmaint sync johu WARNING:pkgcore:hexedit-overlay repo at '/var/lib/repo-mirror-ci/sync/hexedit-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). +*** syncing johu warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -28,7 +29,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing johu *** synced johu * Sync succeeded $ git log --format=%ci -1 diff --git a/jorgicio.html b/jorgicio.html index 3ff80e263a32..37b401140c47 100644 --- a/jorgicio.html +++ b/jorgicio.html @@ -44,35 +44,35 @@ </pre></td></tr> <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:hexedit-overlay repo at '/var/lib/repo-mirror-ci/sync/hexedit-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing jorgicio </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date. + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** syncing jorgicio + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced jorgicio </pre></td></tr> diff --git a/jorgicio.txt b/jorgicio.txt index ce8a3c816440..73b16232203a 100644 --- a/jorgicio.txt +++ b/jorgicio.txt @@ -15,6 +15,7 @@ 'status': 'unofficial'} $ pmaint sync jorgicio WARNING:pkgcore:hexedit-overlay repo at '/var/lib/repo-mirror-ci/sync/hexedit-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). +*** syncing jorgicio warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -29,7 +30,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing jorgicio *** synced jorgicio * Sync succeeded $ git log --format=%ci -1 diff --git a/jsteward.html b/jsteward.html index 05112b87b1d0..2dbcb7393149 100644 --- a/jsteward.html +++ b/jsteward.html @@ -40,35 +40,35 @@ </pre></td></tr> <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:hexedit-overlay repo at '/var/lib/repo-mirror-ci/sync/hexedit-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing jsteward </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing jsteward + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced jsteward </pre></td></tr> diff --git a/jsteward.txt b/jsteward.txt index 5e2c55a57c46..602d962c3ee5 100644 --- a/jsteward.txt +++ b/jsteward.txt @@ -13,6 +13,7 @@ 'status': 'unofficial'} $ pmaint sync jsteward WARNING:pkgcore:hexedit-overlay repo at '/var/lib/repo-mirror-ci/sync/hexedit-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). +*** syncing jsteward warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -27,7 +28,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing jsteward *** synced jsteward * Sync succeeded $ git log --format=%ci -1 diff --git a/junkdrawer.html b/junkdrawer.html index 11482727e8d4..970e6d7bc9c5 100644 --- a/junkdrawer.html +++ b/junkdrawer.html @@ -36,35 +36,35 @@ </pre></td></tr> <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:hexedit-overlay repo at '/var/lib/repo-mirror-ci/sync/hexedit-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing junkdrawer </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** syncing junkdrawer + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced junkdrawer </pre></td></tr> diff --git a/junkdrawer.txt b/junkdrawer.txt index 614cbe24db40..12276a7fe2cf 100644 --- a/junkdrawer.txt +++ b/junkdrawer.txt @@ -11,6 +11,7 @@ 'status': 'unofficial'} $ pmaint sync junkdrawer WARNING:pkgcore:hexedit-overlay repo at '/var/lib/repo-mirror-ci/sync/hexedit-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). +*** syncing junkdrawer warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -25,7 +26,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing junkdrawer *** synced junkdrawer * Sync succeeded $ git log --format=%ci -1 @@ -34,35 +34,35 @@ </pre></td></tr> <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:hexedit-overlay repo at '/var/lib/repo-mirror-ci/sync/hexedit-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing kaa </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing kaa + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced kaa </pre></td></tr> @@ -10,6 +10,7 @@ 'status': 'unofficial'} $ pmaint sync kaa WARNING:pkgcore:hexedit-overlay repo at '/var/lib/repo-mirror-ci/sync/hexedit-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). +*** syncing kaa warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -24,7 +25,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing kaa *** synced kaa * Sync succeeded $ git log --format=%ci -1 @@ -40,35 +40,35 @@ </pre></td></tr> <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:hexedit-overlay repo at '/var/lib/repo-mirror-ci/sync/hexedit-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing kde </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing kde + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced kde </pre></td></tr> @@ -13,6 +13,7 @@ 'status': 'official'} $ pmaint sync kde WARNING:pkgcore:hexedit-overlay repo at '/var/lib/repo-mirror-ci/sync/hexedit-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). +*** syncing kde warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -27,7 +28,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing kde *** synced kde * Sync succeeded $ git log --format=%ci -1 diff --git a/keepbot-overlay.html b/keepbot-overlay.html index e887a2eb5c13..8319f6874f68 100644 --- a/keepbot-overlay.html +++ b/keepbot-overlay.html @@ -40,35 +40,35 @@ </pre></td></tr> <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:hexedit-overlay repo at '/var/lib/repo-mirror-ci/sync/hexedit-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing keepbot-overlay </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing keepbot-overlay + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced keepbot-overlay </pre></td></tr> diff --git a/keepbot-overlay.txt b/keepbot-overlay.txt index 897da7400469..c406832e616b 100644 --- a/keepbot-overlay.txt +++ b/keepbot-overlay.txt @@ -13,6 +13,7 @@ 'status': 'unofficial'} $ pmaint sync keepbot-overlay WARNING:pkgcore:hexedit-overlay repo at '/var/lib/repo-mirror-ci/sync/hexedit-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). +*** syncing keepbot-overlay warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -27,7 +28,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing keepbot-overlay *** synced keepbot-overlay * Sync succeeded $ git log --format=%ci -1 diff --git a/khoverlay.html b/khoverlay.html index 2ec7d31eb1a4..36fd20b5f2c9 100644 --- a/khoverlay.html +++ b/khoverlay.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:hexedit-overlay repo at '/var/lib/repo-mirror-ci/sync/hexedit-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing khoverlay </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing khoverlay + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced khoverlay </pre></td></tr> diff --git a/khoverlay.txt b/khoverlay.txt index 54fec192de90..7af874fc73de 100644 --- a/khoverlay.txt +++ b/khoverlay.txt @@ -12,6 +12,7 @@ 'status': 'unofficial'} $ pmaint sync khoverlay WARNING:pkgcore:hexedit-overlay repo at '/var/lib/repo-mirror-ci/sync/hexedit-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). +*** syncing khoverlay warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing khoverlay *** synced khoverlay * Sync succeeded $ git log --format=%ci -1 diff --git a/klondike.html b/klondike.html index 0793ff209229..0c7f537879a0 100644 --- a/klondike.html +++ b/klondike.html @@ -46,35 +46,35 @@ </pre></td></tr> <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:hexedit-overlay repo at '/var/lib/repo-mirror-ci/sync/hexedit-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** syncing klondike </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>invocation. + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date. + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** syncing klondike + <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>*** synced klondike </pre></td></tr> diff --git a/klondike.txt b/klondike.txt index 9d6a456a8054..9cb20a70f95d 100644 --- a/klondike.txt +++ b/klondike.txt @@ -16,6 +16,7 @@ 'status': 'unofficial'} $ pmaint sync klondike WARNING:pkgcore:hexedit-overlay repo at '/var/lib/repo-mirror-ci/sync/hexedit-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). +*** syncing klondike warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -30,7 +31,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing klondike *** synced klondike * Sync succeeded $ git log --format=%ci -1 diff --git a/konsolebox.html b/konsolebox.html index aa5561c95dee..daa26e677c5a 100644 --- a/konsolebox.html +++ b/konsolebox.html @@ -34,7 +34,7 @@ </pre></td></tr> <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync konsolebox </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:hexedit-overlay repo at '/var/lib/repo-mirror-ci/sync/hexedit-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing konsolebox </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> @@ -64,19 +64,17 @@ </pre></td></tr> <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** syncing konsolebox + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced konsolebox </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced konsolebox + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * Sync succeeded </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Sync succeeded + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git log --format=%ci -1 </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git log --format=%ci -1 + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 konsolebox </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 konsolebox -</pre></td></tr> - <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Cache regenerated successfully + <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Cache regenerated successfully </pre></td></tr> </table> diff --git a/konsolebox.txt b/konsolebox.txt index 7472a1980be9..660ee24b4ff9 100644 --- a/konsolebox.txt +++ b/konsolebox.txt @@ -10,7 +10,7 @@ 'uri': 'https://github.com/konsolebox/overlay.git'}], 'status': 'unofficial'} $ pmaint sync konsolebox -WARNING:pkgcore:hexedit-overlay repo at '/var/lib/repo-mirror-ci/sync/hexedit-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). +*** syncing konsolebox warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -25,7 +25,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing konsolebox *** synced konsolebox * Sync succeeded $ git log --format=%ci -1 diff --git a/kripton-overlay.html b/kripton-overlay.html index 635c2b4b8c7e..ad9d252352f5 100644 --- a/kripton-overlay.html +++ b/kripton-overlay.html @@ -42,35 +42,35 @@ </pre></td></tr> <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:hexedit-overlay repo at '/var/lib/repo-mirror-ci/sync/hexedit-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing kripton-overlay </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing kripton-overlay + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced kripton-overlay </pre></td></tr> diff --git a/kripton-overlay.txt b/kripton-overlay.txt index 8dbcdbcdec68..ff79caa8a81e 100644 --- a/kripton-overlay.txt +++ b/kripton-overlay.txt @@ -14,6 +14,7 @@ 'status': 'unofficial'} $ pmaint sync kripton-overlay WARNING:pkgcore:hexedit-overlay repo at '/var/lib/repo-mirror-ci/sync/hexedit-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). +*** syncing kripton-overlay warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -28,7 +29,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing kripton-overlay *** synced kripton-overlay * Sync succeeded $ git log --format=%ci -1 diff --git a/kske.html b/kske.html index d223600f60a0..1b4c4f398eb4 100644 --- a/kske.html +++ b/kske.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:hexedit-overlay repo at '/var/lib/repo-mirror-ci/sync/hexedit-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing kske </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing kske + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced kske </pre></td></tr> @@ -12,6 +12,7 @@ 'status': 'unofficial'} $ pmaint sync kske WARNING:pkgcore:hexedit-overlay repo at '/var/lib/repo-mirror-ci/sync/hexedit-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). +*** syncing kske warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing kske *** synced kske * Sync succeeded $ git log --format=%ci -1 diff --git a/lanodanOverlay.html b/lanodanOverlay.html index e5cce8d4d404..0ba57e0e7554 100644 --- a/lanodanOverlay.html +++ b/lanodanOverlay.html @@ -44,35 +44,35 @@ </pre></td></tr> <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync lanodanOverlay </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing lanodanOverlay </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date. + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** syncing lanodanOverlay + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced lanodanOverlay </pre></td></tr> diff --git a/lanodanOverlay.txt b/lanodanOverlay.txt index d80fb83da6cb..8e8fc1168f5a 100644 --- a/lanodanOverlay.txt +++ b/lanodanOverlay.txt @@ -15,6 +15,7 @@ {'type': 'git', 'uri': 'git://gitlab.com/lanodan/overlay.git'}], 'status': 'unofficial'} $ pmaint sync lanodanOverlay +*** syncing lanodanOverlay warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -29,7 +30,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing lanodanOverlay *** synced lanodanOverlay * Sync succeeded $ git log --format=%ci -1 diff --git a/laurentb.html b/laurentb.html index 15977f40df76..8871e7aced81 100644 --- a/laurentb.html +++ b/laurentb.html @@ -38,91 +38,93 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync laurentb </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:hexedit-overlay repo at '/var/lib/repo-mirror-ci/sync/hexedit-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing laurentb </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing laurentb + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced laurentb + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced laurentb </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1 + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD + <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1 </pre></td></tr> - <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 laurentb + <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD </pre></td></tr> - <tr class="err" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * app-arch/dtrx-7.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die) + <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 laurentb +</pre></td></tr> + <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * app-arch/dtrx-7.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die) </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * app-misc/mat-0.6.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die) + <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * app-misc/mat-0.6.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die) </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * app-office/icalfilter-0.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die) + <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * app-office/icalfilter-0.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die) </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * app-text/dictator-0.9.7: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die) + <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * app-text/dictator-0.9.7: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die) </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * app-text/hyde-0.8.9: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die) + <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * app-text/hyde-0.8.9: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die) </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * dev-python/fabtools-0.20.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die) + <tr class="err" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * dev-python/fabtools-0.20.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die) </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * dev-python/gearman-2.0.2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die) + <tr class="err" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * dev-python/gearman-2.0.2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die) </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * dev-python/gfbi_core-0.5.6: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die) + <tr class="err" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * dev-python/gfbi_core-0.5.6: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die) </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * dev-python/pyfeed-0.7.4: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die) + <tr class="err" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * dev-python/pyfeed-0.7.4: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die) </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * dev-python/pythonwhois-2.4.3: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die) + <tr class="err" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * dev-python/pythonwhois-2.4.3: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die) </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * dev-python/unicode-nazi-1.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die) + <tr class="err" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> * dev-python/unicode-nazi-1.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die) </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> * dev-python/urwid_satext-0.6.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die) + <tr class="err" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> * dev-python/urwid_satext-0.6.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die) </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> * dev-python/wokkel-0.7.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die) + <tr class="err" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * dev-python/wokkel-0.7.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die) </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * dev-python/xe-0.7.4: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die) + <tr class="err" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * dev-python/xe-0.7.4: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die) </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * dev-vcs/git-goggles-0.2.12: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die) + <tr class="err" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * dev-vcs/git-goggles-0.2.12: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die) </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * dev-vcs/gitbuster-2.1.8: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die) + <tr class="err" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * dev-vcs/gitbuster-2.1.8: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die) </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * media-sound/brutha-1.1.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die) + <tr class="err" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * media-sound/brutha-1.1.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die) </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * media-sound/dnuos-1.0.11-r1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die) + <tr class="err" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * media-sound/dnuos-1.0.11-r1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die) </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * net-misc/rtorrent-notify-1.1.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die) + <tr class="err" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * net-misc/rtorrent-notify-1.1.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die) </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * net-wireless/blueproximity-1.2.5: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die) + <tr class="err" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * net-wireless/blueproximity-1.2.5: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die) </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * sys-fs/system-storage-manager-0.4: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die) + <tr class="err" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * sys-fs/system-storage-manager-0.4: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die) </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * www-apps/assnet-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die) + <tr class="err" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * www-apps/assnet-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die) </pre></td><td>[FATAL]</td></tr> - <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * Cache regen failed with 1 + <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * Cache regen failed with 1 </pre></td></tr> </table> diff --git a/laurentb.txt b/laurentb.txt index d225640b6d7c..c6209fdac01f 100644 --- a/laurentb.txt +++ b/laurentb.txt @@ -12,6 +12,8 @@ 'uri': 'https://github.com/laurentb/gentoo-overlay.git'}], 'status': 'unofficial'} $ pmaint sync laurentb +WARNING:pkgcore:hexedit-overlay repo at '/var/lib/repo-mirror-ci/sync/hexedit-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). +*** syncing laurentb warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +28,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing laurentb *** synced laurentb * Sync succeeded $ git log --format=%ci -1 diff --git a/leechcraft.html b/leechcraft.html index 244295d6384a..036644aa74ec 100644 --- a/leechcraft.html +++ b/leechcraft.html @@ -38,47 +38,49 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync leechcraft </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:hexedit-overlay repo at '/var/lib/repo-mirror-ci/sync/hexedit-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing leechcraft </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing leechcraft + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced leechcraft + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced leechcraft </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1 + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD + <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1 </pre></td></tr> - <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 leechcraft + <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD </pre></td></tr> - <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Cache regenerated successfully + <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 leechcraft +</pre></td></tr> + <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully </pre></td></tr> </table> diff --git a/leechcraft.txt b/leechcraft.txt index c621b130bd98..06aaa994c857 100644 --- a/leechcraft.txt +++ b/leechcraft.txt @@ -12,6 +12,8 @@ 'uri': 'git://github.com/0xd34df00d/leechcraft-overlay.git'}], 'status': 'unofficial'} $ pmaint sync leechcraft +WARNING:pkgcore:hexedit-overlay repo at '/var/lib/repo-mirror-ci/sync/hexedit-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). +*** syncing leechcraft warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +28,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing leechcraft *** synced leechcraft * Sync succeeded $ git log --format=%ci -1 diff --git a/leio.html b/leio.html index 9a5a12378634..683ca952825f 100644 --- a/leio.html +++ b/leio.html @@ -40,49 +40,51 @@ </pre></td></tr> <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync leio </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:hexedit-overlay repo at '/var/lib/repo-mirror-ci/sync/hexedit-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing leio </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing leio + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced leio + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date. </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced leio </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1 + <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded </pre></td></tr> - <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD + <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1 </pre></td></tr> - <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 leio + <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD </pre></td></tr> - <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * media-tv/kodi-16.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die) + <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 leio +</pre></td></tr> + <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * media-tv/kodi-16.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die) </pre></td><td>[FATAL]</td></tr> - <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regen failed with 1 + <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * Cache regen failed with 1 </pre></td></tr> </table> @@ -13,6 +13,8 @@ 'uri': 'git+ssh://git@git.gentoo.org/dev/leio.git'}], 'status': 'official'} $ pmaint sync leio +WARNING:pkgcore:hexedit-overlay repo at '/var/lib/repo-mirror-ci/sync/hexedit-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). +*** syncing leio warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -27,7 +29,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing leio *** synced leio * Sync succeeded $ git log --format=%ci -1 diff --git a/levenkov.html b/levenkov.html index 30d7f01ee323..975e94c127e3 100644 --- a/levenkov.html +++ b/levenkov.html @@ -40,35 +40,35 @@ </pre></td></tr> <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync levenkov </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing levenkov </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing levenkov + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced levenkov </pre></td></tr> diff --git a/levenkov.txt b/levenkov.txt index 375cbbf2bf49..84d6161040e5 100644 --- a/levenkov.txt +++ b/levenkov.txt @@ -13,6 +13,7 @@ 'uri': 'git+ssh://git@git.gentoo.org/user/levenkov.git'}], 'status': 'unofficial'} $ pmaint sync levenkov +*** syncing levenkov warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -27,7 +28,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing levenkov *** synced levenkov * Sync succeeded $ git log --format=%ci -1 diff --git a/librepilot.html b/librepilot.html index 2b96e57ee79c..4649acfd4ce0 100644 --- a/librepilot.html +++ b/librepilot.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync librepilot </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing librepilot </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing librepilot + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced librepilot </pre></td></tr> diff --git a/librepilot.txt b/librepilot.txt index 0e40873b2449..5eed93f770e0 100644 --- a/librepilot.txt +++ b/librepilot.txt @@ -12,6 +12,7 @@ 'uri': 'git+ssh://git@github.com/paul-jewell/librepilot-overlay.git'}], 'status': 'unofficial'} $ pmaint sync librepilot +*** syncing librepilot warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing librepilot *** synced librepilot * Sync succeeded $ git log --format=%ci -1 diff --git a/libressl.html b/libressl.html index 3f186dd49c29..df1f99068899 100644 --- a/libressl.html +++ b/libressl.html @@ -34,35 +34,35 @@ </pre></td></tr> <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync libressl </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing libressl </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing libressl + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced libressl </pre></td></tr> diff --git a/libressl.txt b/libressl.txt index 2b87ba9a72c8..7ffea513bec3 100644 --- a/libressl.txt +++ b/libressl.txt @@ -10,6 +10,7 @@ 'uri': 'git+ssh://git@git.gentoo.org/repo/proj/libressl.git'}], 'status': 'official'} $ pmaint sync libressl +*** syncing libressl warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -24,7 +25,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing libressl *** synced libressl * Sync succeeded $ git log --format=%ci -1 diff --git a/liftm.html b/liftm.html index fbcb861ed3e9..6c4e95558ca7 100644 --- a/liftm.html +++ b/liftm.html @@ -36,35 +36,35 @@ </pre></td></tr> <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync liftm </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing liftm </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** syncing liftm + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced liftm </pre></td></tr> diff --git a/liftm.txt b/liftm.txt index a63c9f26429a..15fd0faabc9a 100644 --- a/liftm.txt +++ b/liftm.txt @@ -11,6 +11,7 @@ 'uri': 'git+ssh://git@github.com/jcaesar/liftm-overlay.git'}], 'status': 'unofficial'} $ pmaint sync liftm +*** syncing liftm warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -25,7 +26,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing liftm *** synced liftm * Sync succeeded $ git log --format=%ci -1 diff --git a/linux-be.html b/linux-be.html index 7e6606a150f9..a1e21b412cb8 100644 --- a/linux-be.html +++ b/linux-be.html @@ -42,35 +42,35 @@ </pre></td></tr> <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync linux-be </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing linux-be </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing linux-be + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced linux-be </pre></td></tr> diff --git a/linux-be.txt b/linux-be.txt index 5e78aefe01cb..1f9930c43237 100644 --- a/linux-be.txt +++ b/linux-be.txt @@ -14,6 +14,7 @@ 'uri': 'git+ssh://git@gitlab.com/linux-be/overlay.git'}], 'status': 'unofficial'} $ pmaint sync linux-be +*** syncing linux-be warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -28,7 +29,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing linux-be *** synced linux-be * Sync succeeded $ git log --format=%ci -1 diff --git a/linuxunderground-overlay.html b/linuxunderground-overlay.html index a3c8fd7ff4b1..4a8d34c02664 100644 --- a/linuxunderground-overlay.html +++ b/linuxunderground-overlay.html @@ -36,35 +36,35 @@ </pre></td></tr> <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync linuxunderground-overlay </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing linuxunderground-overlay </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** syncing linuxunderground-overlay + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced linuxunderground-overlay </pre></td></tr> diff --git a/linuxunderground-overlay.txt b/linuxunderground-overlay.txt index d1723ad8c518..6972485168c0 100644 --- a/linuxunderground-overlay.txt +++ b/linuxunderground-overlay.txt @@ -11,6 +11,7 @@ 'uri': 'https://github.com/linuxunderground/gentoo.overlay.git'}], 'status': 'unofficial'} $ pmaint sync linuxunderground-overlay +*** syncing linuxunderground-overlay warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -25,7 +26,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing linuxunderground-overlay *** synced linuxunderground-overlay * Sync succeeded $ git log --format=%ci -1 diff --git a/linxon.html b/linxon.html index 9e2575ce919e..995cdd062103 100644 --- a/linxon.html +++ b/linxon.html @@ -30,35 +30,35 @@ </pre></td></tr> <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>$ pmaint sync linxon </pre></td></tr> - <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>*** syncing linxon </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>invocation. + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>Already up to date. + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>*** syncing linxon + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** synced linxon </pre></td></tr> diff --git a/linxon.txt b/linxon.txt index 08a758545df3..d561b27bba3c 100644 --- a/linxon.txt +++ b/linxon.txt @@ -8,6 +8,7 @@ 'uri': 'https://github.com/linxon/gentoo-overlay.git'}], 'status': 'unofficial'} $ pmaint sync linxon +*** syncing linxon warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -22,7 +23,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing linxon *** synced linxon * Sync succeeded $ git log --format=%ci -1 diff --git a/lisp.html b/lisp.html index 35cb39d028c4..14aa26b35f01 100644 --- a/lisp.html +++ b/lisp.html @@ -42,35 +42,35 @@ </pre></td></tr> <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync lisp </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing lisp </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing lisp + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced lisp </pre></td></tr> @@ -14,6 +14,7 @@ 'uri': 'git+ssh://git@git.gentoo.org/proj/lisp.git'}], 'status': 'official'} $ pmaint sync lisp +*** syncing lisp warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -28,7 +29,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing lisp *** synced lisp * Sync succeeded $ git log --format=%ci -1 diff --git a/lmiphay.html b/lmiphay.html index db4a012dc23b..95a354014f14 100644 --- a/lmiphay.html +++ b/lmiphay.html @@ -32,63 +32,47 @@ </pre></td></tr> <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync lmiphay </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>*** syncing lmiphay </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>invocation. + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>From git://anongit.gentoo.org/user/lmiphay + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> 3d76a73..ab104f5 master -> origin/master + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Updating 3d76a73..ab104f5 + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced lmiphay </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Fast-forward + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * Sync succeeded </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> games-simulation/firestorm-bin/Manifest | 4 +- + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>$ git log --format=%ci -1 </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> .../firestorm-bin/firestorm-bin-6.3.9-r2.ebuild | 91 ---------------------- + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> .../firestorm-bin/firestorm-bin-6.4.13.ebuild | 3 +- + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 lmiphay </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> 3 files changed, 3 insertions(+), 95 deletions(-) -</pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> delete mode 100644 games-simulation/firestorm-bin/firestorm-bin-6.3.9-r2.ebuild -</pre></td></tr> - <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>*** syncing lmiphay -</pre></td></tr> - <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>*** synced lmiphay -</pre></td></tr> - <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Sync succeeded -</pre></td></tr> - <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ git log --format=%ci -1 -</pre></td></tr> - <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD -</pre></td></tr> - <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 lmiphay -</pre></td></tr> - <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * Cache regenerated successfully + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Cache regenerated successfully </pre></td></tr> </table> diff --git a/lmiphay.txt b/lmiphay.txt index 7c95ca6d395d..08ecfe9224fa 100644 --- a/lmiphay.txt +++ b/lmiphay.txt @@ -9,6 +9,7 @@ 'uri': 'git://anongit.gentoo.org/user/lmiphay.git'}], 'status': 'unofficial'} $ pmaint sync lmiphay +*** syncing lmiphay warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -22,16 +23,7 @@ preference for all repositories. You can also pass --rebase, --no-rebase, or --ff-only on the command line to override the configured default per invocation. -From git://anongit.gentoo.org/user/lmiphay - 3d76a73..ab104f5 master -> origin/master -Updating 3d76a73..ab104f5 -Fast-forward - games-simulation/firestorm-bin/Manifest | 4 +- - .../firestorm-bin/firestorm-bin-6.3.9-r2.ebuild | 91 ---------------------- - .../firestorm-bin/firestorm-bin-6.4.13.ebuild | 3 +- - 3 files changed, 3 insertions(+), 95 deletions(-) - delete mode 100644 games-simulation/firestorm-bin/firestorm-bin-6.3.9-r2.ebuild -*** syncing lmiphay +Already up to date. *** synced lmiphay * Sync succeeded $ git log --format=%ci -1 diff --git a/lto-overlay.html b/lto-overlay.html index 50bc8fbb4776..7e31a20a9156 100644 --- a/lto-overlay.html +++ b/lto-overlay.html @@ -40,35 +40,35 @@ </pre></td></tr> <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync lto-overlay </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing lto-overlay </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing lto-overlay + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced lto-overlay </pre></td></tr> diff --git a/lto-overlay.txt b/lto-overlay.txt index ada8a4ea71de..790b675a9ebe 100644 --- a/lto-overlay.txt +++ b/lto-overlay.txt @@ -13,6 +13,7 @@ 'uri': 'git+ssh://git@github.com:InBetweenNames/gentooLTO.git'}], 'status': 'unofficial'} $ pmaint sync lto-overlay +*** syncing lto-overlay warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -27,7 +28,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing lto-overlay *** synced lto-overlay * Sync succeeded $ git log --format=%ci -1 diff --git a/luke-jr.html b/luke-jr.html index ab791da335e9..31e278cdedd5 100644 --- a/luke-jr.html +++ b/luke-jr.html @@ -28,35 +28,35 @@ </pre></td></tr> <tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre>$ pmaint sync luke-jr </pre></td></tr> - <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>*** syncing luke-jr </pre></td></tr> - <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>invocation. + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>Already up to date. + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>*** syncing luke-jr + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>*** synced luke-jr </pre></td></tr> diff --git a/luke-jr.txt b/luke-jr.txt index 4072f21fcaff..3fedf3e2cd8d 100644 --- a/luke-jr.txt +++ b/luke-jr.txt @@ -7,6 +7,7 @@ 'uri': 'https://scm.dashjr.org/scmroot/git/portage-overlays/luke-jr'}], 'status': 'unofficial'} $ pmaint sync luke-jr +*** syncing luke-jr warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -21,7 +22,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing luke-jr *** synced luke-jr * Sync succeeded $ git log --format=%ci -1 diff --git a/luxifer.html b/luxifer.html index 85fedf485de6..3e2d93536e45 100644 --- a/luxifer.html +++ b/luxifer.html @@ -32,35 +32,35 @@ </pre></td></tr> <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync luxifer </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>*** syncing luxifer </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>invocation. + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Already up to date. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** syncing luxifer + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced luxifer </pre></td></tr> diff --git a/luxifer.txt b/luxifer.txt index 1a5588a0c823..240d523c4847 100644 --- a/luxifer.txt +++ b/luxifer.txt @@ -9,6 +9,7 @@ 'source': [{'type': 'git', 'uri': 'https://github.com/luxifr/olgentoo.git'}], 'status': 'unofficial'} $ pmaint sync luxifer +*** syncing luxifer warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -23,7 +24,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing luxifer *** synced luxifer * Sync succeeded $ git log --format=%ci -1 diff --git a/lxde-gtk3.html b/lxde-gtk3.html index e3e33b124d89..7f4f5fae4acd 100644 --- a/lxde-gtk3.html +++ b/lxde-gtk3.html @@ -42,35 +42,35 @@ </pre></td></tr> <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync lxde-gtk3 </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing lxde-gtk3 </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing lxde-gtk3 + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced lxde-gtk3 </pre></td></tr> diff --git a/lxde-gtk3.txt b/lxde-gtk3.txt index 7e9916358db3..cfb8a0244843 100644 --- a/lxde-gtk3.txt +++ b/lxde-gtk3.txt @@ -14,6 +14,7 @@ 'uri': 'git@github.com:rilian-la-te/lxde-gtk3-overlay.git'}], 'status': 'unofficial'} $ pmaint sync lxde-gtk3 +*** syncing lxde-gtk3 warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -28,7 +29,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing lxde-gtk3 *** synced lxde-gtk3 * Sync succeeded $ git log --format=%ci -1 diff --git a/maekke.html b/maekke.html index 96f4ba26e3f1..969cb3b5a18b 100644 --- a/maekke.html +++ b/maekke.html @@ -40,35 +40,35 @@ </pre></td></tr> <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync maekke </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing maekke </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing maekke + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced maekke </pre></td></tr> diff --git a/maekke.txt b/maekke.txt index 229a3d80c6c9..a19ea4fa7edc 100644 --- a/maekke.txt +++ b/maekke.txt @@ -13,6 +13,7 @@ 'uri': 'git+ssh://git@git.gentoo.org/dev/maekke.git'}], 'status': 'official'} $ pmaint sync maekke +*** syncing maekke warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -27,7 +28,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing maekke *** synced maekke * Sync succeeded $ git log --format=%ci -1 diff --git a/mate-de-gentoo.html b/mate-de-gentoo.html index f0ec3596087a..b8ee24721692 100644 --- a/mate-de-gentoo.html +++ b/mate-de-gentoo.html @@ -32,35 +32,35 @@ </pre></td></tr> <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync mate-de-gentoo </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>*** syncing mate-de-gentoo </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>invocation. + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Already up to date. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** syncing mate-de-gentoo + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced mate-de-gentoo </pre></td></tr> diff --git a/mate-de-gentoo.txt b/mate-de-gentoo.txt index 4726303a8d14..92b2576dc323 100644 --- a/mate-de-gentoo.txt +++ b/mate-de-gentoo.txt @@ -9,6 +9,7 @@ 'uri': 'https://github.com/oz123/mate-de-gentoo.git'}], 'status': 'unofficial'} $ pmaint sync mate-de-gentoo +*** syncing mate-de-gentoo warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -23,7 +24,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing mate-de-gentoo *** synced mate-de-gentoo * Sync succeeded $ git log --format=%ci -1 diff --git a/matrix.html b/matrix.html index 573296770afa..3fe76c4e60ae 100644 --- a/matrix.html +++ b/matrix.html @@ -44,35 +44,35 @@ </pre></td></tr> <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync matrix </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing matrix </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date. + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** syncing matrix + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced matrix </pre></td></tr> diff --git a/matrix.txt b/matrix.txt index 3778c34ffdaf..22d6743714e8 100644 --- a/matrix.txt +++ b/matrix.txt @@ -15,6 +15,7 @@ 'uri': 'git+ssh://git@git.gentoo.org/repo/proj/matrix.git'}], 'status': 'official'} $ pmaint sync matrix +*** syncing matrix warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -29,7 +30,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing matrix *** synced matrix * Sync succeeded $ git log --format=%ci -1 diff --git a/megacoffee.html b/megacoffee.html index c0509ce3dbf7..8eb482cae987 100644 --- a/megacoffee.html +++ b/megacoffee.html @@ -56,35 +56,35 @@ </pre></td></tr> <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>$ pmaint sync megacoffee </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>*** syncing megacoffee </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>invocation. + <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> + <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>Already up to date. + <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>*** syncing megacoffee + <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>*** synced megacoffee </pre></td></tr> diff --git a/megacoffee.txt b/megacoffee.txt index cf16d2000838..4c36617db070 100644 --- a/megacoffee.txt +++ b/megacoffee.txt @@ -21,6 +21,7 @@ 'uri': 'https://gitlab.megacoffee.net/gentoo-overlay/megacoffee-overlay.git'}], 'status': 'unofficial'} $ pmaint sync megacoffee +*** syncing megacoffee warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -35,7 +36,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing megacoffee *** synced megacoffee * Sync succeeded $ git log --format=%ci -1 diff --git a/menelkir.html b/menelkir.html index b1f1b36e325b..f5ce8e79b256 100644 --- a/menelkir.html +++ b/menelkir.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync menelkir </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing menelkir </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing menelkir + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced menelkir </pre></td></tr> diff --git a/menelkir.txt b/menelkir.txt index 078919b54bce..20fbd7190591 100644 --- a/menelkir.txt +++ b/menelkir.txt @@ -12,6 +12,7 @@ 'uri': 'git+ssh://git@gitlab.com/menelkir/gentoo-overlay.git'}], 'status': 'unofficial'} $ pmaint sync menelkir +*** syncing menelkir warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing menelkir *** synced menelkir * Sync succeeded $ git log --format=%ci -1 diff --git a/metahax.html b/metahax.html index b61ea04edda7..ae434c58ae96 100644 --- a/metahax.html +++ b/metahax.html @@ -34,35 +34,35 @@ </pre></td></tr> <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync metahax </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing metahax </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing metahax + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced metahax </pre></td></tr> diff --git a/metahax.txt b/metahax.txt index 8d3feb5cce7f..33db1cca6fac 100644 --- a/metahax.txt +++ b/metahax.txt @@ -10,6 +10,7 @@ 'uri': 'https://github.com/metafarion/metahax.git'}], 'status': 'unofficial'} $ pmaint sync metahax +*** syncing metahax warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -24,7 +25,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing metahax *** synced metahax * Sync succeeded $ git log --format=%ci -1 diff --git a/milos-rs.html b/milos-rs.html index 1cc10f666d01..406763eb82e5 100644 --- a/milos-rs.html +++ b/milos-rs.html @@ -34,35 +34,35 @@ </pre></td></tr> <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync milos-rs </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing milos-rs </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing milos-rs + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced milos-rs </pre></td></tr> diff --git a/milos-rs.txt b/milos-rs.txt index e46248f6262f..9ad9830599ba 100644 --- a/milos-rs.txt +++ b/milos-rs.txt @@ -10,6 +10,7 @@ 'uri': 'https://github.com/milos-rs/gentoo-overlay.git'}], 'status': 'unofficial'} $ pmaint sync milos-rs +*** syncing milos-rs warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -24,7 +25,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing milos-rs *** synced milos-rs * Sync succeeded $ git log --format=%ci -1 diff --git a/miramir.html b/miramir.html index 29b4adb13b0f..e006babf0405 100644 --- a/miramir.html +++ b/miramir.html @@ -30,35 +30,35 @@ </pre></td></tr> <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>$ pmaint sync miramir </pre></td></tr> - <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>*** syncing miramir </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>invocation. + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>Already up to date. + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>*** syncing miramir + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** synced miramir </pre></td></tr> diff --git a/miramir.txt b/miramir.txt index 01f23a106393..37b1f9953b44 100644 --- a/miramir.txt +++ b/miramir.txt @@ -8,6 +8,7 @@ 'uri': 'https://github.com/miramir/miramir-layman.git'}], 'status': 'unofficial'} $ pmaint sync miramir +*** syncing miramir warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -22,7 +23,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing miramir *** synced miramir * Sync succeeded $ git log --format=%ci -1 diff --git a/mklich.html b/mklich.html index 18e8731bdd27..f4dd2a5bd2c1 100644 --- a/mklich.html +++ b/mklich.html @@ -40,35 +40,35 @@ </pre></td></tr> <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync mklich </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing mklich </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing mklich + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced mklich </pre></td></tr> diff --git a/mklich.txt b/mklich.txt index edf81aa86922..76d9fbb33811 100644 --- a/mklich.txt +++ b/mklich.txt @@ -13,6 +13,7 @@ 'uri': 'git+ssh://git@git.gentoo.org/user/mklich.git'}], 'status': 'unofficial'} $ pmaint sync mklich +*** syncing mklich warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -27,7 +28,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing mklich *** synced mklich * Sync succeeded $ git log --format=%ci -1 diff --git a/mkr-overlay.html b/mkr-overlay.html index f78692c0e11e..311e0738fbaa 100644 --- a/mkr-overlay.html +++ b/mkr-overlay.html @@ -34,35 +34,35 @@ </pre></td></tr> <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync mkr-overlay </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing mkr-overlay </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing mkr-overlay + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced mkr-overlay </pre></td></tr> diff --git a/mkr-overlay.txt b/mkr-overlay.txt index 79f85fd314f2..3ea58c82c516 100644 --- a/mkr-overlay.txt +++ b/mkr-overlay.txt @@ -10,6 +10,7 @@ {'type': 'git', 'uri': 'git@github.com:MalakymR/mkr-overlay.git'}], 'status': 'unofficial'} $ pmaint sync mkr-overlay +*** syncing mkr-overlay warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -24,7 +25,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing mkr-overlay *** synced mkr-overlay * Sync succeeded $ git log --format=%ci -1 diff --git a/moaxcp.html b/moaxcp.html index 60b969f5c9a3..61ed414d9bd3 100644 --- a/moaxcp.html +++ b/moaxcp.html @@ -32,35 +32,35 @@ </pre></td></tr> <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync moaxcp </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>*** syncing moaxcp </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>invocation. + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Already up to date. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** syncing moaxcp + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced moaxcp </pre></td></tr> diff --git a/moaxcp.txt b/moaxcp.txt index d56fa98349cd..cbd8815fbadf 100644 --- a/moaxcp.txt +++ b/moaxcp.txt @@ -9,6 +9,7 @@ 'uri': 'https://github.com/moaxcp/moaxcp-gentoo-overlay.git'}], 'status': 'unofficial'} $ pmaint sync moaxcp +*** syncing moaxcp warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -23,7 +24,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing moaxcp *** synced moaxcp * Sync succeeded $ git log --format=%ci -1 diff --git a/moexiami.html b/moexiami.html index f73f82b21899..e9c023ff19d6 100644 --- a/moexiami.html +++ b/moexiami.html @@ -40,35 +40,35 @@ </pre></td></tr> <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync moexiami </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing moexiami </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing moexiami + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced moexiami </pre></td></tr> diff --git a/moexiami.txt b/moexiami.txt index cd970c3a8e92..5a956ede2669 100644 --- a/moexiami.txt +++ b/moexiami.txt @@ -13,6 +13,7 @@ 'uri': 'git+ssh://git@github.com/Xiami2012/moexiami-ovl-sync.git'}], 'status': 'unofficial'} $ pmaint sync moexiami +*** syncing moexiami warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -27,7 +28,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing moexiami *** synced moexiami * Sync succeeded $ git log --format=%ci -1 diff --git a/moltonel.html b/moltonel.html index 08abf57ce419..191adf5ddf7f 100644 --- a/moltonel.html +++ b/moltonel.html @@ -32,35 +32,35 @@ </pre></td></tr> <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync moltonel </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>*** syncing moltonel </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>invocation. + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Already up to date. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** syncing moltonel + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced moltonel </pre></td></tr> diff --git a/moltonel.txt b/moltonel.txt index f01249a02c57..8c06b792f483 100644 --- a/moltonel.txt +++ b/moltonel.txt @@ -9,6 +9,7 @@ 'uri': 'git://github.com/vincentdephily/moltonel-ebuilds.git'}], 'status': 'unofficial'} $ pmaint sync moltonel +*** syncing moltonel warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -23,7 +24,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing moltonel *** synced moltonel * Sync succeeded $ git log --format=%ci -1 diff --git a/monero.html b/monero.html index 63138ed18ead..98f83663a773 100644 --- a/monero.html +++ b/monero.html @@ -40,35 +40,35 @@ </pre></td></tr> <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync monero </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing monero </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing monero + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced monero </pre></td></tr> diff --git a/monero.txt b/monero.txt index cc6195e4f517..b9429964d453 100644 --- a/monero.txt +++ b/monero.txt @@ -13,6 +13,7 @@ 'uri': 'git+ssh://git@github.com/gentoo-monero/gentoo-monero.git'}], 'status': 'unofficial'} $ pmaint sync monero +*** syncing monero warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -27,7 +28,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing monero *** synced monero * Sync succeeded $ git log --format=%ci -1 diff --git a/mozilla.html b/mozilla.html index edb7031801ff..5900ff87e46a 100644 --- a/mozilla.html +++ b/mozilla.html @@ -36,35 +36,35 @@ </pre></td></tr> <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync mozilla </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing mozilla </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** syncing mozilla + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced mozilla </pre></td></tr> diff --git a/mozilla.txt b/mozilla.txt index 125e2685cc7c..564fdc84d8bc 100644 --- a/mozilla.txt +++ b/mozilla.txt @@ -11,6 +11,7 @@ 'uri': 'git+ssh://git@git.gentoo.org/proj/mozilla.git'}], 'status': 'official'} $ pmaint sync mozilla +*** syncing mozilla warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -25,7 +26,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing mozilla *** synced mozilla * Sync succeeded $ git log --format=%ci -1 diff --git a/mrhappyhof-gentoo.html b/mrhappyhof-gentoo.html index 43b907afe7f3..3f29565b77c9 100644 --- a/mrhappyhof-gentoo.html +++ b/mrhappyhof-gentoo.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync mrhappyhof-gentoo </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing mrhappyhof-gentoo </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing mrhappyhof-gentoo + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced mrhappyhof-gentoo </pre></td></tr> diff --git a/mrhappyhof-gentoo.txt b/mrhappyhof-gentoo.txt index bdbfa4b4798f..d356d849dde9 100644 --- a/mrhappyhof-gentoo.txt +++ b/mrhappyhof-gentoo.txt @@ -12,6 +12,7 @@ 'uri': 'git+ssh://git@github.com/mrhappyhof/mrhappyhof-gentoo.git'}], 'status': 'unofficial'} $ pmaint sync mrhappyhof-gentoo +*** syncing mrhappyhof-gentoo warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing mrhappyhof-gentoo *** synced mrhappyhof-gentoo * Sync succeeded $ git log --format=%ci -1 diff --git a/mschiff.html b/mschiff.html index 6c1b32f807d0..a9671690b723 100644 --- a/mschiff.html +++ b/mschiff.html @@ -40,35 +40,35 @@ </pre></td></tr> <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync mschiff </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing mschiff </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing mschiff + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced mschiff </pre></td></tr> diff --git a/mschiff.txt b/mschiff.txt index 07dfdd92dabf..19c30e99b00f 100644 --- a/mschiff.txt +++ b/mschiff.txt @@ -13,6 +13,7 @@ 'uri': 'git+ssh://git@git.gentoo.org/dev/mschiff.git'}], 'status': 'official'} $ pmaint sync mschiff +*** syncing mschiff warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -27,7 +28,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing mschiff *** synced mschiff * Sync succeeded $ git log --format=%ci -1 diff --git a/multilib-portage.html b/multilib-portage.html index d2370f353d45..d0ad568a91c3 100644 --- a/multilib-portage.html +++ b/multilib-portage.html @@ -32,35 +32,35 @@ </pre></td></tr> <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync multilib-portage </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>*** syncing multilib-portage </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>invocation. + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Already up to date. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** syncing multilib-portage + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced multilib-portage </pre></td></tr> diff --git a/multilib-portage.txt b/multilib-portage.txt index 60e5adac52aa..bb1dba0de171 100644 --- a/multilib-portage.txt +++ b/multilib-portage.txt @@ -9,6 +9,7 @@ 'uri': 'git://anongit.gentoo.org/proj/multilib-portage.git'}], 'status': 'official'} $ pmaint sync multilib-portage +*** syncing multilib-portage warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -23,7 +24,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing multilib-portage *** synced multilib-portage * Sync succeeded $ git log --format=%ci -1 diff --git a/musl-clang.html b/musl-clang.html index 32e285b832f1..b5691dcd7739 100644 --- a/musl-clang.html +++ b/musl-clang.html @@ -34,35 +34,35 @@ </pre></td></tr> <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync musl-clang </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing musl-clang </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing musl-clang + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced musl-clang </pre></td></tr> diff --git a/musl-clang.txt b/musl-clang.txt index 94598ca5ba43..179e348ebb3e 100644 --- a/musl-clang.txt +++ b/musl-clang.txt @@ -10,6 +10,7 @@ {'type': 'git', 'uri': 'git://github.com/karlguy/musl-clang'}], 'status': 'unofficial'} $ pmaint sync musl-clang +*** syncing musl-clang warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -24,7 +25,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing musl-clang *** synced musl-clang * Sync succeeded $ git log --format=%ci -1 diff --git a/musl.html b/musl.html index ba6162592a11..85d2b9869d3c 100644 --- a/musl.html +++ b/musl.html @@ -40,35 +40,35 @@ </pre></td></tr> <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync musl </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing musl </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing musl + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced musl </pre></td></tr> @@ -13,6 +13,7 @@ 'uri': 'git+ssh://git@git.gentoo.org/proj/musl.git'}], 'status': 'official'} $ pmaint sync musl +*** syncing musl warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -27,7 +28,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing musl *** synced musl * Sync succeeded $ git log --format=%ci -1 @@ -46,35 +46,35 @@ </pre></td></tr> <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>$ pmaint sync mv </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** syncing mv </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>invocation. + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date. + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** syncing mv + <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>*** synced mv </pre></td></tr> @@ -16,6 +16,7 @@ {'type': 'git', 'uri': 'git+ssh://git@git.gentoo.org/user/mv.git'}], 'status': 'unofficial'} $ pmaint sync mv +*** syncing mv warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -30,7 +31,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing mv *** synced mv * Sync succeeded $ git log --format=%ci -1 @@ -34,35 +34,35 @@ </pre></td></tr> <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync mva </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing mva </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing mva + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced mva </pre></td></tr> @@ -10,6 +10,7 @@ {'type': 'git', 'uri': 'git://github.com/msva/mva-overlay'}], 'status': 'unofficial'} $ pmaint sync mva +*** syncing mva warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -24,7 +25,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing mva *** synced mva * Sync succeeded $ git log --format=%ci -1 diff --git a/myrvolay.html b/myrvolay.html index 223f7af41c51..03a085033d9c 100644 --- a/myrvolay.html +++ b/myrvolay.html @@ -36,35 +36,35 @@ </pre></td></tr> <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync myrvolay </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing myrvolay </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** syncing myrvolay + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced myrvolay </pre></td></tr> diff --git a/myrvolay.txt b/myrvolay.txt index 99027c7de41b..fe446e06740f 100644 --- a/myrvolay.txt +++ b/myrvolay.txt @@ -11,6 +11,7 @@ {'type': 'git', 'uri': 'git@github.com:myrvogna/myrvolay.git'}], 'status': 'unofficial'} $ pmaint sync myrvolay +*** syncing myrvolay warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -25,7 +26,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing myrvolay *** synced myrvolay * Sync succeeded $ git log --format=%ci -1 diff --git a/mysql.html b/mysql.html index 0de9d0da66f2..81031fac10a6 100644 --- a/mysql.html +++ b/mysql.html @@ -40,35 +40,35 @@ </pre></td></tr> <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync mysql </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing mysql </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing mysql + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced mysql </pre></td></tr> diff --git a/mysql.txt b/mysql.txt index 9206788a5d6a..4df20ff72e5c 100644 --- a/mysql.txt +++ b/mysql.txt @@ -13,6 +13,7 @@ 'uri': 'git+ssh://git@git.gentoo.org/proj/mysql.git'}], 'status': 'official'} $ pmaint sync mysql +*** syncing mysql warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -27,7 +28,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing mysql *** synced mysql * Sync succeeded $ git log --format=%ci -1 diff --git a/natinst.html b/natinst.html index c4e703945db9..5ef730a7b96b 100644 --- a/natinst.html +++ b/natinst.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync natinst </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing natinst </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing natinst + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced natinst </pre></td></tr> diff --git a/natinst.txt b/natinst.txt index d7490fbfe29b..34c1264d00cf 100644 --- a/natinst.txt +++ b/natinst.txt @@ -12,6 +12,7 @@ 'uri': 'git+ssh://git@github.com/AndrewAmmerlaan/natinst.git'}], 'status': 'unofficial'} $ pmaint sync natinst +*** syncing natinst warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing natinst *** synced natinst * Sync succeeded $ git log --format=%ci -1 diff --git a/nelson-graca.html b/nelson-graca.html index a9ab3802254e..5faf78393c4d 100644 --- a/nelson-graca.html +++ b/nelson-graca.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync nelson-graca </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing nelson-graca </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing nelson-graca + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced nelson-graca </pre></td></tr> diff --git a/nelson-graca.txt b/nelson-graca.txt index 691cb29ee142..7d6f21a9e1a4 100644 --- a/nelson-graca.txt +++ b/nelson-graca.txt @@ -12,6 +12,7 @@ 'uri': 'git+ssh://git@github.com/nelsongraca/gentoo-overlay.git'}], 'status': 'unofficial'} $ pmaint sync nelson-graca +*** syncing nelson-graca warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing nelson-graca *** synced nelson-graca * Sync succeeded $ git log --format=%ci -1 diff --git a/nest.html b/nest.html index 160f208409a3..214651ce9ae9 100644 --- a/nest.html +++ b/nest.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync nest </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing nest </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing nest + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced nest </pre></td></tr> @@ -12,6 +12,7 @@ 'uri': 'git+ssh://git@github.com/SpiderX/portage-overlay.git'}], 'status': 'unofficial'} $ pmaint sync nest +*** syncing nest warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing nest *** synced nest * Sync succeeded $ git log --format=%ci -1 diff --git a/nico.html b/nico.html index 4d6211727944..5afe72d56b5e 100644 --- a/nico.html +++ b/nico.html @@ -40,35 +40,35 @@ </pre></td></tr> <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync nico </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing nico </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing nico + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced nico </pre></td></tr> @@ -13,6 +13,7 @@ 'uri': 'git+ssh://git@git.gentoo.org/user/nico.git'}], 'status': 'unofficial'} $ pmaint sync nico +*** syncing nico warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -27,7 +28,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing nico *** synced nico * Sync succeeded $ git log --format=%ci -1 diff --git a/nitratesky.html b/nitratesky.html index 11944be84f7d..56fd71fd2716 100644 --- a/nitratesky.html +++ b/nitratesky.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync nitratesky </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing nitratesky </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing nitratesky + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced nitratesky </pre></td></tr> diff --git a/nitratesky.txt b/nitratesky.txt index d8c899c231bc..edc3256cc587 100644 --- a/nitratesky.txt +++ b/nitratesky.txt @@ -12,6 +12,7 @@ 'uri': 'git+ssh://git@github.com/VTimofeenko/nitratesky.git'}], 'status': 'unofficial'} $ pmaint sync nitratesky +*** syncing nitratesky warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing nitratesky *** synced nitratesky * Sync succeeded $ git log --format=%ci -1 diff --git a/nix-guix.html b/nix-guix.html index 5bda96f7930b..839d793c11f5 100644 --- a/nix-guix.html +++ b/nix-guix.html @@ -34,35 +34,35 @@ </pre></td></tr> <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync nix-guix </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing nix-guix </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing nix-guix + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced nix-guix </pre></td></tr> diff --git a/nix-guix.txt b/nix-guix.txt index 1c365ae71283..16d03fedcaf9 100644 --- a/nix-guix.txt +++ b/nix-guix.txt @@ -10,6 +10,7 @@ 'uri': 'https://github.com/trofi/nix-guix-gentoo.git'}], 'status': 'official'} $ pmaint sync nix-guix +*** syncing nix-guix warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -24,7 +25,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing nix-guix *** synced nix-guix * Sync succeeded $ git log --format=%ci -1 diff --git a/np-hardass-overlay.html b/np-hardass-overlay.html index 0f49c11b9d90..8e1f5afd6122 100644 --- a/np-hardass-overlay.html +++ b/np-hardass-overlay.html @@ -32,35 +32,35 @@ </pre></td></tr> <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync np-hardass-overlay </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>*** syncing np-hardass-overlay </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>invocation. + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Already up to date. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** syncing np-hardass-overlay + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced np-hardass-overlay </pre></td></tr> diff --git a/np-hardass-overlay.txt b/np-hardass-overlay.txt index 3197697273c7..1e762f5f8759 100644 --- a/np-hardass-overlay.txt +++ b/np-hardass-overlay.txt @@ -9,6 +9,7 @@ 'uri': 'https://github.com/np-hardass/np-hardass-overlay.git'}], 'status': 'unofficial'} $ pmaint sync np-hardass-overlay +*** syncing np-hardass-overlay warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -23,7 +24,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing np-hardass-overlay *** synced np-hardass-overlay * Sync succeeded $ git log --format=%ci -1 @@ -34,35 +34,35 @@ </pre></td></tr> <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync nx </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing nx </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing nx + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced nx </pre></td></tr> @@ -10,6 +10,7 @@ {'type': 'git', 'uri': 'git+ssh://git@git.gentoo.org/proj/nx.git'}], 'status': 'official'} $ pmaint sync nx +*** syncing nx warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -24,7 +25,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing nx *** synced nx * Sync succeeded $ git log --format=%ci -1 diff --git a/octopus.html b/octopus.html index de54bff710ab..db746a5a9793 100644 --- a/octopus.html +++ b/octopus.html @@ -28,35 +28,35 @@ </pre></td></tr> <tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre>$ pmaint sync octopus </pre></td></tr> - <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>*** syncing octopus </pre></td></tr> - <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>invocation. + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>Already up to date. + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>*** syncing octopus + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>*** synced octopus </pre></td></tr> diff --git a/octopus.txt b/octopus.txt index 7e491558ede6..17c6c286d36e 100644 --- a/octopus.txt +++ b/octopus.txt @@ -7,6 +7,7 @@ 'source': [{'type': 'git', 'uri': 'https://github.com/Bfgeshka/octopus.git'}], 'status': 'unofficial'} $ pmaint sync octopus +*** syncing octopus warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -21,7 +22,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing octopus *** synced octopus * Sync succeeded $ git log --format=%ci -1 diff --git a/oddlama.html b/oddlama.html index 3781d52b7b78..e78367e0cb72 100644 --- a/oddlama.html +++ b/oddlama.html @@ -36,35 +36,35 @@ </pre></td></tr> <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync oddlama </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing oddlama </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** syncing oddlama + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced oddlama </pre></td></tr> diff --git a/oddlama.txt b/oddlama.txt index ff2dec47f0dd..697b78c26089 100644 --- a/oddlama.txt +++ b/oddlama.txt @@ -11,6 +11,7 @@ 'uri': 'git+ssh://git@github.com/oddlama/overlay.git'}], 'status': 'unofficial'} $ pmaint sync oddlama +*** syncing oddlama warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -25,7 +26,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing oddlama *** synced oddlama * Sync succeeded $ git log --format=%ci -1 diff --git a/olifre.html b/olifre.html index 33e9d0edf5b2..b6292237ffe3 100644 --- a/olifre.html +++ b/olifre.html @@ -40,35 +40,35 @@ </pre></td></tr> <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync olifre </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing olifre </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing olifre + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced olifre </pre></td></tr> diff --git a/olifre.txt b/olifre.txt index 2bbac2259789..9bfd0fb1941d 100644 --- a/olifre.txt +++ b/olifre.txt @@ -13,6 +13,7 @@ {'type': 'git', 'uri': 'git@github.com:olifre/olifre-portage.git'}], 'status': 'unofficial'} $ pmaint sync olifre +*** syncing olifre warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -27,7 +28,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing olifre *** synced olifre * Sync succeeded $ git log --format=%ci -1 diff --git a/openclonk.html b/openclonk.html index 6161f7382af6..391eaeab79cf 100644 --- a/openclonk.html +++ b/openclonk.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync openclonk </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing openclonk </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing openclonk + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced openclonk </pre></td></tr> diff --git a/openclonk.txt b/openclonk.txt index 90e43e59111d..8875e205255c 100644 --- a/openclonk.txt +++ b/openclonk.txt @@ -12,6 +12,7 @@ 'uri': 'git+ssh://git@github.com/jcaesar/openclonk-overlay.git'}], 'status': 'unofficial'} $ pmaint sync openclonk +*** syncing openclonk warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing openclonk *** synced openclonk * Sync succeeded $ git log --format=%ci -1 diff --git a/openwrt.html b/openwrt.html index eab6b9d626ef..635d986fa61d 100644 --- a/openwrt.html +++ b/openwrt.html @@ -32,35 +32,35 @@ </pre></td></tr> <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync openwrt </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>*** syncing openwrt </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>invocation. + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Already up to date. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** syncing openwrt + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced openwrt </pre></td></tr> diff --git a/openwrt.txt b/openwrt.txt index fbfb5506f7a1..3d1e75af882e 100644 --- a/openwrt.txt +++ b/openwrt.txt @@ -9,6 +9,7 @@ 'source': [{'type': 'git', 'uri': 'https://github.com/pavlix/gentoo-openwrt'}], 'status': 'unofficial'} $ pmaint sync openwrt +*** syncing openwrt warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -23,7 +24,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing openwrt *** synced openwrt * Sync succeeded $ git log --format=%ci -1 diff --git a/oubliette.html b/oubliette.html index 088814a99a96..be465df360f1 100644 --- a/oubliette.html +++ b/oubliette.html @@ -34,35 +34,35 @@ </pre></td></tr> <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync oubliette </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing oubliette </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing oubliette + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced oubliette </pre></td></tr> diff --git a/oubliette.txt b/oubliette.txt index 08aa863749d6..57031d22be0e 100644 --- a/oubliette.txt +++ b/oubliette.txt @@ -10,6 +10,7 @@ 'uri': 'git+ssh://git@github.com/nabbi/oubliette-overlay.git'}], 'status': 'unofficial'} $ pmaint sync oubliette +*** syncing oubliette warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -24,7 +25,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing oubliette *** synced oubliette * Sync succeeded $ git log --format=%ci -1 diff --git a/overseerr-overlay.html b/overseerr-overlay.html index 6edefe165f97..ced2886d008e 100644 --- a/overseerr-overlay.html +++ b/overseerr-overlay.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync overseerr-overlay </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing overseerr-overlay </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing overseerr-overlay + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced overseerr-overlay </pre></td></tr> diff --git a/overseerr-overlay.txt b/overseerr-overlay.txt index a89b3c961187..febdddb88833 100644 --- a/overseerr-overlay.txt +++ b/overseerr-overlay.txt @@ -12,6 +12,7 @@ 'uri': 'git+ssh://git@github.com:chriscpritchard/overseerr-overlay.git'}], 'status': 'unofficial'} $ pmaint sync overseerr-overlay +*** syncing overseerr-overlay warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing overseerr-overlay *** synced overseerr-overlay * Sync succeeded $ git log --format=%ci -1 diff --git a/palemoon.html b/palemoon.html index 26a09080d8fb..47ed47699dec 100644 --- a/palemoon.html +++ b/palemoon.html @@ -36,35 +36,35 @@ </pre></td></tr> <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync palemoon </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing palemoon </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** syncing palemoon + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced palemoon </pre></td></tr> diff --git a/palemoon.txt b/palemoon.txt index 1ca1d3db7c23..8c9ed0e3a0bd 100644 --- a/palemoon.txt +++ b/palemoon.txt @@ -11,6 +11,7 @@ {'type': 'git', 'uri': 'git@github.com:deu/palemoon-overlay.git'}], 'status': 'unofficial'} $ pmaint sync palemoon +*** syncing palemoon warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -25,7 +26,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing palemoon *** synced palemoon * Sync succeeded $ git log --format=%ci -1 diff --git a/panther.html b/panther.html index aead068b0a59..7b7549d6b0c1 100644 --- a/panther.html +++ b/panther.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync panther </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing panther </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing panther + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced panther </pre></td></tr> diff --git a/panther.txt b/panther.txt index 562566f9694b..4344effef6db 100644 --- a/panther.txt +++ b/panther.txt @@ -12,6 +12,7 @@ 'uri': 'git+ssh://git@github.com/orangeturtle739/panther.git'}], 'status': 'unofficial'} $ pmaint sync panther +*** syncing panther warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing panther *** synced panther * Sync succeeded $ git log --format=%ci -1 diff --git a/pdilung.html b/pdilung.html index 9bd73b9d469d..b23d1082c9b3 100644 --- a/pdilung.html +++ b/pdilung.html @@ -42,35 +42,35 @@ </pre></td></tr> <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync pdilung </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing pdilung </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing pdilung + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced pdilung </pre></td></tr> diff --git a/pdilung.txt b/pdilung.txt index 622b7af13148..b6a51b2255cd 100644 --- a/pdilung.txt +++ b/pdilung.txt @@ -14,6 +14,7 @@ 'uri': 'git@github.com:pdilung/gentoo-overlay.git'}], 'status': 'unofficial'} $ pmaint sync pdilung +*** syncing pdilung warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -28,7 +29,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing pdilung *** synced pdilung * Sync succeeded $ git log --format=%ci -1 diff --git a/pentoo.html b/pentoo.html index f8165ab51c4d..d8457d45151a 100644 --- a/pentoo.html +++ b/pentoo.html @@ -34,35 +34,35 @@ </pre></td></tr> <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync pentoo </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing pentoo </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing pentoo + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced pentoo </pre></td></tr> diff --git a/pentoo.txt b/pentoo.txt index f2d726e0b7e1..abf9681f6b1b 100644 --- a/pentoo.txt +++ b/pentoo.txt @@ -10,6 +10,7 @@ {'type': 'git', 'uri': 'git@github.com:pentoo/pentoo-overlay.git'}], 'status': 'official'} $ pmaint sync pentoo +*** syncing pentoo warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -24,7 +25,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing pentoo *** synced pentoo * Sync succeeded $ git log --format=%ci -1 diff --git a/perl-experimental-snapshots.html b/perl-experimental-snapshots.html index 5153e4c3b0d5..332e77b0fedf 100644 --- a/perl-experimental-snapshots.html +++ b/perl-experimental-snapshots.html @@ -40,35 +40,35 @@ </pre></td></tr> <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync perl-experimental-snapshots </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing perl-experimental-snapshots </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing perl-experimental-snapshots + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced perl-experimental-snapshots </pre></td></tr> diff --git a/perl-experimental-snapshots.txt b/perl-experimental-snapshots.txt index e8710bdd5d68..50e749c3fedb 100644 --- a/perl-experimental-snapshots.txt +++ b/perl-experimental-snapshots.txt @@ -13,6 +13,7 @@ 'uri': 'git://github.com/gentoo-perl/perl-experimental-snapshots.git'}], 'status': 'unofficial'} $ pmaint sync perl-experimental-snapshots +*** syncing perl-experimental-snapshots warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -27,7 +28,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing perl-experimental-snapshots *** synced perl-experimental-snapshots * Sync succeeded $ git log --format=%ci -1 diff --git a/perl-experimental.html b/perl-experimental.html index 2e2014813b36..a675af19ac3e 100644 --- a/perl-experimental.html +++ b/perl-experimental.html @@ -46,35 +46,35 @@ </pre></td></tr> <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>$ pmaint sync perl-experimental </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** syncing perl-experimental </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>invocation. + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date. + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** syncing perl-experimental + <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>*** synced perl-experimental </pre></td></tr> diff --git a/perl-experimental.txt b/perl-experimental.txt index ed417de3ccd3..1bd984a2d358 100644 --- a/perl-experimental.txt +++ b/perl-experimental.txt @@ -16,6 +16,7 @@ 'uri': 'git+ssh://git@git.gentoo.org/proj/perl-overlay.git'}], 'status': 'official'} $ pmaint sync perl-experimental +*** syncing perl-experimental warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -30,7 +31,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing perl-experimental *** synced perl-experimental * Sync succeeded $ git log --format=%ci -1 diff --git a/petkovich.html b/petkovich.html index 938b3d5d9c25..48803c549154 100644 --- a/petkovich.html +++ b/petkovich.html @@ -42,35 +42,35 @@ </pre></td></tr> <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync petkovich </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing petkovich </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing petkovich + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced petkovich </pre></td></tr> diff --git a/petkovich.txt b/petkovich.txt index 553ef3c74dbe..31418f5382fa 100644 --- a/petkovich.txt +++ b/petkovich.txt @@ -14,6 +14,7 @@ 'uri': 'git@github.com:jcpetkovich/overlay-petkovich.git'}], 'status': 'unofficial'} $ pmaint sync petkovich +*** syncing petkovich warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -28,7 +29,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing petkovich *** synced petkovich * Sync succeeded $ git log --format=%ci -1 diff --git a/pf4public.html b/pf4public.html index 45ec1bb2366d..a6fa3eb4bab9 100644 --- a/pf4public.html +++ b/pf4public.html @@ -38,47 +38,73 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync pf4public </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing pf4public </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing pf4public + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>From https://github.com/PF4Public/gentoo-overlay </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced pf4public + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> befe828..37fbf9f master -> origin/master </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Updating befe828..37fbf9f </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1 + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Fast-forward </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD + <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> app-editors/vscode/Manifest | 1 + </pre></td></tr> - <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 pf4public + <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> app-editors/vscode/vscode-1.54.3.ebuild | 2060 ++++++++++++++++++++ </pre></td></tr> - <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Cache regenerated successfully + <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> net-im/element-web/Manifest | 1120 +---------- +</pre></td></tr> + <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> ...web-1.7.22.ebuild => element-web-1.7.23.ebuild} | 1123 +---------- +</pre></td></tr> + <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> net-misc/sb-hosts/Manifest | 2 +- +</pre></td></tr> + <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> ...sb-hosts-3.4.6.ebuild => sb-hosts-3.5.1.ebuild} | 0 +</pre></td></tr> + <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> 6 files changed, 2082 insertions(+), 2224 deletions(-) +</pre></td></tr> + <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> create mode 100644 app-editors/vscode/vscode-1.54.3.ebuild +</pre></td></tr> + <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> rename net-im/element-web/{element-web-1.7.22.ebuild => element-web-1.7.23.ebuild} (65%) +</pre></td></tr> + <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> rename net-misc/sb-hosts/{sb-hosts-3.4.6.ebuild => sb-hosts-3.5.1.ebuild} (100%) +</pre></td></tr> + <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>*** synced pf4public +</pre></td></tr> + <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * Sync succeeded +</pre></td></tr> + <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>$ git log --format=%ci -1 +</pre></td></tr> + <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD +</pre></td></tr> + <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 pf4public +</pre></td></tr> + <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * Cache regenerated successfully </pre></td></tr> </table> diff --git a/pf4public.txt b/pf4public.txt index 84dfb2cd8563..990d862693e7 100644 --- a/pf4public.txt +++ b/pf4public.txt @@ -12,6 +12,7 @@ 'uri': 'git+ssh://git@github.com/PF4Public/gentoo-overlay.git'}], 'status': 'unofficial'} $ pmaint sync pf4public +*** syncing pf4public warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -25,8 +26,20 @@ preference for all repositories. You can also pass --rebase, --no-rebase, or --ff-only on the command line to override the configured default per invocation. -Already up to date. -*** syncing pf4public +From https://github.com/PF4Public/gentoo-overlay + befe828..37fbf9f master -> origin/master +Updating befe828..37fbf9f +Fast-forward + app-editors/vscode/Manifest | 1 + + app-editors/vscode/vscode-1.54.3.ebuild | 2060 ++++++++++++++++++++ + net-im/element-web/Manifest | 1120 +---------- + ...web-1.7.22.ebuild => element-web-1.7.23.ebuild} | 1123 +---------- + net-misc/sb-hosts/Manifest | 2 +- + ...sb-hosts-3.4.6.ebuild => sb-hosts-3.5.1.ebuild} | 0 + 6 files changed, 2082 insertions(+), 2224 deletions(-) + create mode 100644 app-editors/vscode/vscode-1.54.3.ebuild + rename net-im/element-web/{element-web-1.7.22.ebuild => element-web-1.7.23.ebuild} (65%) + rename net-misc/sb-hosts/{sb-hosts-3.4.6.ebuild => sb-hosts-3.5.1.ebuild} (100%) *** synced pf4public * Sync succeeded $ git log --format=%ci -1 diff --git a/pg_overlay.html b/pg_overlay.html index 1fdefffb2add..2cc4c6bd2abb 100644 --- a/pg_overlay.html +++ b/pg_overlay.html @@ -34,35 +34,35 @@ </pre></td></tr> <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync pg_overlay </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing pg_overlay </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing pg_overlay + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced pg_overlay </pre></td></tr> diff --git a/pg_overlay.txt b/pg_overlay.txt index f301946df966..86b6c21a9a54 100644 --- a/pg_overlay.txt +++ b/pg_overlay.txt @@ -10,6 +10,7 @@ 'uri': 'https://gitlab.com/Perfect_Gentleman/PG_Overlay.git'}], 'status': 'unofficial'} $ pmaint sync pg_overlay +*** syncing pg_overlay warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -24,7 +25,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing pg_overlay *** synced pg_overlay * Sync succeeded $ git log --format=%ci -1 diff --git a/phackerlay.html b/phackerlay.html index c3f9dabf21b2..fc6bf572e254 100644 --- a/phackerlay.html +++ b/phackerlay.html @@ -34,35 +34,35 @@ </pre></td></tr> <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync phackerlay </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing phackerlay </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing phackerlay + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced phackerlay </pre></td></tr> diff --git a/phackerlay.txt b/phackerlay.txt index 811320e5aa06..904d729594a8 100644 --- a/phackerlay.txt +++ b/phackerlay.txt @@ -10,6 +10,7 @@ 'uri': 'https://gitlab.phys-el.ru/ustinov/phackerlay.git'}], 'status': 'unofficial'} $ pmaint sync phackerlay +*** syncing phackerlay warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -24,7 +25,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing phackerlay *** synced phackerlay * Sync succeeded $ git log --format=%ci -1 diff --git a/phoenix591.html b/phoenix591.html index 32b80b9c9c70..d0d40db3a021 100644 --- a/phoenix591.html +++ b/phoenix591.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync phoenix591 </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing phoenix591 </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing phoenix591 + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced phoenix591 </pre></td></tr> diff --git a/phoenix591.txt b/phoenix591.txt index fe6f13336387..1aa770b5636b 100644 --- a/phoenix591.txt +++ b/phoenix591.txt @@ -12,6 +12,7 @@ 'uri': 'git+ssh://git@github.com/Phoenix591/gentoo-overlay.git'}], 'status': 'unofficial'} $ pmaint sync phoenix591 +*** syncing phoenix591 warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing phoenix591 *** synced phoenix591 * Sync succeeded $ git log --format=%ci -1 diff --git a/pholthaus-overlay.html b/pholthaus-overlay.html index 79988b3cb8b4..b2aef6f27785 100644 --- a/pholthaus-overlay.html +++ b/pholthaus-overlay.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync pholthaus-overlay </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing pholthaus-overlay </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing pholthaus-overlay + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced pholthaus-overlay </pre></td></tr> diff --git a/pholthaus-overlay.txt b/pholthaus-overlay.txt index c86c374d63e5..c05c15f8541b 100644 --- a/pholthaus-overlay.txt +++ b/pholthaus-overlay.txt @@ -12,6 +12,7 @@ 'uri': 'git+ssh://git@github.com/pholthau/pholthaus-overlay.git'}], 'status': 'unofficial'} $ pmaint sync pholthaus-overlay +*** syncing pholthaus-overlay warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing pholthaus-overlay *** synced pholthaus-overlay * Sync succeeded $ git log --format=%ci -1 diff --git a/pica-pica.html b/pica-pica.html index 7dc4973ec6a7..99fe83e7ebb9 100644 --- a/pica-pica.html +++ b/pica-pica.html @@ -32,35 +32,35 @@ </pre></td></tr> <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync pica-pica </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>*** syncing pica-pica </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>invocation. + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Already up to date. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** syncing pica-pica + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced pica-pica </pre></td></tr> diff --git a/pica-pica.txt b/pica-pica.txt index 725be2b91d70..9c5530a26d98 100644 --- a/pica-pica.txt +++ b/pica-pica.txt @@ -9,6 +9,7 @@ 'uri': 'https://github.com/antonsviridenko/pica-pica-gentoo-overlay.git'}], 'status': 'unofficial'} $ pmaint sync pica-pica +*** syncing pica-pica warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -23,7 +24,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing pica-pica *** synced pica-pica * Sync succeeded $ git log --format=%ci -1 diff --git a/picarica-overlay.html b/picarica-overlay.html index 553fd93e535b..46e7d99dd4fd 100644 --- a/picarica-overlay.html +++ b/picarica-overlay.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync picarica-overlay </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing picarica-overlay </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing picarica-overlay + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced picarica-overlay </pre></td></tr> diff --git a/picarica-overlay.txt b/picarica-overlay.txt index 9ccaa3629b08..ce97f0e31b5a 100644 --- a/picarica-overlay.txt +++ b/picarica-overlay.txt @@ -12,6 +12,7 @@ 'uri': 'git+ssh://git@gitlab.com/picarica/picarica-overlay.git'}], 'status': 'unofficial'} $ pmaint sync picarica-overlay +*** syncing picarica-overlay warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing picarica-overlay *** synced picarica-overlay * Sync succeeded $ git log --format=%ci -1 diff --git a/pigfoot.html b/pigfoot.html index 007c9a7c7c96..2cfabae50473 100644 --- a/pigfoot.html +++ b/pigfoot.html @@ -36,35 +36,35 @@ </pre></td></tr> <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync pigfoot </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing pigfoot </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** syncing pigfoot + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced pigfoot </pre></td></tr> diff --git a/pigfoot.txt b/pigfoot.txt index 552ddf3eaedc..536f852ba8b6 100644 --- a/pigfoot.txt +++ b/pigfoot.txt @@ -11,6 +11,7 @@ 'uri': 'git+ssh://git@git.gentoo.org/user/pigfoot.git'}], 'status': 'unofficial'} $ pmaint sync pigfoot +*** syncing pigfoot warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -25,7 +26,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing pigfoot *** synced pigfoot * Sync succeeded $ git log --format=%ci -1 diff --git a/piniverlay.html b/piniverlay.html index 24d0288c4ae3..435f91faf5a8 100644 --- a/piniverlay.html +++ b/piniverlay.html @@ -42,35 +42,35 @@ </pre></td></tr> <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync piniverlay </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing piniverlay </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing piniverlay + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced piniverlay </pre></td></tr> diff --git a/piniverlay.txt b/piniverlay.txt index e65b0e913c19..e85a8658dce7 100644 --- a/piniverlay.txt +++ b/piniverlay.txt @@ -14,6 +14,7 @@ 'uri': 'git@github.com:pinicarus/gentoo-overlay.git'}], 'status': 'unofficial'} $ pmaint sync piniverlay +*** syncing piniverlay warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -28,7 +29,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing piniverlay *** synced piniverlay * Sync succeeded $ git log --format=%ci -1 diff --git a/pinkbyte.html b/pinkbyte.html index 15244b3fdef3..e9a0f0b63fd0 100644 --- a/pinkbyte.html +++ b/pinkbyte.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync pinkbyte </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing pinkbyte </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing pinkbyte + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced pinkbyte </pre></td></tr> diff --git a/pinkbyte.txt b/pinkbyte.txt index 458a7fee0e40..7e0f066ef093 100644 --- a/pinkbyte.txt +++ b/pinkbyte.txt @@ -12,6 +12,7 @@ 'uri': 'git://github.com/Pinkbyte/pinkbyte-overlay.git'}], 'status': 'official'} $ pmaint sync pinkbyte +*** syncing pinkbyte warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing pinkbyte *** synced pinkbyte * Sync succeeded $ git log --format=%ci -1 diff --git a/pixlra.html b/pixlra.html index bb1816a074f2..6f3564ac8532 100644 --- a/pixlra.html +++ b/pixlra.html @@ -46,35 +46,35 @@ </pre></td></tr> <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>$ pmaint sync pixlra </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** syncing pixlra </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>invocation. + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date. + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** syncing pixlra + <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>*** synced pixlra </pre></td></tr> diff --git a/pixlra.txt b/pixlra.txt index 817ed9de31b0..92ccaec9719e 100644 --- a/pixlra.txt +++ b/pixlra.txt @@ -16,6 +16,7 @@ 'uri': 'https://github.com/pixlra/pixlra-gentoo-overlay.git'}], 'status': 'unofficial'} $ pmaint sync pixlra +*** syncing pixlra warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -30,7 +31,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing pixlra *** synced pixlra * Sync succeeded $ git log --format=%ci -1 diff --git a/pkalin.html b/pkalin.html index b342eb719687..f7fbc3d98c32 100644 --- a/pkalin.html +++ b/pkalin.html @@ -36,35 +36,35 @@ </pre></td></tr> <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync pkalin </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing pkalin </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** syncing pkalin + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced pkalin </pre></td></tr> diff --git a/pkalin.txt b/pkalin.txt index fbf1b0d7d901..dc7224e0344d 100644 --- a/pkalin.txt +++ b/pkalin.txt @@ -11,6 +11,7 @@ 'uri': 'git+ssh://git@github.com/thinrope/pkalin.git'}], 'status': 'unofficial'} $ pmaint sync pkalin +*** syncing pkalin warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -25,7 +26,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing pkalin *** synced pkalin * Sync succeeded $ git log --format=%ci -1 diff --git a/plex-overlay.html b/plex-overlay.html index 6c6554af6e21..a972f3e6c942 100644 --- a/plex-overlay.html +++ b/plex-overlay.html @@ -36,35 +36,35 @@ </pre></td></tr> <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync plex-overlay </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing plex-overlay </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** syncing plex-overlay + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced plex-overlay </pre></td></tr> diff --git a/plex-overlay.txt b/plex-overlay.txt index 9f6b9653878a..55adf04e7e67 100644 --- a/plex-overlay.txt +++ b/plex-overlay.txt @@ -11,6 +11,7 @@ 'uri': 'https://github.com/comio/plex-overlay.git'}], 'status': 'unofficial'} $ pmaint sync plex-overlay +*** syncing plex-overlay warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -25,7 +26,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing plex-overlay *** synced plex-overlay * Sync succeeded $ git log --format=%ci -1 diff --git a/poly-c.html b/poly-c.html index 35caea88d7be..1559abbcfb12 100644 --- a/poly-c.html +++ b/poly-c.html @@ -30,93 +30,93 @@ </pre></td></tr> <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>$ pmaint sync poly-c </pre></td></tr> - <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>------------------------------------------------------------------------------- + <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>*** syncing poly-c </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>Welcome to rsync.gentoofan.org:873 + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>------------------------------------------------------------------------------- </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>This is the gentoo portage-overlay of Polynomial-C + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>Welcome to rsync.gentoofan.org:873 </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>This is the gentoo portage-overlay of Polynomial-C </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>------------------------------------------------------------------------------- + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>------------------------------------------------------------------------------- </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> ,-~~-.___. + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> / | ' \ + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> ,-~~-.___. </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>( ) 0 + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> / | ' \ </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> \_/-, ,----' + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>( ) 0 </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> ==== // + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> \_/-, ,----' </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> / \-'~; /~~~(O) + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> ==== // </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> / __/~| / | + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> / \-'~; /~~~(O) </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>=( _____| (_________| + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> / __/~| / | </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>=( _____| (_________| </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>-server specs: + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> -CPU Intel Core i7 + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>-server specs: </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> -RAM 16 GB + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> -CPU Intel Core i7 </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> -OS Gentoo GNU/Linux (Kernel 5.x) + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> -RAM 16 GB </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> -BANDWIDTH 100 MBit + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> -OS Gentoo GNU/Linux (Kernel 5.x) </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> -LIMIT 50 users (concurrently) + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> -BANDWIDTH 100 MBit </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> -LOCATION Nuernberg/Germany + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> -LIMIT 50 users (concurrently) </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> -CONTACT polynomial-c@gentoo.org + <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> -LOCATION Nuernberg/Germany </pre></td></tr> - <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> + <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> -CONTACT polynomial-c@gentoo.org </pre></td></tr> - <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>------------------------------------------------------------------------------- + <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> + <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>------------------------------------------------------------------------------- </pre></td></tr> <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>Number of files: 1 (reg: 1) + <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>Number of created files: 0 + <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>Number of files: 1 (reg: 1) </pre></td></tr> - <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>Number of deleted files: 0 + <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>Number of created files: 0 </pre></td></tr> - <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>Number of regular files transferred: 1 + <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>Number of deleted files: 0 </pre></td></tr> - <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>Total file size: 32 bytes + <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>Number of regular files transferred: 1 </pre></td></tr> - <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>Total transferred file size: 32 bytes + <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>Total file size: 32 bytes </pre></td></tr> - <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>Literal data: 32 bytes + <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>Total transferred file size: 32 bytes </pre></td></tr> - <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>Matched data: 0 bytes + <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>Literal data: 32 bytes </pre></td></tr> - <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>File list size: 48 + <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>Matched data: 0 bytes </pre></td></tr> - <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>File list generation time: 0.001 seconds + <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>File list size: 48 </pre></td></tr> - <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>File list transfer time: 0.000 seconds + <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>File list generation time: 0.001 seconds </pre></td></tr> - <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>Total bytes sent: 85 + <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>File list transfer time: 0.000 seconds </pre></td></tr> - <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>Total bytes received: 132 + <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>Total bytes sent: 85 </pre></td></tr> - <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> + <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>Total bytes received: 132 </pre></td></tr> - <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>sent 85 bytes received 132 bytes 86.80 bytes/sec + <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>total size is 32 speedup is 0.15 + <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>sent 85 bytes received 132 bytes 62.00 bytes/sec </pre></td></tr> - <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>*** syncing poly-c + <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>total size is 32 speedup is 0.15 </pre></td></tr> <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>*** synced poly-c </pre></td></tr> diff --git a/poly-c.txt b/poly-c.txt index cfbee512016c..40782d4a49db 100644 --- a/poly-c.txt +++ b/poly-c.txt @@ -8,6 +8,7 @@ 'source': [{'type': 'rsync', 'uri': 'rsync://rsync.gentoofan.org/poly-c'}], 'status': 'official'} $ pmaint sync poly-c +*** syncing poly-c ------------------------------------------------------------------------------- Welcome to rsync.gentoofan.org:873 This is the gentoo portage-overlay of Polynomial-C @@ -49,9 +50,8 @@ File list transfer time: 0.000 seconds Total bytes sent: 85 Total bytes received: 132 -sent 85 bytes received 132 bytes 86.80 bytes/sec +sent 85 bytes received 132 bytes 62.00 bytes/sec total size is 32 speedup is 0.15 -*** syncing poly-c *** synced poly-c * Sync succeeded $ stat --format=%y . diff --git a/powerman.html b/powerman.html index 19ec026cc8c2..981cbfd34e24 100644 --- a/powerman.html +++ b/powerman.html @@ -32,35 +32,35 @@ </pre></td></tr> <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync powerman </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>*** syncing powerman </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>invocation. + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Already up to date. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** syncing powerman + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced powerman </pre></td></tr> diff --git a/powerman.txt b/powerman.txt index 75567a3a4101..73b437ee1ccb 100644 --- a/powerman.txt +++ b/powerman.txt @@ -9,6 +9,7 @@ 'uri': 'https://github.com/powerman/powerman-overlay.git'}], 'status': 'unofficial'} $ pmaint sync powerman +*** syncing powerman warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -23,7 +24,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing powerman *** synced powerman * Sync succeeded $ git log --format=%ci -1 diff --git a/ppfeufer-gentoo-overlay.html b/ppfeufer-gentoo-overlay.html index 9f662fc7af08..3c129f847585 100644 --- a/ppfeufer-gentoo-overlay.html +++ b/ppfeufer-gentoo-overlay.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync ppfeufer-gentoo-overlay </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing ppfeufer-gentoo-overlay </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing ppfeufer-gentoo-overlay + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced ppfeufer-gentoo-overlay </pre></td></tr> diff --git a/ppfeufer-gentoo-overlay.txt b/ppfeufer-gentoo-overlay.txt index 6b94908e0c15..b9edd3f46ba5 100644 --- a/ppfeufer-gentoo-overlay.txt +++ b/ppfeufer-gentoo-overlay.txt @@ -12,6 +12,7 @@ 'uri': 'git+ssh://git@github.com/ppfeufer/gentoo-overlay.git'}], 'status': 'unofficial'} $ pmaint sync ppfeufer-gentoo-overlay +*** syncing ppfeufer-gentoo-overlay warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing ppfeufer-gentoo-overlay *** synced ppfeufer-gentoo-overlay * Sync succeeded $ git log --format=%ci -1 diff --git a/pross.html b/pross.html index 063798558099..308aff5365bd 100644 --- a/pross.html +++ b/pross.html @@ -34,35 +34,35 @@ </pre></td></tr> <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync pross </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing pross </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing pross + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced pross </pre></td></tr> diff --git a/pross.txt b/pross.txt index 786344c0455a..24c485676669 100644 --- a/pross.txt +++ b/pross.txt @@ -10,6 +10,7 @@ 'uri': 'https://github.com/Pross/pross-overlay.git'}], 'status': 'unofficial'} $ pmaint sync pross +*** syncing pross warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -24,7 +25,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing pross *** synced pross * Sync succeeded $ git log --format=%ci -1 diff --git a/pyfa.html b/pyfa.html index 2a1c4552497b..f09e316a3a39 100644 --- a/pyfa.html +++ b/pyfa.html @@ -40,35 +40,35 @@ </pre></td></tr> <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync pyfa </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing pyfa </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing pyfa + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced pyfa </pre></td></tr> @@ -13,6 +13,7 @@ 'uri': 'git+ssh://git@github.com/ZeroPointEnergy/gentoo-pyfa-overlay.git'}], 'status': 'unofficial'} $ pmaint sync pyfa +*** syncing pyfa warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -27,7 +28,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing pyfa *** synced pyfa * Sync succeeded $ git log --format=%ci -1 diff --git a/python.html b/python.html index 037f5c0c174b..d8baa38cb0a5 100644 --- a/python.html +++ b/python.html @@ -40,35 +40,35 @@ </pre></td></tr> <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync python </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing python </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing python + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced python </pre></td></tr> diff --git a/python.txt b/python.txt index a2dfe1f373e7..a0cf6365aee4 100644 --- a/python.txt +++ b/python.txt @@ -13,6 +13,7 @@ 'uri': 'git+ssh://git@git.gentoo.org/proj/python.git'}], 'status': 'official'} $ pmaint sync python +*** syncing python warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -27,7 +28,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing python *** synced python * Sync succeeded $ git log --format=%ci -1 diff --git a/qemu-init.html b/qemu-init.html index aeeab11c30c3..bffd303c2743 100644 --- a/qemu-init.html +++ b/qemu-init.html @@ -42,35 +42,35 @@ </pre></td></tr> <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync qemu-init </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing qemu-init </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing qemu-init + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced qemu-init </pre></td></tr> diff --git a/qemu-init.txt b/qemu-init.txt index fb59c680b885..1bb5c8aa66fe 100644 --- a/qemu-init.txt +++ b/qemu-init.txt @@ -14,6 +14,7 @@ 'uri': 'git+ssh://git@git.gentoo.org/proj/kvm-tools.git'}], 'status': 'official'} $ pmaint sync qemu-init +*** syncing qemu-init warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -28,7 +29,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing qemu-init *** synced qemu-init * Sync succeeded $ git log --format=%ci -1 @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync qgp </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing qgp </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing qgp + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced qgp </pre></td></tr> @@ -12,6 +12,7 @@ 'uri': 'git+ssh://git@github.com:qgp/gentoo-qgp.git'}], 'status': 'unofficial'} $ pmaint sync qgp +*** syncing qgp warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing qgp *** synced qgp * Sync succeeded $ git log --format=%ci -1 diff --git a/qownnotes-overlay.html b/qownnotes-overlay.html index 7c13e17b3038..2939d0c29e99 100644 --- a/qownnotes-overlay.html +++ b/qownnotes-overlay.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync qownnotes-overlay </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing qownnotes-overlay </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing qownnotes-overlay + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced qownnotes-overlay </pre></td></tr> diff --git a/qownnotes-overlay.txt b/qownnotes-overlay.txt index e175fe6546e8..bd0de53171a6 100644 --- a/qownnotes-overlay.txt +++ b/qownnotes-overlay.txt @@ -12,6 +12,7 @@ 'uri': 'git+ssh://git@github.com/qownnotes/gentoo-overlay.git'}], 'status': 'unofficial'} $ pmaint sync qownnotes-overlay +*** syncing qownnotes-overlay warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing qownnotes-overlay *** synced qownnotes-overlay * Sync succeeded $ git log --format=%ci -1 @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync qsx </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing qsx </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing qsx + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced qsx </pre></td></tr> @@ -12,6 +12,7 @@ 'uri': 'git+ssh://git@github.com/qsuscs/gentoo-overlay.git'}], 'status': 'unofficial'} $ pmaint sync qsx +*** syncing qsx warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing qsx *** synced qsx * Sync succeeded $ git log --format=%ci -1 @@ -44,35 +44,35 @@ </pre></td></tr> <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync qt </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing qt </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date. + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** syncing qt + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced qt </pre></td></tr> @@ -15,6 +15,7 @@ {'type': 'git', 'uri': 'git+ssh://git@git.gentoo.org/proj/qt.git'}], 'status': 'official'} $ pmaint sync qt +*** syncing qt warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -29,7 +30,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing qt *** synced qt * Sync succeeded $ git log --format=%ci -1 diff --git a/quarks.html b/quarks.html index f704f2fb6119..ac87e752375e 100644 --- a/quarks.html +++ b/quarks.html @@ -34,35 +34,35 @@ </pre></td></tr> <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync quarks </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing quarks </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing quarks + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced quarks </pre></td></tr> diff --git a/quarks.txt b/quarks.txt index 0607b4823ac8..8fe3f394d77d 100644 --- a/quarks.txt +++ b/quarks.txt @@ -10,6 +10,7 @@ 'uri': 'https://git.zero-downtime.net/quark/quarks.git'}], 'status': 'unofficial'} $ pmaint sync quarks +*** syncing quarks warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -24,7 +25,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing quarks *** synced quarks * Sync succeeded $ git log --format=%ci -1 diff --git a/qwin-overlay.html b/qwin-overlay.html index 2f849fe12505..8b590fd1907c 100644 --- a/qwin-overlay.html +++ b/qwin-overlay.html @@ -28,35 +28,35 @@ </pre></td></tr> <tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre>$ pmaint sync qwin-overlay </pre></td></tr> - <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>*** syncing qwin-overlay </pre></td></tr> - <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>invocation. + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>Already up to date. + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>*** syncing qwin-overlay + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>*** synced qwin-overlay </pre></td></tr> diff --git a/qwin-overlay.txt b/qwin-overlay.txt index 92373153d108..aa60b0f69121 100644 --- a/qwin-overlay.txt +++ b/qwin-overlay.txt @@ -7,6 +7,7 @@ 'uri': 'git://github.com/Flex1911/qwin-overlay.git'}], 'status': 'unofficial'} $ pmaint sync qwin-overlay +*** syncing qwin-overlay warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -21,7 +22,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing qwin-overlay *** synced qwin-overlay * Sync succeeded $ git log --format=%ci -1 diff --git a/rafaelmartins.html b/rafaelmartins.html index 2a137a057362..96beb9d6f5f0 100644 --- a/rafaelmartins.html +++ b/rafaelmartins.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync rafaelmartins </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing rafaelmartins </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing rafaelmartins + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced rafaelmartins </pre></td></tr> diff --git a/rafaelmartins.txt b/rafaelmartins.txt index 7a22d878ffa4..423d4cbeb68b 100644 --- a/rafaelmartins.txt +++ b/rafaelmartins.txt @@ -12,6 +12,7 @@ 'uri': 'git://github.com/rafaelmartins/gentoo-overlay.git'}], 'status': 'official'} $ pmaint sync rafaelmartins +*** syncing rafaelmartins warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing rafaelmartins *** synced rafaelmartins * Sync succeeded $ git log --format=%ci -1 diff --git a/rage.html b/rage.html index bdf75a6c0b7d..b97e7da82eb5 100644 --- a/rage.html +++ b/rage.html @@ -36,35 +36,35 @@ </pre></td></tr> <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync rage </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing rage </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** syncing rage + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced rage </pre></td></tr> @@ -11,6 +11,7 @@ 'uri': 'git+ssh://git@gitlab.com/oxr463/overlay.git'}], 'status': 'unofficial'} $ pmaint sync rage +*** syncing rage warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -25,7 +26,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing rage *** synced rage * Sync succeeded $ git log --format=%ci -1 diff --git a/raiagent.html b/raiagent.html index d6381cab09e6..aefefea5f644 100644 --- a/raiagent.html +++ b/raiagent.html @@ -34,35 +34,35 @@ </pre></td></tr> <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync raiagent </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing raiagent </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing raiagent + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced raiagent </pre></td></tr> diff --git a/raiagent.txt b/raiagent.txt index fba20a6fe98b..07763e1bd2a4 100644 --- a/raiagent.txt +++ b/raiagent.txt @@ -10,6 +10,7 @@ {'type': 'git', 'uri': 'git://github.com/leycec/raiagent.git'}], 'status': 'unofficial'} $ pmaint sync raiagent +*** syncing raiagent warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -24,7 +25,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing raiagent *** synced raiagent * Sync succeeded $ git log --format=%ci -1 diff --git a/rasdark.html b/rasdark.html index 3eff9177b8ee..e8eb6d5103b9 100644 --- a/rasdark.html +++ b/rasdark.html @@ -32,35 +32,35 @@ </pre></td></tr> <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync rasdark </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>*** syncing rasdark </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>invocation. + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Already up to date. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** syncing rasdark + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced rasdark </pre></td></tr> diff --git a/rasdark.txt b/rasdark.txt index 27e8e0ceb2d7..ebfef8273c89 100644 --- a/rasdark.txt +++ b/rasdark.txt @@ -9,6 +9,7 @@ {'type': 'git', 'uri': 'git://github.com/rasdark/overlay.git'}], 'status': 'unofficial'} $ pmaint sync rasdark +*** syncing rasdark warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -23,7 +24,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing rasdark *** synced rasdark * Sync succeeded $ git log --format=%ci -1 @@ -34,35 +34,35 @@ </pre></td></tr> <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync raw </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing raw </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing raw + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced raw </pre></td></tr> @@ -10,6 +10,7 @@ 'uri': 'https://github.com/mahatma-kaganovich/raw.git'}], 'status': 'unofficial'} $ pmaint sync raw +*** syncing raw warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -24,7 +25,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing raw *** synced raw * Sync succeeded $ git log --format=%ci -1 diff --git a/rdnetto-overlay.html b/rdnetto-overlay.html index 407ce428ce98..94c1a34d1b9d 100644 --- a/rdnetto-overlay.html +++ b/rdnetto-overlay.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync rdnetto-overlay </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing rdnetto-overlay </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing rdnetto-overlay + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced rdnetto-overlay </pre></td></tr> diff --git a/rdnetto-overlay.txt b/rdnetto-overlay.txt index 5586aa03af79..228ac16ce965 100644 --- a/rdnetto-overlay.txt +++ b/rdnetto-overlay.txt @@ -12,6 +12,7 @@ 'uri': 'git+ssh://git@github.com:rdnetto/rdnetto-overlay.git'}], 'status': 'unofficial'} $ pmaint sync rdnetto-overlay +*** syncing rdnetto-overlay warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing rdnetto-overlay *** synced rdnetto-overlay * Sync succeeded $ git log --format=%ci -1 diff --git a/reagentoo.html b/reagentoo.html index 72b20ce25f44..a6d9cd3a3e28 100644 --- a/reagentoo.html +++ b/reagentoo.html @@ -34,35 +34,35 @@ </pre></td></tr> <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync reagentoo </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing reagentoo </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing reagentoo + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced reagentoo </pre></td></tr> diff --git a/reagentoo.txt b/reagentoo.txt index 889d246d66ae..e512a2bec7ae 100644 --- a/reagentoo.txt +++ b/reagentoo.txt @@ -10,6 +10,7 @@ 'uri': 'git+ssh://git@gitlab.com/reagentoo/gentoo-overlay.git'}], 'status': 'unofficial'} $ pmaint sync reagentoo +*** syncing reagentoo warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -24,7 +25,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing reagentoo *** synced reagentoo * Sync succeeded $ git log --format=%ci -1 diff --git a/ricerlay.html b/ricerlay.html index db6037cbbafb..95dd8a3ae776 100644 --- a/ricerlay.html +++ b/ricerlay.html @@ -32,35 +32,35 @@ </pre></td></tr> <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync ricerlay </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>*** syncing ricerlay </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>invocation. + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Already up to date. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** syncing ricerlay + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced ricerlay </pre></td></tr> diff --git a/ricerlay.txt b/ricerlay.txt index a0d6b7c3f5eb..0371ec43fb9e 100644 --- a/ricerlay.txt +++ b/ricerlay.txt @@ -9,6 +9,7 @@ 'uri': 'git+ssh://git@github.com/azahi/ricerlay.git'}], 'status': 'unofficial'} $ pmaint sync ricerlay +*** syncing ricerlay warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -23,7 +24,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing ricerlay *** synced ricerlay * Sync succeeded $ git log --format=%ci -1 diff --git a/rich0.html b/rich0.html index 8ef17b598a60..ce58ad9e3e2e 100644 --- a/rich0.html +++ b/rich0.html @@ -32,35 +32,35 @@ </pre></td></tr> <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync rich0 </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>*** syncing rich0 </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>invocation. + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Already up to date. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** syncing rich0 + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced rich0 </pre></td></tr> diff --git a/rich0.txt b/rich0.txt index 77bac3cf5f91..0ccf16ccc540 100644 --- a/rich0.txt +++ b/rich0.txt @@ -9,6 +9,7 @@ 'source': [{'type': 'git', 'uri': 'git://github.com/rich0/rich0-overlay.git'}], 'status': 'official'} $ pmaint sync rich0 +*** syncing rich0 warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -23,7 +24,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing rich0 *** synced rich0 * Sync succeeded $ git log --format=%ci -1 diff --git a/ring-overlay.html b/ring-overlay.html index 3fedb284c366..f69781ecef8b 100644 --- a/ring-overlay.html +++ b/ring-overlay.html @@ -44,35 +44,35 @@ </pre></td></tr> <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync ring-overlay </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing ring-overlay </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date. + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** syncing ring-overlay + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced ring-overlay </pre></td></tr> diff --git a/ring-overlay.txt b/ring-overlay.txt index ee9d7b72f0b0..d0526350e08b 100644 --- a/ring-overlay.txt +++ b/ring-overlay.txt @@ -15,6 +15,7 @@ 'uri': 'git@github.com:stefan-langenmaier/ring-overlay.git'}], 'status': 'unofficial'} $ pmaint sync ring-overlay +*** syncing ring-overlay warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -29,7 +30,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing ring-overlay *** synced ring-overlay * Sync succeeded $ git log --format=%ci -1 diff --git a/rion.html b/rion.html index f529b81bed2e..9e6cf54955f4 100644 --- a/rion.html +++ b/rion.html @@ -40,35 +40,35 @@ </pre></td></tr> <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync rion </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing rion </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing rion + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced rion </pre></td></tr> @@ -13,6 +13,7 @@ 'uri': 'git+ssh://git@github.com/rion-overlay/rion-overlay.git'}], 'status': 'unofficial'} $ pmaint sync rion +*** syncing rion warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -27,7 +28,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing rion *** synced rion * Sync succeeded $ git log --format=%ci -1 diff --git a/riru.html b/riru.html index b16afcf07a27..353e74d7a352 100644 --- a/riru.html +++ b/riru.html @@ -40,35 +40,35 @@ </pre></td></tr> <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync riru </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing riru </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing riru + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced riru </pre></td></tr> @@ -13,6 +13,7 @@ {'type': 'git', 'uri': 'git@github.com:pkulev/riru.git'}], 'status': 'unofficial'} $ pmaint sync riru +*** syncing riru warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -27,7 +28,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing riru *** synced riru * Sync succeeded $ git log --format=%ci -1 diff --git a/robert7k.html b/robert7k.html index 85b4adecb290..05125b482748 100644 --- a/robert7k.html +++ b/robert7k.html @@ -30,35 +30,35 @@ </pre></td></tr> <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>$ pmaint sync robert7k </pre></td></tr> - <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>*** syncing robert7k </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>invocation. + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>Already up to date. + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>*** syncing robert7k + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** synced robert7k </pre></td></tr> diff --git a/robert7k.txt b/robert7k.txt index 17abbe898dc3..caf6f78d7224 100644 --- a/robert7k.txt +++ b/robert7k.txt @@ -8,6 +8,7 @@ 'uri': 'https://github.com/robert7k/gentoo-overlay.git'}], 'status': 'unofficial'} $ pmaint sync robert7k +*** syncing robert7k warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -22,7 +23,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing robert7k *** synced robert7k * Sync succeeded $ git log --format=%ci -1 diff --git a/robertgzr.html b/robertgzr.html index 2ff38f3d4e9b..ad1805411573 100644 --- a/robertgzr.html +++ b/robertgzr.html @@ -34,35 +34,35 @@ </pre></td></tr> <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync robertgzr </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing robertgzr </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing robertgzr + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced robertgzr </pre></td></tr> diff --git a/robertgzr.txt b/robertgzr.txt index 03b7979c2aac..ff9d0c284736 100644 --- a/robertgzr.txt +++ b/robertgzr.txt @@ -10,6 +10,7 @@ {'type': 'git', 'uri': 'ssh://git@git.sr.ht:~robertgzr/portage'}], 'status': 'unofficial'} $ pmaint sync robertgzr +*** syncing robertgzr warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -24,7 +25,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing robertgzr *** synced robertgzr * Sync succeeded $ git log --format=%ci -1 diff --git a/roslin.html b/roslin.html index 153315b122f5..94c34a9b1cf1 100644 --- a/roslin.html +++ b/roslin.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync roslin </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing roslin </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing roslin + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced roslin </pre></td></tr> diff --git a/roslin.txt b/roslin.txt index 149148c55215..2d04f82b1985 100644 --- a/roslin.txt +++ b/roslin.txt @@ -12,6 +12,7 @@ 'uri': 'https://gitlab.com/roslin-uberlay/roslin.git'}], 'status': 'unofficial'} $ pmaint sync roslin +*** syncing roslin warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing roslin *** synced roslin * Sync succeeded $ git log --format=%ci -1 @@ -32,35 +32,35 @@ </pre></td></tr> <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync rpm </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>*** syncing rpm </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>invocation. + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Already up to date. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** syncing rpm + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced rpm </pre></td></tr> @@ -9,6 +9,7 @@ 'source': [{'type': 'git', 'uri': 'https://github.com/pavlix/gentoo-rpm.git'}], 'status': 'unofficial'} $ pmaint sync rpm +*** syncing rpm warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -23,7 +24,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing rpm *** synced rpm * Sync succeeded $ git log --format=%ci -1 diff --git a/ruby.html b/ruby.html index e70495319a1f..2f9b68b76adf 100644 --- a/ruby.html +++ b/ruby.html @@ -42,35 +42,35 @@ </pre></td></tr> <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync ruby </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing ruby </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing ruby + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced ruby </pre></td></tr> @@ -14,6 +14,7 @@ 'uri': 'git+ssh://git@git.gentoo.org/proj/ruby-overlay.git'}], 'status': 'official'} $ pmaint sync ruby +*** syncing ruby warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -28,7 +29,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing ruby *** synced ruby * Sync succeeded $ git log --format=%ci -1 diff --git a/rukruk.html b/rukruk.html index 89db5ca49dba..45574facaeb4 100644 --- a/rukruk.html +++ b/rukruk.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync rukruk </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing rukruk </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing rukruk + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced rukruk </pre></td></tr> diff --git a/rukruk.txt b/rukruk.txt index 78ef6a7e5884..8a0e55e28f33 100644 --- a/rukruk.txt +++ b/rukruk.txt @@ -12,6 +12,7 @@ {'type': 'git', 'uri': 'git@github.com:Atoms/rukruk.git'}], 'status': 'unofficial'} $ pmaint sync rukruk +*** syncing rukruk warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing rukruk *** synced rukruk * Sync succeeded $ git log --format=%ci -1 diff --git a/rust.html b/rust.html index bedfe7783530..a9159564938a 100644 --- a/rust.html +++ b/rust.html @@ -36,35 +36,35 @@ </pre></td></tr> <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync rust </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing rust </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** syncing rust + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced rust </pre></td></tr> @@ -11,6 +11,7 @@ {'type': 'git', 'uri': 'git@github.com:gentoo/gentoo-rust.git'}], 'status': 'unofficial'} $ pmaint sync rust +*** syncing rust warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -25,7 +26,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing rust *** synced rust * Sync succeeded $ git log --format=%ci -1 diff --git a/ryans.html b/ryans.html index 1da7b810e5c0..29c4b4cf5560 100644 --- a/ryans.html +++ b/ryans.html @@ -32,35 +32,35 @@ </pre></td></tr> <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync ryans </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>*** syncing ryans </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>invocation. + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Already up to date. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** syncing ryans + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced ryans </pre></td></tr> diff --git a/ryans.txt b/ryans.txt index 7caf7588398c..c96237f750f2 100644 --- a/ryans.txt +++ b/ryans.txt @@ -9,6 +9,7 @@ {'type': 'git', 'uri': 'git@github.com:bekcpear/ryans-repos.git'}], 'status': 'unofficial'} $ pmaint sync ryans +*** syncing ryans warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -23,7 +24,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing ryans *** synced ryans * Sync succeeded $ git log --format=%ci -1 diff --git a/sabayon-distro.html b/sabayon-distro.html index d809f5005bf5..da15cea1150f 100644 --- a/sabayon-distro.html +++ b/sabayon-distro.html @@ -36,35 +36,35 @@ </pre></td></tr> <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync sabayon-distro </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing sabayon-distro </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** syncing sabayon-distro + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced sabayon-distro </pre></td></tr> diff --git a/sabayon-distro.txt b/sabayon-distro.txt index 8963e0371d58..37149a0347c3 100644 --- a/sabayon-distro.txt +++ b/sabayon-distro.txt @@ -11,6 +11,7 @@ 'uri': 'git://github.com/Sabayon/sabayon-distro.git'}], 'status': 'unofficial'} $ pmaint sync sabayon-distro +*** syncing sabayon-distro warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -25,7 +26,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing sabayon-distro *** synced sabayon-distro * Sync succeeded $ git log --format=%ci -1 diff --git a/sabayon.html b/sabayon.html index 0a0a0585965e..ad24a09c26e7 100644 --- a/sabayon.html +++ b/sabayon.html @@ -40,35 +40,35 @@ </pre></td></tr> <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync sabayon </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing sabayon </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing sabayon + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced sabayon </pre></td></tr> diff --git a/sabayon.txt b/sabayon.txt index 57846c0a5d5c..8d619cd0de12 100644 --- a/sabayon.txt +++ b/sabayon.txt @@ -13,6 +13,7 @@ 'source': [{'type': 'git', 'uri': 'git://github.com/Sabayon/for-gentoo.git'}], 'status': 'unofficial'} $ pmaint sync sabayon +*** syncing sabayon warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -27,7 +28,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing sabayon *** synced sabayon * Sync succeeded $ git log --format=%ci -1 diff --git a/sage-on-gentoo.html b/sage-on-gentoo.html index f82a58a19db1..c44d9a5e46c2 100644 --- a/sage-on-gentoo.html +++ b/sage-on-gentoo.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync sage-on-gentoo </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing sage-on-gentoo </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing sage-on-gentoo + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced sage-on-gentoo </pre></td></tr> diff --git a/sage-on-gentoo.txt b/sage-on-gentoo.txt index b3c884f1a4ad..ecda8139cb5b 100644 --- a/sage-on-gentoo.txt +++ b/sage-on-gentoo.txt @@ -12,6 +12,7 @@ 'uri': 'https://github.com/cschwan/sage-on-gentoo.git'}], 'status': 'unofficial'} $ pmaint sync sage-on-gentoo +*** syncing sage-on-gentoo warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing sage-on-gentoo *** synced sage-on-gentoo * Sync succeeded $ git log --format=%ci -1 diff --git a/salfter.html b/salfter.html index 1024b5876157..7e7f1e9cda87 100644 --- a/salfter.html +++ b/salfter.html @@ -30,35 +30,35 @@ </pre></td></tr> <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>$ pmaint sync salfter </pre></td></tr> - <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>*** syncing salfter </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>invocation. + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>Already up to date. + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>*** syncing salfter + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** synced salfter </pre></td></tr> diff --git a/salfter.txt b/salfter.txt index cb37404187e1..1ab75c252f55 100644 --- a/salfter.txt +++ b/salfter.txt @@ -8,6 +8,7 @@ 'source': [{'type': 'git', 'uri': 'https://gitlab.com/salfter/portage.git'}], 'status': 'unofficial'} $ pmaint sync salfter +*** syncing salfter warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -22,7 +23,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing salfter *** synced salfter * Sync succeeded $ git log --format=%ci -1 diff --git a/sam_c.html b/sam_c.html index 089d970255f0..4271f8ac2b89 100644 --- a/sam_c.html +++ b/sam_c.html @@ -32,35 +32,35 @@ </pre></td></tr> <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync sam_c </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>*** syncing sam_c </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>invocation. + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Already up to date. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** syncing sam_c + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced sam_c </pre></td></tr> diff --git a/sam_c.txt b/sam_c.txt index 614fad37f6e7..cc97c7edeaac 100644 --- a/sam_c.txt +++ b/sam_c.txt @@ -9,6 +9,7 @@ 'uri': 'git+ssh://git@github.com/thesamesam/overlay.git'}], 'status': 'unofficial'} $ pmaint sync sam_c +*** syncing sam_c warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -23,7 +24,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing sam_c *** synced sam_c * Sync succeeded $ git log --format=%ci -1 diff --git a/sarnex-overlay.html b/sarnex-overlay.html index 6b233c63eb16..a6b75416193c 100644 --- a/sarnex-overlay.html +++ b/sarnex-overlay.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync sarnex-overlay </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing sarnex-overlay </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing sarnex-overlay + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced sarnex-overlay </pre></td></tr> diff --git a/sarnex-overlay.txt b/sarnex-overlay.txt index 6ae703c2bba8..ddca53dc3c8a 100644 --- a/sarnex-overlay.txt +++ b/sarnex-overlay.txt @@ -12,6 +12,7 @@ 'uri': 'git+ssh://git@github.com/sarnex/sarnex-overlay.git'}], 'status': 'unofficial'} $ pmaint sync sarnex-overlay +*** syncing sarnex-overlay warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing sarnex-overlay *** synced sarnex-overlay * Sync succeeded $ git log --format=%ci -1 diff --git a/sattvik.html b/sattvik.html index 8eea96f9f443..2545d49e5dd3 100644 --- a/sattvik.html +++ b/sattvik.html @@ -42,35 +42,35 @@ </pre></td></tr> <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync sattvik </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing sattvik </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing sattvik + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced sattvik </pre></td></tr> diff --git a/sattvik.txt b/sattvik.txt index 581503012cd5..2f80037b2cfd 100644 --- a/sattvik.txt +++ b/sattvik.txt @@ -14,6 +14,7 @@ 'uri': 'git+ssh://git@git.gentoo.org/user/sattvik.git'}], 'status': 'unofficial'} $ pmaint sync sattvik +*** syncing sattvik warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -28,7 +29,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing sattvik *** synced sattvik * Sync succeeded $ git log --format=%ci -1 diff --git a/science.html b/science.html index b804171acd5e..23a54cc193cf 100644 --- a/science.html +++ b/science.html @@ -66,57 +66,47 @@ </pre></td></tr> <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>$ pmaint sync science </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing science </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> + <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>invocation. + <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> + <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>From https://anongit.gentoo.org/git/proj/sci + <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> 5650ab5d4..66dbcc32b master -> origin/master + <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>Already up to date. </pre></td></tr> - <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>Updating 5650ab5d4..66dbcc32b + <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>*** synced science </pre></td></tr> - <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>Fast-forward + <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * Sync succeeded </pre></td></tr> - <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> sci-biology/stringtie/Manifest | 2 +- + <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>$ git log --format=%ci -1 </pre></td></tr> - <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> 1 file changed, 1 insertion(+), 1 deletion(-) + <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD </pre></td></tr> - <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>*** syncing science + <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 science </pre></td></tr> - <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>*** synced science -</pre></td></tr> - <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * Sync succeeded -</pre></td></tr> - <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ git log --format=%ci -1 -</pre></td></tr> - <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD -</pre></td></tr> - <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 science -</pre></td></tr> - <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * Cache regenerated successfully + <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * Cache regenerated successfully </pre></td></tr> </table> diff --git a/science.txt b/science.txt index 7516f05500d5..bf4a9efa75a5 100644 --- a/science.txt +++ b/science.txt @@ -26,6 +26,7 @@ {'type': 'git', 'uri': 'git@github.com:gentoo-science/sci.git'}], 'status': 'official'} $ pmaint sync science +*** syncing science warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -39,13 +40,7 @@ preference for all repositories. You can also pass --rebase, --no-rebase, or --ff-only on the command line to override the configured default per invocation. -From https://anongit.gentoo.org/git/proj/sci - 5650ab5d4..66dbcc32b master -> origin/master -Updating 5650ab5d4..66dbcc32b -Fast-forward - sci-biology/stringtie/Manifest | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) -*** syncing science +Already up to date. *** synced science * Sync succeeded $ git log --format=%ci -1 diff --git a/scrill.html b/scrill.html index ce75ff134c17..1eca16887434 100644 --- a/scrill.html +++ b/scrill.html @@ -34,35 +34,35 @@ </pre></td></tr> <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync scrill </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing scrill </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing scrill + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced scrill </pre></td></tr> diff --git a/scrill.txt b/scrill.txt index 21334707b84f..fe6a64023163 100644 --- a/scrill.txt +++ b/scrill.txt @@ -10,6 +10,7 @@ 'uri': 'git://github.com/scrill/scrill-overlay.git'}], 'status': 'unofficial'} $ pmaint sync scrill +*** syncing scrill warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -24,7 +25,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing scrill *** synced scrill * Sync succeeded $ git log --format=%ci -1 diff --git a/seadep.html b/seadep.html index 5dbd06e3a462..7d5140177bce 100644 --- a/seadep.html +++ b/seadep.html @@ -42,35 +42,35 @@ </pre></td></tr> <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync seadep </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing seadep </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing seadep + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced seadep </pre></td></tr> diff --git a/seadep.txt b/seadep.txt index 3f05fbd9ba41..f6b18cdc9443 100644 --- a/seadep.txt +++ b/seadep.txt @@ -14,6 +14,7 @@ 'uri': 'git@github.com:Keepco/gentoo-overlay-seadep.git'}], 'status': 'unofficial'} $ pmaint sync seadep +*** syncing seadep warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -28,7 +29,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing seadep *** synced seadep * Sync succeeded $ git log --format=%ci -1 diff --git a/seden.html b/seden.html index c212be7400d3..d65b35d650e4 100644 --- a/seden.html +++ b/seden.html @@ -40,35 +40,35 @@ </pre></td></tr> <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync seden </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing seden </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing seden + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced seden </pre></td></tr> diff --git a/seden.txt b/seden.txt index 6e0265477a73..1e8c43b254e4 100644 --- a/seden.txt +++ b/seden.txt @@ -13,6 +13,7 @@ 'uri': 'git+ssh://git@git.gentoo.org/user/seden.git'}], 'status': 'unofficial'} $ pmaint sync seden +*** syncing seden warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -27,7 +28,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing seden *** synced seden * Sync succeeded $ git log --format=%ci -1 diff --git a/setkeh.html b/setkeh.html index cdc325a76dcd..1862a0f5a24e 100644 --- a/setkeh.html +++ b/setkeh.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync setkeh </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing setkeh </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing setkeh + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced setkeh </pre></td></tr> diff --git a/setkeh.txt b/setkeh.txt index ee19a8c98f18..55ccf72177f2 100644 --- a/setkeh.txt +++ b/setkeh.txt @@ -12,6 +12,7 @@ 'uri': 'git+ssh://git@github.com:setkeh/Portage-Overlay.git'}], 'status': 'unofficial'} $ pmaint sync setkeh +*** syncing setkeh warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing setkeh *** synced setkeh * Sync succeeded $ git log --format=%ci -1 diff --git a/sevcsik.html b/sevcsik.html index 7fd3a54ee819..e98296f253dd 100644 --- a/sevcsik.html +++ b/sevcsik.html @@ -36,35 +36,35 @@ </pre></td></tr> <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync sevcsik </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing sevcsik </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** syncing sevcsik + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced sevcsik </pre></td></tr> diff --git a/sevcsik.txt b/sevcsik.txt index d35627a493be..3089a935fe7b 100644 --- a/sevcsik.txt +++ b/sevcsik.txt @@ -11,6 +11,7 @@ {'type': 'git', 'uri': 'git@github.com:sevcsik/overlay.git'}], 'status': 'unofficial'} $ pmaint sync sevcsik +*** syncing sevcsik warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -25,7 +26,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing sevcsik *** synced sevcsik * Sync succeeded $ git log --format=%ci -1 @@ -34,35 +34,35 @@ </pre></td></tr> <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync sft </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing sft </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing sft + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced sft </pre></td></tr> @@ -10,6 +10,7 @@ 'uri': 'https://github.com/SFTtech/gentoo-overlay.git'}], 'status': 'unofficial'} $ pmaint sync sft +*** syncing sft warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -24,7 +25,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing sft *** synced sft * Sync succeeded $ git log --format=%ci -1 @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync sgs </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing sgs </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing sgs + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced sgs </pre></td></tr> @@ -12,6 +12,7 @@ 'uri': 'git+ssh://git@github.com:blackm0re/sgs-overlay.git'}], 'status': 'unofficial'} $ pmaint sync sgs +*** syncing sgs warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing sgs *** synced sgs * Sync succeeded $ git log --format=%ci -1 diff --git a/shnurise.html b/shnurise.html index 4f6582f11e0c..aa549c96a4fc 100644 --- a/shnurise.html +++ b/shnurise.html @@ -44,35 +44,35 @@ </pre></td></tr> <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync shnurise </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing shnurise </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date. + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** syncing shnurise + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced shnurise </pre></td></tr> diff --git a/shnurise.txt b/shnurise.txt index 0383397eed48..c7a57b32d858 100644 --- a/shnurise.txt +++ b/shnurise.txt @@ -15,6 +15,7 @@ 'uri': 'git@github.com:ArsenShnurkov/shnurise.git'}], 'status': 'unofficial'} $ pmaint sync shnurise +*** syncing shnurise warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -29,7 +30,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing shnurise *** synced shnurise * Sync succeeded $ git log --format=%ci -1 diff --git a/sihnon.html b/sihnon.html index 00098d640052..f3bb6c54c444 100644 --- a/sihnon.html +++ b/sihnon.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync sihnon </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing sihnon </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing sihnon + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced sihnon </pre></td></tr> diff --git a/sihnon.txt b/sihnon.txt index 0bc6e426530c..b0da2f51a58c 100644 --- a/sihnon.txt +++ b/sihnon.txt @@ -12,6 +12,7 @@ 'uri': 'git@github.com:optiz0r/gentoo-overlay.git'}], 'status': 'unofficial'} $ pmaint sync sihnon +*** syncing sihnon warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing sihnon *** synced sihnon * Sync succeeded $ git log --format=%ci -1 diff --git a/simonvanderveldt.html b/simonvanderveldt.html index 8d62f43abb4b..037b565cabd1 100644 --- a/simonvanderveldt.html +++ b/simonvanderveldt.html @@ -44,35 +44,35 @@ </pre></td></tr> <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync simonvanderveldt </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing simonvanderveldt </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date. + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** syncing simonvanderveldt + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced simonvanderveldt </pre></td></tr> diff --git a/simonvanderveldt.txt b/simonvanderveldt.txt index 74648db1c59d..d4849e0b7b8e 100644 --- a/simonvanderveldt.txt +++ b/simonvanderveldt.txt @@ -15,6 +15,7 @@ 'uri': 'git@github.com:simonvanderveldt/simonvanderveldt-overlay.git'}], 'status': 'unofficial'} $ pmaint sync simonvanderveldt +*** syncing simonvanderveldt warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -29,7 +30,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing simonvanderveldt *** synced simonvanderveldt * Sync succeeded $ git log --format=%ci -1 diff --git a/sinustrom.html b/sinustrom.html index 2f331ff84b11..3f0db94b3941 100644 --- a/sinustrom.html +++ b/sinustrom.html @@ -42,35 +42,35 @@ </pre></td></tr> <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync sinustrom </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing sinustrom </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing sinustrom + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced sinustrom </pre></td></tr> diff --git a/sinustrom.txt b/sinustrom.txt index fef56e7f1d8e..ea0023f754dc 100644 --- a/sinustrom.txt +++ b/sinustrom.txt @@ -14,6 +14,7 @@ 'uri': 'git@github.com:zpuskas/sinustrom-gentoo-overlay.git'}], 'status': 'unofficial'} $ pmaint sync sinustrom +*** syncing sinustrom warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -28,7 +29,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing sinustrom *** synced sinustrom * Sync succeeded $ git log --format=%ci -1 diff --git a/sk-overlay.html b/sk-overlay.html index 2b9c7df98055..d1c58b8988c3 100644 --- a/sk-overlay.html +++ b/sk-overlay.html @@ -40,35 +40,35 @@ </pre></td></tr> <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync sk-overlay </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing sk-overlay </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing sk-overlay + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced sk-overlay </pre></td></tr> diff --git a/sk-overlay.txt b/sk-overlay.txt index 78ace0f3df97..2d6465988291 100644 --- a/sk-overlay.txt +++ b/sk-overlay.txt @@ -13,6 +13,7 @@ {'type': 'git', 'uri': 'git@github.com:scriptkitties/overlay.git'}], 'status': 'unofficial'} $ pmaint sync sk-overlay +*** syncing sk-overlay warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -27,7 +28,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing sk-overlay *** synced sk-overlay * Sync succeeded $ git log --format=%ci -1 diff --git a/slonko.html b/slonko.html index c392811f6b9b..157117d5a193 100644 --- a/slonko.html +++ b/slonko.html @@ -32,35 +32,35 @@ </pre></td></tr> <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync slonko </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>*** syncing slonko </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>invocation. + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Already up to date. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** syncing slonko + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced slonko </pre></td></tr> diff --git a/slonko.txt b/slonko.txt index 991019761918..0db37a0a2cef 100644 --- a/slonko.txt +++ b/slonko.txt @@ -9,6 +9,7 @@ 'source': [{'type': 'git', 'uri': 'https://slonko.net/git/portage'}], 'status': 'unofficial'} $ pmaint sync slonko +*** syncing slonko warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -23,7 +24,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing slonko *** synced slonko * Sync succeeded $ git log --format=%ci -1 diff --git a/slyfox.html b/slyfox.html index 445db2418dcb..34d54cc732a7 100644 --- a/slyfox.html +++ b/slyfox.html @@ -32,35 +32,35 @@ </pre></td></tr> <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync slyfox </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>*** syncing slyfox </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>invocation. + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Already up to date. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** syncing slyfox + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced slyfox </pre></td></tr> diff --git a/slyfox.txt b/slyfox.txt index 648a869318f9..fc8c6f201de0 100644 --- a/slyfox.txt +++ b/slyfox.txt @@ -9,6 +9,7 @@ 'source': [{'type': 'git', 'uri': 'https://github.com/trofi/slyfox-gentoo'}], 'status': 'official'} $ pmaint sync slyfox +*** syncing slyfox warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -23,7 +24,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing slyfox *** synced slyfox * Sync succeeded $ git log --format=%ci -1 diff --git a/smaeul.html b/smaeul.html index dae2b1b6a441..a2cad649a0f5 100644 --- a/smaeul.html +++ b/smaeul.html @@ -40,35 +40,35 @@ </pre></td></tr> <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync smaeul </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing smaeul </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing smaeul + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced smaeul </pre></td></tr> diff --git a/smaeul.txt b/smaeul.txt index 2d73c98216f4..c14bf04dffb2 100644 --- a/smaeul.txt +++ b/smaeul.txt @@ -13,6 +13,7 @@ 'uri': 'git+ssh://git@github.com/smaeul/portage-overlay.git'}], 'status': 'unofficial'} $ pmaint sync smaeul +*** syncing smaeul warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -27,7 +28,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing smaeul *** synced smaeul * Sync succeeded $ git log --format=%ci -1 diff --git a/snapd.html b/snapd.html index d0da0802dadf..5a22ebde0d22 100644 --- a/snapd.html +++ b/snapd.html @@ -32,35 +32,35 @@ </pre></td></tr> <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync snapd </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>*** syncing snapd </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>invocation. + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Already up to date. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** syncing snapd + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced snapd </pre></td></tr> diff --git a/snapd.txt b/snapd.txt index 8fbffcdfe388..3a3441b8f0e7 100644 --- a/snapd.txt +++ b/snapd.txt @@ -9,6 +9,7 @@ 'source': [{'type': 'git', 'uri': 'https://github.com/zigford/snapd.git'}], 'status': 'unofficial'} $ pmaint sync snapd +*** syncing snapd warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -23,7 +24,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing snapd *** synced snapd * Sync succeeded $ git log --format=%ci -1 diff --git a/sogo-connector.html b/sogo-connector.html index e627f96a0f92..9c6519e2e08e 100644 --- a/sogo-connector.html +++ b/sogo-connector.html @@ -42,35 +42,35 @@ </pre></td></tr> <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync sogo-connector </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing sogo-connector </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing sogo-connector + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced sogo-connector </pre></td></tr> diff --git a/sogo-connector.txt b/sogo-connector.txt index 84ff0ca08adc..0cf30c5dac38 100644 --- a/sogo-connector.txt +++ b/sogo-connector.txt @@ -14,6 +14,7 @@ 'uri': 'git+ssh://git@git.gentoo.org/repo/user/sogo-connector.git'}], 'status': 'unofficial'} $ pmaint sync sogo-connector +*** syncing sogo-connector warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -28,7 +29,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing sogo-connector *** synced sogo-connector * Sync succeeded $ git log --format=%ci -1 diff --git a/soltys.html b/soltys.html index 8017ce9e693f..b738e97a1f02 100644 --- a/soltys.html +++ b/soltys.html @@ -40,35 +40,35 @@ </pre></td></tr> <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync soltys </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing soltys </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing soltys + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced soltys </pre></td></tr> diff --git a/soltys.txt b/soltys.txt index bc7e16cc1395..5762e5a808bd 100644 --- a/soltys.txt +++ b/soltys.txt @@ -13,6 +13,7 @@ 'uri': 'git+ssh://git@github.com/soltysek/soltys-overlay.git'}], 'status': 'unofficial'} $ pmaint sync soltys +*** syncing soltys warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -27,7 +28,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing soltys *** synced soltys * Sync succeeded $ git log --format=%ci -1 diff --git a/sorinp.html b/sorinp.html index 10952a09cb85..ac1e0925a97b 100644 --- a/sorinp.html +++ b/sorinp.html @@ -36,35 +36,35 @@ </pre></td></tr> <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync sorinp </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing sorinp </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** syncing sorinp + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced sorinp </pre></td></tr> diff --git a/sorinp.txt b/sorinp.txt index 6d61a96fb5f4..63583134a280 100644 --- a/sorinp.txt +++ b/sorinp.txt @@ -11,6 +11,7 @@ 'uri': 'https://github.com/psihozefir/sorinp-gentoo-overlay'}], 'status': 'unofficial'} $ pmaint sync sorinp +*** syncing sorinp warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -25,7 +26,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing sorinp *** synced sorinp * Sync succeeded $ git log --format=%ci -1 diff --git a/sorrow.html b/sorrow.html index b9abf858d698..370dc0d920e1 100644 --- a/sorrow.html +++ b/sorrow.html @@ -36,35 +36,35 @@ </pre></td></tr> <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync sorrow </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing sorrow </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** syncing sorrow + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced sorrow </pre></td></tr> diff --git a/sorrow.txt b/sorrow.txt index 30077375c189..7a5924e6bc4c 100644 --- a/sorrow.txt +++ b/sorrow.txt @@ -11,6 +11,7 @@ 'uri': 'git+ssh://git@gitlab.com:eternal-sorrow/gentoo-local.git'}], 'status': 'unofficial'} $ pmaint sync sorrow +*** syncing sorrow warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -25,7 +26,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing sorrow *** synced sorrow * Sync succeeded $ git log --format=%ci -1 diff --git a/spikyatlinux.html b/spikyatlinux.html index 8699f988033a..ea76a55d8369 100644 --- a/spikyatlinux.html +++ b/spikyatlinux.html @@ -34,35 +34,35 @@ </pre></td></tr> <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync spikyatlinux </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing spikyatlinux </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing spikyatlinux + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced spikyatlinux </pre></td></tr> diff --git a/spikyatlinux.txt b/spikyatlinux.txt index c468066b5953..5c8c4dcb56db 100644 --- a/spikyatlinux.txt +++ b/spikyatlinux.txt @@ -10,6 +10,7 @@ 'uri': 'https://github.com/spikyatlinux/ebuilds_for_gentoo.git'}], 'status': 'unofficial'} $ pmaint sync spikyatlinux +*** syncing spikyatlinux warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -24,7 +25,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing spikyatlinux *** synced spikyatlinux * Sync succeeded $ git log --format=%ci -1 diff --git a/sping.html b/sping.html index 38b9de1aa595..42ce2ee063d6 100644 --- a/sping.html +++ b/sping.html @@ -44,35 +44,35 @@ </pre></td></tr> <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync sping </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing sping </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date. + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** syncing sping + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced sping </pre></td></tr> diff --git a/sping.txt b/sping.txt index 63c475650147..40c4a790851a 100644 --- a/sping.txt +++ b/sping.txt @@ -15,6 +15,7 @@ 'uri': 'git@github.com:hartwork/gentoo-overlay-sping.git'}], 'status': 'official'} $ pmaint sync sping +*** syncing sping warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -29,7 +30,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing sping *** synced sping * Sync succeeded $ git log --format=%ci -1 diff --git a/squeezebox.html b/squeezebox.html index 625e6fcd31b3..848074336c4c 100644 --- a/squeezebox.html +++ b/squeezebox.html @@ -44,35 +44,35 @@ </pre></td></tr> <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync squeezebox </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing squeezebox </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date. + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** syncing squeezebox + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced squeezebox </pre></td></tr> diff --git a/squeezebox.txt b/squeezebox.txt index 7fcd4a86b44b..fd773c50a650 100644 --- a/squeezebox.txt +++ b/squeezebox.txt @@ -15,6 +15,7 @@ 'uri': 'git+ssh://git@git.gentoo.org/user/squeezebox.git'}], 'status': 'unofficial'} $ pmaint sync squeezebox +*** syncing squeezebox warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -29,7 +30,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing squeezebox *** synced squeezebox * Sync succeeded $ git log --format=%ci -1 diff --git a/src_prepare-overlay.html b/src_prepare-overlay.html index de999fbbd687..9f84cd03107c 100644 --- a/src_prepare-overlay.html +++ b/src_prepare-overlay.html @@ -34,35 +34,35 @@ </pre></td></tr> <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync src_prepare-overlay </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing src_prepare-overlay </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing src_prepare-overlay + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced src_prepare-overlay </pre></td></tr> diff --git a/src_prepare-overlay.txt b/src_prepare-overlay.txt index 29b2917e2ad5..07b309f27ec4 100644 --- a/src_prepare-overlay.txt +++ b/src_prepare-overlay.txt @@ -10,6 +10,7 @@ 'uri': 'git+ssh://git@gitlab.com/src_prepare/src_prepare-overlay.git'}], 'status': 'unofficial'} $ pmaint sync src_prepare-overlay +*** syncing src_prepare-overlay warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -24,7 +25,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing src_prepare-overlay *** synced src_prepare-overlay * Sync succeeded $ git log --format=%ci -1 diff --git a/ssnb.html b/ssnb.html index 49e36295a03d..12d665b0fdde 100644 --- a/ssnb.html +++ b/ssnb.html @@ -40,35 +40,35 @@ </pre></td></tr> <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync ssnb </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing ssnb </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing ssnb + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced ssnb </pre></td></tr> @@ -13,6 +13,7 @@ 'uri': 'git+ssh://git@git.gentoo.org/repo/user/ssnb.git'}], 'status': 'unofficial'} $ pmaint sync ssnb +*** syncing ssnb warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -27,7 +28,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing ssnb *** synced ssnb * Sync succeeded $ git log --format=%ci -1 diff --git a/sspreitz.html b/sspreitz.html index 8712960f365b..ddbb3f66312c 100644 --- a/sspreitz.html +++ b/sspreitz.html @@ -42,35 +42,35 @@ </pre></td></tr> <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync sspreitz </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing sspreitz </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing sspreitz + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced sspreitz </pre></td></tr> diff --git a/sspreitz.txt b/sspreitz.txt index 96fff79780b7..20ab82fe36d2 100644 --- a/sspreitz.txt +++ b/sspreitz.txt @@ -14,6 +14,7 @@ 'uri': 'git@github.com:sspreitzer/gentoo-repo.git'}], 'status': 'unofficial'} $ pmaint sync sspreitz +*** syncing sspreitz warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -28,7 +29,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing sspreitz *** synced sspreitz * Sync succeeded $ git log --format=%ci -1 diff --git a/steam-overlay.html b/steam-overlay.html index c1d41da11a07..f1d81c08c3fa 100644 --- a/steam-overlay.html +++ b/steam-overlay.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync steam-overlay </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing steam-overlay </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing steam-overlay + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced steam-overlay </pre></td></tr> diff --git a/steam-overlay.txt b/steam-overlay.txt index 3c5fb1cadb9d..fc5051827a71 100644 --- a/steam-overlay.txt +++ b/steam-overlay.txt @@ -12,6 +12,7 @@ {'type': 'git', 'uri': 'git@github.com:anyc/steam-overlay.git'}], 'status': 'unofficial'} $ pmaint sync steam-overlay +*** syncing steam-overlay warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing steam-overlay *** synced steam-overlay * Sync succeeded $ git log --format=%ci -1 diff --git a/stefantalpalaru.html b/stefantalpalaru.html index 735d5a35f5a4..84a3905adc0a 100644 --- a/stefantalpalaru.html +++ b/stefantalpalaru.html @@ -44,35 +44,35 @@ </pre></td></tr> <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync stefantalpalaru </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing stefantalpalaru </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date. + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** syncing stefantalpalaru + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced stefantalpalaru </pre></td></tr> diff --git a/stefantalpalaru.txt b/stefantalpalaru.txt index 0ae6b04bb0d9..76b182561290 100644 --- a/stefantalpalaru.txt +++ b/stefantalpalaru.txt @@ -15,6 +15,7 @@ 'uri': 'git@github.com:stefantalpalaru/gentoo-overlay.git'}], 'status': 'unofficial'} $ pmaint sync stefantalpalaru +*** syncing stefantalpalaru warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -29,7 +30,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing stefantalpalaru *** synced stefantalpalaru * Sync succeeded $ git log --format=%ci -1 diff --git a/stha09.html b/stha09.html index b3d88700afb2..7a8820b8a14d 100644 --- a/stha09.html +++ b/stha09.html @@ -36,35 +36,35 @@ </pre></td></tr> <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync stha09 </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing stha09 </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** syncing stha09 + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced stha09 </pre></td></tr> diff --git a/stha09.txt b/stha09.txt index 7e2d0f60dc33..6223613131e0 100644 --- a/stha09.txt +++ b/stha09.txt @@ -11,6 +11,7 @@ {'type': 'git', 'uri': 'git@github.com:stha09/gpo-stha09.git'}], 'status': 'unofficial'} $ pmaint sync stha09 +*** syncing stha09 warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -25,7 +26,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing stha09 *** synced stha09 * Sync succeeded $ git log --format=%ci -1 diff --git a/stowe-verlay.html b/stowe-verlay.html index 2a2603586bb3..0f569cf80401 100644 --- a/stowe-verlay.html +++ b/stowe-verlay.html @@ -40,35 +40,35 @@ </pre></td></tr> <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync stowe-verlay </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing stowe-verlay </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing stowe-verlay + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced stowe-verlay </pre></td></tr> diff --git a/stowe-verlay.txt b/stowe-verlay.txt index 6cbc7122a8d3..2c27a77c30a9 100644 --- a/stowe-verlay.txt +++ b/stowe-verlay.txt @@ -13,6 +13,7 @@ 'uri': 'https://github.com/mwstowe/stowe-verlay.git'}], 'status': 'unofficial'} $ pmaint sync stowe-verlay +*** syncing stowe-verlay warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -27,7 +28,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing stowe-verlay *** synced stowe-verlay * Sync succeeded $ git log --format=%ci -1 diff --git a/strohel.html b/strohel.html index 4384527b6f48..edb2fe8b9e59 100644 --- a/strohel.html +++ b/strohel.html @@ -42,35 +42,35 @@ </pre></td></tr> <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync strohel </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing strohel </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing strohel + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced strohel </pre></td></tr> diff --git a/strohel.txt b/strohel.txt index 6033d020c62f..7d9e4c077d52 100644 --- a/strohel.txt +++ b/strohel.txt @@ -14,6 +14,7 @@ 'uri': 'git+ssh://git@github.com:strohel/strohel-overlay.git'}], 'status': 'unofficial'} $ pmaint sync strohel +*** syncing strohel warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -28,7 +29,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing strohel *** synced strohel * Sync succeeded $ git log --format=%ci -1 diff --git a/stuff.html b/stuff.html index 32ba19ae3616..9fb8e32f50e6 100644 --- a/stuff.html +++ b/stuff.html @@ -28,35 +28,35 @@ </pre></td></tr> <tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre>$ pmaint sync stuff </pre></td></tr> - <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>*** syncing stuff </pre></td></tr> - <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>invocation. + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>Already up to date. + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>*** syncing stuff + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>*** synced stuff </pre></td></tr> diff --git a/stuff.txt b/stuff.txt index 8512898b12a2..bd1fc303ddc5 100644 --- a/stuff.txt +++ b/stuff.txt @@ -7,6 +7,7 @@ 'source': [{'type': 'git', 'uri': 'https://github.com/istitov/stuff.git'}], 'status': 'unofficial'} $ pmaint sync stuff +*** syncing stuff warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -21,7 +22,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing stuff *** synced stuff * Sync succeeded $ git log --format=%ci -1 diff --git a/sublime-text.html b/sublime-text.html index c765b21850f7..363b97ac3bfe 100644 --- a/sublime-text.html +++ b/sublime-text.html @@ -44,35 +44,35 @@ </pre></td></tr> <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync sublime-text </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing sublime-text </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date. + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** syncing sublime-text + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced sublime-text </pre></td></tr> diff --git a/sublime-text.txt b/sublime-text.txt index 45efd75458de..4ccebd1e1d78 100644 --- a/sublime-text.txt +++ b/sublime-text.txt @@ -15,6 +15,7 @@ 'uri': 'git@github.com:DamnWidget/sublime-text.git'}], 'status': 'unofficial'} $ pmaint sync sublime-text +*** syncing sublime-text warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -29,7 +30,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing sublime-text *** synced sublime-text * Sync succeeded $ git log --format=%ci -1 diff --git a/summary.json b/summary.json index b09df73a59a2..7eaf66a6d531 100644 --- a/summary.json +++ b/summary.json @@ -1 +1 @@ -{"0bs1d1an": {"quality": "experimental", "status": "unofficial", "name": "0bs1d1an", "description": {"en": "Personal overlay"}, "homepage": "https://gitlab.com/0bs1d1an/0bs1d1an-overlay", "owner": [{"type": "person", "email": "gkroon@maelstrom.ninja", "name": "Guido Kroon"}], "source": [{"type": "git", "uri": "https://gitlab.com/0bs1d1an/0bs1d1an-overlay.git"}, {"type": "git", "uri": "git+ssh://git@gitlab.com/0bs1d1an/0bs1d1an-overlay.git"}], "feed": ["https://gitlab.com/0bs1d1an/0bs1d1an-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2020-07-05 16:07:57 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo", "pentoo", "steam-overlay"], "x-ebuild-count": 79}, "0x4d4c": {"quality": "experimental", "status": "unofficial", "name": "0x4d4c", "description": {"en": "Personal overlay with no special focus"}, "homepage": "https://github.com/0x4d4c/gentoo-overlay", "owner": [{"type": "person", "email": "gentoo@0x4d4c.xyz", "name": "Martin Lambertz"}], "source": [{"type": "git", "uri": "https://github.com/0x4d4c/gentoo-overlay.git"}, {"type": "git", "uri": "git://github.com/0x4d4c/gentoo-overlay.git"}, {"type": "git", "uri": "git@github.com:0x4d4c/gentoo-overlay.git"}], "feed": ["https://github.com/0x4d4c/gentoo-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2017-06-09 22:51:12 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 19}, "2xsaiko": {"quality": "experimental", "status": "unofficial", "name": "2xsaiko", "description": {"en": "Personal overlay with no special focus"}, "homepage": "https://git.sr.ht/~dblsaiko/ebuilds", "owner": [{"type": "person", "email": "gentoo@dblsaiko.net", "name": "2xsaiko"}], "source": [{"type": "git", "uri": "https://git.sr.ht/~dblsaiko/ebuilds"}, {"type": "git", "uri": "git@git.sr.ht:~dblsaiko/ebuilds"}], "feed": ["https://git.sr.ht/~dblsaiko/ebuilds/log/rss.xml"], "x-state": "GOOD", "x-timestamp": "2021-03-08 23:03:42 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 236}, "4nykey": {"quality": "experimental", "status": "unofficial", "name": "4nykey", "description": {"en": "An experimental portage overlay"}, "homepage": "https://github.com/4nykey/4nykey", "owner": [{"type": "person", "email": "4nykey@gmail.com", "name": "Aleksei Kaveshnikov"}], "source": [{"type": "git", "uri": "https://github.com/4nykey/4nykey.git"}, {"type": "git", "uri": "git://github.com/4nykey/4nykey.git"}, {"type": "git", "uri": "git@github.com:4nykey/4nykey.git"}], "feed": ["https://github.com/4nykey/4nykey/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-08 13:19:58 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 458}, "AlexandreFournier": {"quality": "experimental", "status": "unofficial", "name": "AlexandreFournier", "description": {"en": "Alexandre Fournier's personal overlay"}, "homepage": "https://github.com/AlexandreFournier/gentoo-overlay", "owner": [{"type": "person", "email": "gentoo@alexandrefournier.com", "name": "Alexandre Fournier"}], "source": [{"type": "git", "uri": "https://github.com/AlexandreFournier/gentoo-overlay.git"}, {"type": "git", "uri": "git://github.com/AlexandreFournier/gentoo-overlay.git"}, {"type": "git", "uri": "git@github.com:AlexandreFournier/gentoo-overlay.git"}], "feed": ["https://github.com/AlexandreFournier/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-28 17:45:30 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 58}, "ArchFeh": {"quality": "experimental", "status": "unofficial", "name": "ArchFeh", "description": {"en": "ArchFeh's personal overlay"}, "homepage": "https://github.com/ArchFeh/ArchFeh-overlay", "owner": [{"type": "person", "email": "guyu2876@gmail.com", "name": "ArchFeh"}], "source": [{"type": "git", "uri": "https://github.com/ArchFeh/ArchFeh-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/ArchFeh/ArchFeh-overlay.git"}], "feed": ["https://github.com/ArchFeh/ArchFeh-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-04-22 15:59:45 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 22}, "AstroFloyd": {"quality": "experimental", "status": "unofficial", "name": "AstroFloyd", "description": {"en": "AstroFloyd's Gentoo overlay"}, "homepage": "https://cgit.gentoo.org/user/AstroFloyd.git/", "owner": [{"type": "person", "email": "AstroFloyd@gmail.com", "name": "AstroFloyd"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/AstroFloyd.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/AstroFloyd.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/AstroFloyd.git"}], "feed": ["https://cgit.gentoo.org/user/AstroFloyd.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-02-05 17:32:47 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 125}, "AzP": {"quality": "experimental", "status": "unofficial", "name": "AzP", "description": {"en": "Peter's own software playground"}, "homepage": "https://cgit.gentoo.org/user/AzP.git/", "owner": [{"type": "person", "email": "peterasplund@gentoo.se", "name": "Peter Asplund"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/AzP.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/AzP.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/AzP.git"}], "feed": ["https://cgit.gentoo.org/user/AzP.git/atom/"], "x-state": "BAD_CACHE", "x-timestamp": "2021-02-28 21:11:16 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 12}, "Case_Of": {"quality": "experimental", "status": "unofficial", "name": "Case_Of", "description": {"en": "Personal overlay"}, "homepage": "https://framagit.org/Case_Of/gentoo-overlay", "owner": [{"type": "person", "email": "gentoo@retornaz.com", "name": "Quentin Retornaz"}], "source": [{"type": "git", "uri": "https://framagit.org/Case_Of/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@framagit.org/Case_Of/gentoo-overlay.git"}], "feed": ["https://framagit.org/Case_Of/gentoo-overlay/commits/master?format=atom"], "x-state": "GOOD", "x-timestamp": "2021-03-08 19:12:55 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 18}, "Drauthius": {"quality": "experimental", "status": "unofficial", "name": "Drauthius", "description": {"en": "Ebuilds related to game dev"}, "homepage": "https://cgit.gentoo.org/repo/user/Drauthius.git/", "owner": [{"type": "person", "email": "albert@diserholt.com", "name": "Albert Diserholt"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/user/Drauthius.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/repo/user/Drauthius"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/user/Drauthius.git"}], "feed": ["https://cgit.gentoo.org/repo/user/Drauthius.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-09-17 16:30:24 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 12}, "DuPol": {"quality": "experimental", "status": "unofficial", "name": "DuPol", "description": {"en": "DuPol's own and modified portage ebuilds."}, "homepage": "https://cgit.gentoo.org/user/DuPol.git/", "owner": [{"type": "person", "email": "DuPol@gmx.de", "name": "Dustin Polke"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/DuPol.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/DuPol.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/DuPol.git"}], "feed": ["https://cgit.gentoo.org/user/DuPol.git/atom/"], "x-state": "BAD_CACHE", "x-timestamp": "2020-02-18 21:05:32 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 10}, "FireBurn": {"quality": "experimental", "status": "unofficial", "name": "FireBurn", "description": {"en": "32bit ebuilds (libdrm, mesa, libx11, mesa-progs, ..)"}, "homepage": "https://github.com/FireBurn/Overlay", "owner": [{"type": "person", "email": "mike@fireburn.co.uk", "name": "Mike Lothian"}], "source": [{"type": "git", "uri": "git://github.com/FireBurn/Overlay.git"}], "feed": ["https://github.com/FireBurn/Overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-05 08:01:20 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 25}, "HomeAssistantRepository": {"quality": "experimental", "status": "unofficial", "name": "HomeAssistantRepository", "description": {"en": "Home Assistant on Gentoo Linux without virtualenv or docker."}, "homepage": "https://git.edevau.net/onkelbeh/HomeAssistantRepository", "owner": [{"type": "person", "email": "b@edevau.net", "name": "Andreas Billmeier"}], "source": [{"type": "git", "uri": "https://git.edevau.net/onkelbeh/HomeAssistantRepository.git"}, {"type": "git", "uri": "https://github.com/onkelbeh/HomeAssistantRepository.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-15 23:37:42 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 2738}, "JRG": {"quality": "experimental", "status": "unofficial", "name": "JRG", "description": {"en": "John's Collaboration Overlay"}, "homepage": "https://github.com/john-r-graham/jrg-overlay", "owner": [{"type": "person", "email": "john_r_graham@gentoo.org", "name": "John R. Graham"}], "source": [{"type": "git", "uri": "https://github.com/john-r-graham/jrg-overlay.git"}, {"type": "git", "uri": "git://github.com/john-r-graham/jrg-overlay.git"}, {"type": "git", "uri": "git@github.com:john-r-graham/jrg-overlay.git"}], "feed": ["https://github.com/john-r-graham/jrg-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-01-31 14:10:23 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 11}, "KBrown-pub": {"quality": "experimental", "status": "unofficial", "name": "KBrown-pub", "description": {"en": "KBrown's public overlay"}, "homepage": "http://sandino.araico.net/", "owner": [{"type": "person", "email": "sandino@sandino.net", "name": "Sandino Araico Sanchez"}], "source": [{"type": "git", "uri": "https://git.softwarelibre.mx/KBrown/gentoo-overlay.git"}, {"type": "git", "uri": "https://github.com/KenjiBrown/gentoo-overlay.git"}], "feed": ["https://git.softwarelibre.mx/KBrown/gentoo-overlay/-/commits/KBrown-pub?format=atom"], "x-state": "GOOD", "x-timestamp": "2021-03-13 22:29:24 -0600\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 126}, "Krontage": {"quality": "experimental", "status": "unofficial", "name": "Krontage", "description": {"en": "Personal overlay of Kron"}, "homepage": "https://github.com/undying/krontage", "owner": [{"type": "person", "email": "undying-m@yandex.ru", "name": "Kron"}], "source": [{"type": "git", "uri": "https://github.com/undying/krontage.git"}, {"type": "git", "uri": "git://github.com/undying/krontage.git"}, {"type": "git", "uri": "git@github.com:undying/krontage.git"}], "feed": ["https://github.com/undying/krontage/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2020-11-13 03:32:07 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 17}, "ROKO__": {"quality": "experimental", "status": "unofficial", "name": "ROKO__", "description": {"en": "Unofficial ebuilds for gentoo based distributions."}, "homepage": "https://github.com/sandikata/ROKO__", "owner": [{"type": "person", "email": "sandikata@yandex.ru", "name": "Alexandrow Rosen"}], "source": [{"type": "git", "uri": "https://github.com/sandikata/ROKO__.git"}, {"type": "git", "uri": "git://github.com/sandikata/ROKO__.git"}], "feed": ["https://github.com/sandikata/ROKO__/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-26 17:14:23 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 106}, "R_Overlay": {"quality": "experimental", "status": "official", "name": "R_Overlay", "description": {"en": "Gentoo overlay of R packages"}, "homepage": "https://cgit.gentoo.org/proj/R_overlay.git/", "owner": [{"type": "person", "email": "heroxbd@gentoo.org", "name": "Benda Xu"}], "source": [{"type": "rsync", "uri": "rsync://roverlay.dev.gentoo.org/roverlay"}], "x-state": "GOOD", "x-timestamp": "2020-08-14 09:27:44.000000000 +0000\n", "x-masters": ["gentoo"], "x-ebuild-count": 20447}, "SwordArMor": {"quality": "experimental", "status": "unofficial", "name": "SwordArMor", "description": {"en": "Personnal overlay of alarig/SwordArMor"}, "homepage": "https://git.grifon.fr/alarig/SwordArMor-gentoo-overlay", "owner": [{"type": "person", "email": "alarig@swordarmor.fr", "name": "Alarig Le Lay"}], "source": [{"type": "git", "uri": "https://git.grifon.fr/alarig/SwordArMor-gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@git.grifon.fr:alarig/SwordArMor-gentoo-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-15 16:06:57 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 150}, "ace": {"quality": "experimental", "status": "unofficial", "name": "ace", "description": {"en": "Personal overlay with ebuilds that were missing at one point or another"}, "homepage": "https://github.com/ananace/overlay", "owner": [{"type": "person", "email": "ace@haxalot.com", "name": "Alexander Olofsson"}], "source": [{"type": "git", "uri": "https://github.com/ananace/overlay.git"}, {"type": "git", "uri": "git://github.com/ananace/overlay.git"}, {"type": "git", "uri": "git@github.com:ananace/overlay.git"}], "feed": ["https://github.com/ananace/overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-08 21:28:35 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 31}, "activehome": {"quality": "experimental", "status": "unofficial", "name": "activehome", "description": {"en": "Gentoo overlay for ebuilds related to 'hand-made' Active Home construction", "ru": "\u041e\u0432\u0435\u0440\u043b\u0435\u0439 \u0434\u043b\u044f ebuild'\u043e\u0432 \u0441\u0432\u044f\u0437\u0430\u043d\u043d\u044b\u0445 \u0441\u043e\u0437\u0434\u0430\u043d\u0438\u0435\u043c \u0441\u0430\u043c\u043e\u0434\u0435\u043b\u044c\u043d\u043e\u0433\u043e \u0443\u043c\u043d\u043e\u0433\u043e \u0434\u043e\u043c\u0430"}, "homepage": "https://cgit.gentoo.org/user/activehome.git/", "owner": [{"type": "person", "email": "mva@gentoo.org", "name": "Vadim A. Misbakh-Soloviov"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/activehome.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/activehome.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/activehome.git"}], "feed": ["https://cgit.gentoo.org/user/activehome.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-07-21 16:01:39 +0700\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "aeon-gentoo-overlay": {"quality": "experimental", "status": "unofficial", "name": "aeon-gentoo-overlay", "description": {"en": "Gentoo overlay for Aeon Dev packages and dependencies"}, "homepage": "https://github.com/aeon-engine/aeon-gentoo-overlay", "owner": [{"type": "person", "email": "robindegen@gmail.com", "name": "Robin Degen"}], "source": [{"type": "git", "uri": "https://github.com/aeon-engine/aeon-gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/aeon-engine/aeon-gentoo-overlay.git"}], "feed": ["https://github.com/aeon-engine/aeon-gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2019-05-19 12:32:23 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 3}, "ag-ops": {"quality": "experimental", "status": "unofficial", "name": "ag-ops", "description": {"en": "Useful tools for SysAdmins or DevOps"}, "homepage": "https://gitlab.com/ILMostro/ag-ops", "owner": [{"type": "person", "email": "ilmostro7@gmail.com", "name": "John Johnson"}], "source": [{"type": "git", "uri": "https://gitlab.com/ILMostro/ag-ops.git"}, {"type": "git", "uri": "git+ssh://git@gitlab.com/ILMostro/ag-ops.git"}], "feed": ["https://gitlab.com/ILMostro/ag-ops/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-10 03:08:50 -0600\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 83}, "ago": {"quality": "experimental", "status": "official", "name": "ago", "description": {"en": "Developer overlay"}, "homepage": "https://cgit.gentoo.org/dev/ago.git/", "owner": [{"type": "person", "email": "ago@gentoo.org", "name": "Agostino Sarubbo"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/ago.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/ago.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/ago.git"}], "feed": ["https://cgit.gentoo.org/dev/ago.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-02-10 16:28:13 +0100\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 18}, "ahyangyi-overlay": {"quality": "experimental", "status": "unofficial", "name": "ahyangyi-overlay", "description": {"en": "Ahyangyi's overlay"}, "homepage": "https://github.com/ahyangyi/ahyangyi-overlay", "owner": [{"type": "person", "email": "ahyangyi@gmail.com", "name": "Yi Yang"}], "source": [{"type": "git", "uri": "https://github.com/ahyangyi/ahyangyi-overlay.git"}], "feed": ["https://github.com/ahyangyi/ahyangyi-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-14 22:02:51 +0800\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 48}, "alatar-lay": {"quality": "experimental", "status": "unofficial", "name": "alatar-lay", "description": {"en": "Alatar`s personal ebuilds"}, "homepage": "https://github.com/alatarum/alatar-lay", "owner": [{"type": "person", "email": "alatar_@list.ru", "name": "Alatar"}], "source": [{"type": "git", "uri": "https://github.com/alatarum/alatar-lay.git"}, {"type": "git", "uri": "git://github.com/alatarum/alatar-lay.git"}, {"type": "git", "uri": "git@github.com:alatarum/alatar-lay.git"}], "feed": ["https://github.com/alatarum/alatar-lay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2018-05-02 01:46:05 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 6}, "alesharik": {"quality": "experimental", "status": "unofficial", "name": "alesharik", "description": {"en": "Gentoo portage overlay of alesharik"}, "homepage": "https://github.com/alesharik/alesharik-overlay", "owner": [{"type": "person", "email": "alesharik4@gmail.com", "name": "Aleksei Arsenev"}], "source": [{"type": "git", "uri": "https://github.com/alesharik/alesharik-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/alesharik/alesharik-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2021-01-07 14:18:42 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 17}, "alexcepoi": {"quality": "experimental", "status": "unofficial", "name": "alexcepoi", "description": {"en": "Personal User Overlay"}, "homepage": "https://cgit.gentoo.org/user/alexcepoi.git/", "owner": [{"type": "person", "email": "alex.cepoi@gmail.com", "name": "Alexandru Cepoi"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/alexcepoi.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/alexcepoi.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/alexcepoi.git"}], "feed": ["https://cgit.gentoo.org/user/alexcepoi.git/atom/"], "x-state": "GOOD", "x-timestamp": "2018-01-21 15:49:24 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "alexxy": {"quality": "experimental", "status": "official", "name": "alexxy", "description": {"en": "Some random work in progress stuff from alexxy"}, "homepage": "https://cgit.gentoo.org/dev/alexxy.git", "owner": [{"type": "person", "email": "alexxy@gentoo.org", "name": "Alexey Shvetsov"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/alexxy.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/alexxy.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/alexxy.git"}], "feed": ["https://cgit.gentoo.org/dev/alexxy.git/atom/"], "x-state": "BAD_CACHE", "x-timestamp": "2020-02-11 14:50:24 +0300\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "aluco": {"quality": "experimental", "status": "unofficial", "name": "aluco", "description": {"en": "From drm-next to phoronix-test-suite ebuilds"}, "homepage": "https://cgit.gentoo.org/user/aluco.git/", "owner": [{"type": "person", "email": "anthoine.bourgeois@gmail.com", "name": "Anthoine Bourgeois"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/aluco.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/aluco.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/aluco.git"}], "feed": ["https://cgit.gentoo.org/user/aluco.git/atom/"], "x-state": "GOOD", "x-timestamp": "2017-05-22 00:05:14 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 24}, "alxu": {"quality": "experimental", "status": "unofficial", "name": "alxu", "description": {"en": "Alex Xu (Hello71) personal overlay"}, "homepage": "https://cgit.alxu.ca/gentoo-overlay.git/", "owner": [{"type": "person", "email": "alex_y_xu@yahoo.ca", "name": "Alex Xu (Hello71)"}], "source": [{"type": "git", "uri": "https://git.alxu.ca/gentoo-overlay.git"}], "feed": ["https://cgit.alxu.ca/gentoo-overlay.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-03-02 16:56:03 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 51}, "amedeos": {"quality": "experimental", "status": "unofficial", "name": "amedeos", "description": {"en": "amedeos's personal overlay"}, "homepage": "https://github.com/amedeos/amedeos-overlay", "owner": [{"type": "person", "email": "amedeo@linux.com", "name": "Amedeo Salvati"}], "source": [{"type": "git", "uri": "https://github.com/amedeos/amedeos-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/amedeos/amedeos-overlay.git"}], "feed": ["https://github.com/amedeos/amedeos-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-07 10:40:30 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 42}, "anarchy": {"quality": "experimental", "status": "official", "name": "anarchy", "description": {"en": "Testing/Bug fixes, new ebuilds"}, "homepage": "https://cgit.gentoo.org/dev/anarchy.git/", "owner": [{"type": "person", "email": "anarchy@gentoo.org", "name": "Jory Pratt"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/anarchy.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/anarchy"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/anarchy.git"}], "feed": ["https://cgit.gentoo.org/dev/anarchy.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-12-15 16:34:50 -0600\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 9}, "anard": {"quality": "experimental", "status": "unofficial", "name": "anard", "description": {"en": "Anard's personnal repository, with some new ebuilds"}, "homepage": "https://github.com/Anard/anard-overlay", "owner": [{"type": "person", "email": "anard@free.fr", "name": "Anard"}], "source": [{"type": "git", "uri": "https://github.com/Anard/anard-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/Anard/anard-overlay.git"}], "feed": ["https://github.com/Anard/anard-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-08 14:02:45 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 3}, "anaximander": {"quality": "experimental", "status": "unofficial", "name": "anaximander", "description": {"en": "anaximander's user overlay"}, "homepage": "https://cgit.gentoo.org/user/anaximander.git/", "owner": [{"type": "person", "email": "dominik.kriegner+gentoo@gmail.com", "name": "Dominik Kriegner"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/anaximander.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/anaximander.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/anaximander.git"}], "feed": ["https://cgit.gentoo.org/user/anaximander.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-02-23 08:35:21 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 3}, "anders-larsson": {"quality": "experimental", "status": "unofficial", "name": "anders-larsson", "description": {"en": "A few packages that are not hosted elsewhere."}, "homepage": "https://github.com/anders-larsson/gentoo-overlay", "owner": [{"type": "person", "email": "andla@thethundertemplars.com", "name": "Anders Larsson"}], "source": [{"type": "git", "uri": "https://github.com/anders-larsson/gentoo-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-14 21:08:42 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 25}, "andrey_utkin": {"quality": "experimental", "status": "official", "name": "andrey_utkin", "description": {"en": "Developer overlay"}, "homepage": "https://github.com/andrey-utkin/gentoo-overlay.git", "owner": [{"type": "person", "email": "andrey_utkin@gentoo.org", "name": "andrey_utkin"}], "source": [{"type": "git", "uri": "https://github.com/andrey-utkin/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/andrey-utkin/gentoo-overlay.git"}], "feed": ["https://github.com/andrey-utkin/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-09-04 11:23:21 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "anomen": {"quality": "experimental", "status": "unofficial", "name": "anomen", "description": {"en": "anomen's personal Gentoo overlay"}, "homepage": "https://github.com/anomen-s/anomen-overlay", "owner": [{"type": "person", "email": "ludek_h@seznam.cz", "name": "anomen"}], "source": [{"type": "git", "uri": "https://github.com/anomen-s/anomen-overlay.git"}, {"type": "git", "uri": "git://github.com/anomen-s/anomen-overlay.git"}, {"type": "git", "uri": "git@github.com:anomen-s/anomen-overlay.git"}], "feed": ["https://github.com/anomen-s/anomen-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-25 10:18:49 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 58}, "anyc": {"quality": "experimental", "status": "unofficial", "name": "anyc", "description": {"en": "Testing ebuilds for out-of-tree applications"}, "homepage": "https://github.com/anyc/anyc-overlay", "owner": [{"type": "person", "email": "dev@kicherer.org", "name": "Mario Kicherer"}], "source": [{"type": "git", "uri": "https://github.com/anyc/anyc-overlay.git"}, {"type": "git", "uri": "git://github.com/anyc/anyc-overlay.git"}, {"type": "git", "uri": "git@github.com:anyc/anyc-overlay.git"}], "feed": ["https://github.com/anyc/anyc-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-02-22 09:36:20 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 79}, "apriluwu": {"quality": "experimental", "status": "unofficial", "name": "apriluwu", "description": {"en": "apriluwu's personal overlay"}, "homepage": "https://github.com/apriluwu/gentoo-overlay", "owner": [{"type": "person", "email": "aaprilthemonth@gmail.com", "name": "April C."}], "source": [{"type": "git", "uri": "https://github.com/apriluwu/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/apriluwu/gentoo-overlay.git"}], "feed": ["https://github.com/apriluwu/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-06-27 13:41:25 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "archenroot": {"quality": "experimental", "status": "unofficial", "name": "archenroot", "description": {"en": "GPU, Neural Networks, Big Data, HPC, Java"}, "homepage": "https://github.com/archenroot/gentoo-overlay", "owner": [{"type": "person", "email": "archenroot@gmail.com", "name": "Ladislav Jech"}], "source": [{"type": "git", "uri": "https://github.com/archenroot/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/archenroot/gentoo-overlay.git"}], "feed": ["https://github.com/archenroot/gentoo-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2019-05-16 09:43:27 +0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "argent-main": {"quality": "experimental", "status": "unofficial", "name": "argent-main", "description": {"en": "Argent Linux"}, "homepage": "https://gitlab.com/argent/argent-main", "owner": [{"type": "person", "email": "stefan.cristian+gentoo@rogentos.ro", "name": "Stefan Cristian Brindusa"}], "source": [{"type": "git", "uri": "https://gitlab.com/argent/argent-main.git"}], "feed": ["https://gitlab.com/argent/argent-main/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-11-18 00:55:19 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2118}, "arx-libertatis": {"quality": "experimental", "status": "unofficial", "name": "arx-libertatis", "description": {"en": "Arx Libertatis Overlay"}, "homepage": "https://github.com/arx/ArxGentoo", "owner": [{"type": "person", "email": "daniel@constexpr.org", "name": "Daniel Scharrer"}], "source": [{"type": "git", "uri": "https://github.com/arx/ArxGentoo.git"}, {"type": "git", "uri": "git://github.com/arx/ArxGentoo.git"}], "x-state": "GOOD", "x-timestamp": "2020-08-11 21:12:11 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 7}, "audio-overlay": {"quality": "experimental", "status": "unofficial", "name": "audio-overlay", "description": {"en": "Pro audio overlay. Please file bugs or package suggestions at https://github.com/gentoo-audio/audio-overlay/issues/new"}, "homepage": "https://github.com/gentoo-audio/audio-overlay", "owner": [{"type": "project", "email": "audio-overlay@googlegroups.com", "name": "Audio overlay"}], "source": [{"type": "git", "uri": "https://github.com/gentoo-audio/audio-overlay.git"}, {"type": "git", "uri": "git://github.com/gentoo-audio/audio-overlay.git"}, {"type": "git", "uri": "git@github.com:gentoo-audio/audio-overlay.git"}], "feed": ["https://github.com/gentoo-audio/audio-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-28 18:25:06 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 78}, "average": {"quality": "experimental", "status": "unofficial", "name": "average", "description": {"en": "Personal playground for some ebuilds not found elsewhere"}, "homepage": "https://github.com/AnAverageHuman/average", "owner": [{"type": "person", "email": "jeffrey@icurse.nl", "name": "Jeffrey Lin"}], "source": [{"type": "git", "uri": "https://github.com/AnAverageHuman/average.git"}, {"type": "git", "uri": "git+ssh://git@github.com/AnAverageHuman/average.git"}], "feed": ["https://github.com/AnAverageHuman/average/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-21 23:33:21 -0500\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 9}, "awesome": {"quality": "experimental", "status": "unofficial", "name": "awesome", "description": {"en": "Awesome ebuilds"}, "homepage": "https://gitlab.awesome-it.de/overlays/awesome", "owner": [{"type": "person", "email": "info@awesome-it.de", "name": "Daniel Morlock"}], "source": [{"type": "git", "uri": "https://gitlab.awesome-it.de/overlays/awesome.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-02 08:59:35 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 36}, "barnowl": {"quality": "experimental", "status": "unofficial", "name": "barnowl", "description": {"en": "BarnOwl IM client"}, "homepage": "https://github.com/wthrowe/barnowl-overlay", "owner": [{"type": "person", "email": "wtt6@cornell.edu", "name": "William Throwe"}], "source": [{"type": "git", "uri": "https://github.com/wthrowe/barnowl-overlay.git"}, {"type": "git", "uri": "git://github.com/wthrowe/barnowl-overlay.git"}], "feed": ["https://github.com/wthrowe/barnowl-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-05-12 02:13:53 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 9}, "beatussum-overlay": {"quality": "experimental", "status": "unofficial", "name": "beatussum-overlay", "description": {"en": "Beatussum's overlay", "fr": "Overlay de Beatussum"}, "longdescription": {"en": "\n My Gentoo overlay aims to provide some packages that are not (yet) in the main Gentoo tree.\n ", "fr": "\n Mon overlay a pour but de fournir certains paquets qui ne sont pas (encore) disponibles dans l'arbre principal.\n "}, "homepage": "https://github.com/beatussum/beatussum-overlay", "owner": [{"type": "person", "email": "beatussum@protonmail.com", "name": "Matt\u00e9o Rossillol--Laruelle"}], "source": [{"type": "git", "uri": "https://github.com/beatussum/beatussum-overlay.git"}, {"type": "git", "uri": "ssh://git@github.com/beatussum/beatussum-overlay.git"}], "feed": ["https://github.com/beatussum/beatussum-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-01-29 15:47:13 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 27}, "benzene-overlay": {"quality": "experimental", "status": "unofficial", "name": "benzene-overlay", "description": {"en": "Universebenzene's personal Gentoo overlay"}, "homepage": "https://github.com/Universebenzene/benzene-overlay", "owner": [{"type": "person", "email": "universebenzene@sina.com", "name": "Universebenzene"}], "source": [{"type": "git", "uri": "https://github.com/Universebenzene/benzene-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/Universebenzene/benzene-overlay.git"}], "feed": ["https://github.com/Universebenzene/benzene-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-22 18:20:57 +0800\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 85}, "bes": {"quality": "experimental", "status": "unofficial", "name": "bes", "description": {"en": "bes' personal overlay"}, "homepage": "https://github.com/bes-internal/gentoo-overlay-bes", "owner": [{"type": "person", "email": "bes.internal@gmail.com", "name": "Vladimir Varlamov"}], "source": [{"type": "git", "uri": "https://github.com/bes-internal/gentoo-overlay-bes.git"}, {"type": "git", "uri": "git://github.com/bes-internal/gentoo-overlay-bes.git"}, {"type": "git", "uri": "git@github.com:bes-internal/gentoo-overlay-bes.git"}], "feed": ["https://github.com/bes-internal/gentoo-overlay-bes/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-12-14 13:34:07 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 9}, "bezerker": {"quality": "experimental", "status": "unofficial", "name": "bezerker", "description": {"en": "Bezerker's Packages"}, "homepage": "https://github.com/bezerker/gentoo-overlay", "owner": [{"type": "person", "email": "bezerker@bezerker.org", "name": "Bezerker"}], "source": [{"type": "git", "uri": "https://github.com/bezerker/gentoo-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2015-09-04 06:56:43 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 3}, "bibletime": {"quality": "experimental", "status": "unofficial", "name": "bibletime", "description": {"en": "BibleTime overlay"}, "homepage": "https://cgit.gentoo.org/user/bibletime.git/", "owner": [{"type": "person", "email": "jaak@ristioja.ee", "name": "Jaak Ristioja"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/bibletime.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/bibletime.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/bibletime.git"}], "feed": ["https://cgit.gentoo.org/user/bibletime.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-08-02 21:35:41 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 6}, "binaryden": {"quality": "experimental", "status": "unofficial", "name": "binaryden", "description": {"en": "Overlay for Cinnamon and other Gentoo packages"}, "homepage": "https://github.com/tkemmer/binaryden", "owner": [{"type": "person", "email": "thomas@binaryden.de", "name": "Thomas Kemmer"}], "source": [{"type": "git", "uri": "https://github.com/tkemmer/binaryden.git"}, {"type": "git", "uri": "git://github.com/tkemmer/binaryden.git"}, {"type": "git", "uri": "git+ssh://git@github.com/tkemmer/binaryden.git"}], "feed": ["https://github.com/tkemmer/binaryden/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-10 09:28:30 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 28}, "bircoph": {"quality": "experimental", "status": "official", "name": "bircoph", "description": {"en": "Developer overlay"}, "homepage": "https://cgit.gentoo.org/dev/bircoph.git/", "owner": [{"type": "person", "email": "bircoph@gentoo.org", "name": "Andrew Savchenko"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/bircoph.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/bircoph.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/bircoph.git"}], "feed": ["https://cgit.gentoo.org/dev/bircoph.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-02-28 16:44:20 +0300\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 29}, "bitcetera": {"quality": "experimental", "status": "unofficial", "name": "bitcetera", "description": {"en": "Miscellaneous Gentoo ebuilds"}, "homepage": "https://github.com/svoop/bitcetera-overlay", "owner": [{"type": "person", "email": "gentoo@bitcetera.com", "name": "Sven Schwyn"}], "source": [{"type": "git", "uri": "https://github.com/svoop/bitcetera-overlay.git"}, {"type": "git", "uri": "git://github.com/svoop/bitcetera-overlay.git"}, {"type": "git", "uri": "git@github.com:svoop/bitcetera-overlay.git"}], "feed": ["https://github.com/svoop/bitcetera-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-12-29 19:57:28 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 22}, "bitcoin": {"quality": "experimental", "status": "unofficial", "name": "bitcoin", "description": {"en": "Bitcoin and CPU/GPU mining related ebuilds"}, "homepage": "https://gitlab.com/bitcoin/gentoo.git", "owner": [{"type": "person", "email": "flo@geekplace.eu", "name": "Florian Schmaus"}], "source": [{"type": "git", "uri": "https://gitlab.com/bitcoin/gentoo.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-10 07:11:21 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 153}, "bleeding-edge": {"quality": "experimental", "status": "unofficial", "name": "bleeding-edge", "description": {"en": "Gentoo ebuilds for \"bleeding edge\" versions of packages - newest, untested - running on ~amd64."}, "homepage": "https://cgit.gentoo.org/repo/user/bleeding-edge.git/", "owner": [{"type": "person", "email": "jasiupsota@gmail.com", "name": "Jan Psota"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/user/bleeding-edge.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/repo/user/bleeding-edge"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/user/bleeding-edge.git"}], "feed": ["https://cgit.gentoo.org/repo/user/bleeding-edge.git/atom/"], "x-state": "BAD_CACHE", "x-timestamp": "2018-09-26 10:53:10 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 9}, "blender-gentoo-logo": {"quality": "experimental", "status": "official", "name": "blender-gentoo-logo", "description": {"en": "Software needed to render the Blender-based gentoo Logo of 2003"}, "homepage": "https://gitweb.gentoo.org/repo/proj/blender-gentoo-logo.git/", "owner": [{"type": "person", "email": "sping@gentoo.org", "name": "Sebastian Pipping"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/proj/blender-gentoo-logo.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/proj/blender-gentoo-logo.git"}], "feed": ["https://gitweb.gentoo.org/repo/proj/blender-gentoo-logo.git/atom/?h=master"], "x-state": "GOOD", "x-timestamp": "2017-09-09 16:34:22 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 3}, "bloody": {"quality": "experimental", "status": "unofficial", "name": "bloody", "description": {"en": "krita bleeding edge and artists tools/resources"}, "homepage": "https://github.com/bloodywing/bloody", "owner": [{"type": "person", "email": "bloodywing@neocomy.net", "name": "Pierre Geier"}], "source": [{"type": "git", "uri": "https://github.com/bloodywing/bloody.git"}, {"type": "git", "uri": "git://github.com/bloodywing/bloody.git"}, {"type": "git", "uri": "git@github.com:bloodywing/bloody.git"}], "feed": ["https://github.com/bloodywing/bloody/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-30 13:09:33 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 6}, "bobwya": {"quality": "experimental", "status": "unofficial", "name": "bobwya", "description": {"en": "Miscellaneous Gentoo ebuilds"}, "homepage": "https://github.com/bobwya/miscellaneous_ebuilds", "owner": [{"type": "person", "email": "bob.mt.wya@gmail.com", "name": "Bob Wya"}], "source": [{"type": "git", "uri": "https://github.com/bobwya/miscellaneous_ebuilds.git"}, {"type": "git", "uri": "git://github.com/bobwya/miscellaneous_ebuilds.git"}, {"type": "git", "uri": "git@github.com:bobwya/miscellaneous_ebuilds.git"}], "feed": ["https://github.com/bobwya/miscellaneous_ebuilds/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-16 15:20:52 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 459}, "bombo82": {"quality": "experimental", "status": "unofficial", "name": "bombo82", "description": {"en": "Bombo82's own gentoo overlay"}, "homepage": "https://github.com/bombo82/bombo82-overlay", "owner": [{"type": "person", "email": "bombo82@giannibombelli.it", "name": "Gianni Bombelli (bombo82)"}], "source": [{"type": "git", "uri": "https://github.com/bombo82/bombo82-overlay.git"}, {"type": "git", "uri": "git@github.com:bombo82/bombo82-overlay.git"}], "feed": ["https://github.com/bombo82/bombo82-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-07 11:16:15 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 20}, "booboo": {"quality": "experimental", "status": "unofficial", "name": "booboo", "description": {"en": "L29Ah personal overlay"}, "homepage": "https://github.com/l29ah/booboo", "owner": [{"type": "person", "email": "zl29ah@gmail.com", "name": "Sergey Alirzaev"}], "source": [{"type": "git", "uri": "https://github.com/l29ah/booboo.git"}], "feed": ["https://github.com/l29ah/booboo/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-16 03:59:39 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 378}, "brave-overlay": {"quality": "experimental", "status": "unofficial", "name": "brave-overlay", "description": {"en": "Brave Overlay"}, "homepage": "https://gitlab.com/jason.oliveira/brave-overlay", "owner": [{"type": "person", "email": "jason.oliveira@medicalcannab.is", "name": "Jason Oliveira"}], "source": [{"type": "git", "uri": "https://gitlab.com/jason.oliveira/brave-overlay.git"}], "feed": ["https://gitlab.com/jason.oliveira/brave-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-08 16:56:42 -0600\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "bright": {"quality": "experimental", "status": "unofficial", "name": "bright", "description": {"en": "BrightOne's personal overlay"}, "homepage": "https://github.com/filalex77/bright", "owner": [{"type": "person", "email": "brightone@protonmail.com", "name": "Oleksii Filonenko"}], "source": [{"type": "git", "uri": "https://github.com/filalex77/bright.git"}], "feed": ["https://github.com/filalex77/bright/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2019-07-25 22:54:21 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 29}, "brother-overlay": {"quality": "experimental", "status": "unofficial", "name": "brother-overlay", "description": {"en": "Brother printer and scanner software"}, "homepage": "https://github.com/stefan-langenmaier/brother-overlay", "owner": [{"type": "person", "email": "stefan.langenmaier+gentoo@gmail.com", "name": "Stefan Langenmaier"}], "source": [{"type": "git", "uri": "https://github.com/stefan-langenmaier/brother-overlay.git"}, {"type": "git", "uri": "git://github.com/stefan-langenmaier/brother-overlay.git"}, {"type": "git", "uri": "git@github.com:stefan-langenmaier/brother-overlay.git"}], "feed": ["https://github.com/stefan-langenmaier/brother-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-12-03 21:04:52 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 570}, "bubba": {"quality": "experimental", "status": "unofficial", "name": "bubba", "description": {"en": "\"Bubba\" platform support for Excito B2|3"}, "homepage": "https://github.com/gordonb3/bubba-overlay", "owner": [{"type": "person", "email": "gordon@bosvangennip.nl", "name": "Gordon Bos"}], "source": [{"type": "git", "uri": "https://github.com/gordonb3/bubba-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-11 16:36:17 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 49}, "bumblebee": {"quality": "experimental", "status": "unofficial", "name": "bumblebee", "description": {"en": "Packages related to the bumblebee project"}, "homepage": "https://github.com/Bumblebee-Project/bumblebee-gentoo/", "owner": [{"type": "person", "email": "mva@gentoo.org", "name": "Vadim A. Misbakh-Soloviov"}], "source": [{"type": "git", "uri": "git://github.com/Bumblebee-Project/bumblebee-gentoo"}], "feed": ["https://github.com/Bumblebee-Project/bumblebee-gentoo/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-02-17 00:03:28 +0700\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 6}, "buzden": {"quality": "experimental", "status": "unofficial", "name": "buzden", "description": {"en": "Personal overlay of Denis Buzdalov"}, "homepage": "https://github.com/buzden/buzden-overlay", "owner": [{"type": "person", "email": "public@buzden.ru", "name": "Denis Buzdalov"}], "source": [{"type": "git", "uri": "https://github.com/buzden/buzden-overlay.git"}, {"type": "git", "uri": "git://github.com/buzden/buzden-overlay.git"}, {"type": "git", "uri": "git@github.com:buzden/buzden-overlay.git"}], "feed": ["https://github.com/buzden/buzden-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-25 13:40:07 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "calculate": {"quality": "experimental", "status": "unofficial", "name": "calculate", "description": {"en": "Calculate Overlay"}, "homepage": "http://www.calculate-linux.org", "owner": [{"type": "person", "email": "at@calculate.ru"}], "source": [{"type": "git", "uri": "git://git.calculate-linux.org/calculate/calculate-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-16 15:22:00 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 232}, "canutethegreat-overlay": {"quality": "experimental", "status": "unofficial", "name": "canutethegreat-overlay", "description": {"en": "Overlay for personal projects, forks, and customizations"}, "homepage": "http://gentoo.canutethegreat.com/", "owner": [{"type": "person", "email": "canutethegreat@gmail.com", "name": "Ronald Farrer"}], "source": [{"type": "git", "uri": "https://github.com/CanuteTheGreat/canutethegreat-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/CanuteTheGreat/canutethegreat-overlay.git"}], "feed": ["https://github.com/CanuteTheGreat/canutethegreat-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-11 12:32:26 -0800\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 6}, "ceamac": {"quality": "experimental", "status": "unofficial", "name": "ceamac", "description": {"en": "This is a small Gentoo overlay with ebuilds that I could not find elsewhere or that I had to modify for some reason."}, "homepage": "https://github.com/ceamac/overlay", "owner": [{"type": "person", "email": "ceamac.paragon@gmail.com", "name": "Viorel Munteanu"}], "source": [{"type": "git", "uri": "https://github.com/ceamac/overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/ceamac/overlay.git"}], "feed": ["https://github.com/ceamac/overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-13 19:38:00 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 10}, "certbot-dns-plugins": {"quality": "experimental", "status": "unofficial", "name": "certbot-dns-plugins", "description": {"en": "Overlay for the DNS plugins of the ACME client certbot"}, "homepage": "https://github.com/osirisinferi/certbot-dns-plugins-overlay", "owner": [{"type": "person", "email": "gentoo@flut.demon.nl", "name": "Osiris Inferi"}], "source": [{"type": "git", "uri": "https://github.com/osirisinferi/certbot-dns-plugins-overlay.git"}, {"type": "git", "uri": "git@github.com:osirisinferi/certbot-dns-plugins-overlay.git"}], "feed": ["https://github.com/osirisinferi/certbot-dns-plugins-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-06 16:35:20 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 63}, "cg": {"quality": "experimental", "status": "unofficial", "name": "cg", "description": {"en": "Computer graphics ebuilds for gentoo"}, "homepage": "https://github.com/brothermechanic/cg", "owner": [{"type": "person", "email": "brothermechanic@gmail.com"}], "source": [{"type": "git", "uri": "https://github.com/brothermechanic/cg.git"}], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-12 09:26:03 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 142}, "chrisadr": {"quality": "experimental", "status": "unofficial", "name": "chrisadr", "description": {"en": "ChrisADR's personal overlay"}, "homepage": "https://github.com/ChrisADR/chrisadr-overlay", "owner": [{"type": "person", "email": "chrisadr@gentoo.org", "name": "Christopher D\u00edaz Riveros"}], "source": [{"type": "git", "uri": "https://github.com/ChrisADR/chrisadr-overlay.git"}, {"type": "git", "uri": "git@github.com:ChrisADR/chrisadr-overlay.git"}], "feed": ["https://github.com/ChrisADR/chrisadr-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2018-05-17 20:48:42 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 0}, "chrytoo": {"quality": "experimental", "status": "unofficial", "name": "chrytoo", "description": {"en": "Personal overlay for packages that usually aren't in the official repository..."}, "homepage": "https://github.com/chrytoo/gentoo-overlay", "owner": [{"type": "person", "email": "chry7oo@gmail.com", "name": "Milo\u0161 \u0110. Omeragi\u0107"}], "source": [{"type": "git", "uri": "https://github.com/chrytoo/gentoo-overlay.git"}, {"type": "git", "uri": "git://github.com/chrytoo/gentoo-overlay.git"}, {"type": "git", "uri": "git@github.com:chrytoo/gentoo-overlay.git"}], "feed": ["https://github.com/chrytoo/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2019-08-19 00:07:33 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "chymeric": {"quality": "experimental", "status": "unofficial", "name": "chymeric", "description": {"en": "Overlay for scientific software and other utilities"}, "homepage": "https://github.com/TheChymera/overlay", "owner": [{"type": "person", "email": "chr@chymera.eu", "name": "Horea Christian"}], "source": [{"type": "git", "uri": "https://github.com/TheChymera/overlay.git"}, {"type": "git", "uri": "git://github.com/TheChymera/overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/TheChymera/overlay.git"}], "feed": ["https://github.com/TheChymera/overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-16 11:11:32 -0400\n", "x-openpgp-signed": "E", "x-masters": ["gentoo", "science"], "x-ebuild-count": 35}, "cj-overlay": {"quality": "experimental", "status": "official", "name": "cj-overlay", "description": {"en": "Christoph's Overlay"}, "homepage": "https://github.com/junghans/cj-overlay", "owner": [{"type": "person", "email": "junghans@gentoo.org"}], "source": [{"type": "git", "uri": "git://github.com/junghans/cj-overlay"}], "feed": ["https://github.com/junghans/cj-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2017-11-08 11:12:00 -0700\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 7}, "concaveoverlay": {"quality": "experimental", "status": "unofficial", "name": "concaveoverlay", "description": {"en": "concavegit's overlay."}, "homepage": "https://gitlab.com/concavegit/concaveoverlay", "owner": [{"type": "person", "email": "concavemail@gmail.com"}], "source": [{"type": "git", "uri": "https://gitlab.com/concavegit/concaveoverlay.git"}], "feed": ["https://gitlab.com/concavegit/concaveoverlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2019-11-23 19:42:16 +0000\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 23}, "crocket-overlay": {"quality": "experimental", "status": "unofficial", "name": "crocket-overlay", "description": {"en": "crocket's personal overlay"}, "homepage": "https://github.com/crocket/crocket-overlay", "owner": [{"type": "person", "email": "crockabiscuit@gmail.com", "name": "crocket"}], "source": [{"type": "git", "uri": "https://github.com/crocket/crocket-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/crocket/crocket-overlay.git"}], "feed": ["https://github.com/crocket/crocket-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-05 13:39:11 +0900\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 72}, "crossdev": {"quality": "experimental", "status": "unofficial", "name": "crossdev", "description": {"en": "Ebuilds for embedded systems", "ru": "\u041f\u0430\u043a\u0435\u0442\u044b \u0434\u043b\u044f \u0432\u0441\u0442\u0440\u0430\u0438\u0432\u0430\u0435\u043c\u044b\u0445 \u0441\u0438\u0441\u0442\u0435\u043c"}, "homepage": "https://github.com/alphallc/crossdev/", "owner": [{"type": "person", "email": "mva@gentoo.org", "name": "Vadim A. Misbakh-Soloviov"}], "source": [{"type": "git", "uri": "git://github.com/alphallc/crossdev"}], "feed": ["https://github.com/alphallc/crossdev/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2019-06-18 14:39:51 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "dMaggot": {"quality": "experimental", "status": "unofficial", "name": "dMaggot", "description": {"en": "Overlay of David E. Narv\u00e1ez"}, "homepage": "https://cgit.gentoo.org/user/dMaggot.git/", "owner": [{"type": "person", "email": "david.narvaez@computer.org", "name": "David E. Narv\u00e1ez"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/dMaggot.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/dMaggot.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/dMaggot.git"}], "feed": ["https://cgit.gentoo.org/user/dMaggot.git/atom/"], "x-state": "BAD_CACHE", "x-timestamp": "2017-06-01 22:09:38 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 6}, "dargor": {"quality": "experimental", "status": "unofficial", "name": "dargor", "description": {"en": "Personal overlay for packages I care of"}, "homepage": "https://github.com/dargor/dargor_gentoo_overlay", "owner": [{"type": "person", "email": "linder.gabriel@gmail.com", "name": "Gabriel Linder"}], "source": [{"type": "git", "uri": "https://github.com/dargor/dargor_gentoo_overlay.git"}, {"type": "git", "uri": "git@github.com:dargor/dargor_gentoo_overlay.git"}], "feed": ["https://github.com/dargor/dargor_gentoo_overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-14 18:20:20 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 27}, "darkelf": {"quality": "experimental", "status": "unofficial", "name": "darkelf", "description": {"en": "Overlay focusing on improved user experience for working in darkness on Xfce or zsh (including vim)"}, "homepage": "https://cgit.gentoo.org/repo/user/darkelf.git", "owner": [{"type": "person", "email": "sur3@gmx.de", "name": "Simon"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/user/darkelf.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/user/darkelf.git"}], "feed": ["https://cgit.gentoo.org/repo/user/darkelf.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-09-21 18:45:53 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 11}, "darthgandalf-overlay": {"quality": "experimental", "status": "unofficial", "name": "darthgandalf-overlay", "description": {"en": "Personal overlay"}, "homepage": "https://github.com/DarthGandalf/gentoo-overlay", "owner": [{"type": "person", "email": "alexey+gentoo@asokolov.org", "name": "Alexey Sokolov"}], "source": [{"type": "git", "uri": "https://github.com/DarthGandalf/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/DarthGandalf/gentoo-overlay.git"}], "feed": ["https://github.com/DarthGandalf/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-19 12:03:43 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 6}, "deadbeef-overlay": {"quality": "experimental", "status": "unofficial", "name": "deadbeef-overlay", "description": {"en": "DeaDBeeF player overlay for Gentoo Linux"}, "homepage": "https://github.com/damex/deadbeef-overlay", "owner": [{"type": "person", "email": "damex.pp@gmail.com", "name": "Roman Kuzmitsky"}], "source": [{"type": "git", "uri": "https://github.com/damex/deadbeef-overlay.git"}], "feed": ["https://github.com/damex/deadbeef-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2019-06-06 14:06:08 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 53}, "decent-im": {"quality": "experimental", "status": "unofficial", "name": "decent-im", "description": {"en": "XMPP software overlay maintained by decent.im"}, "homepage": "https://github.com/decent-im/gentoo-overlay", "owner": [{"type": "person", "email": "andrey_utkin@gentoo.org", "name": "Andrey Utkin"}], "source": [{"type": "git", "uri": "https://github.com/decent-im/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/decent-im/gentoo-overlay.git"}], "feed": ["https://github.com/decent-im/gentoo-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2019-09-17 18:48:52 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 3}, "deepin": {"quality": "experimental", "status": "unofficial", "name": "deepin", "description": {"en": "Gentoo Overlay for Deepin Desktop Environment"}, "homepage": "https://github.com/zhtengw/deepin-overlay", "owner": [{"type": "person", "email": "atenzd@gmail.com", "name": "Aten Zhang"}], "source": [{"type": "git", "uri": "git://github.com/zhtengw/deepin-overlay.git"}], "feed": ["https://github.com/zhtengw/deepin-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-15 10:18:33 +0800\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 151}, "defiance": {"quality": "experimental", "status": "unofficial", "name": "defiance", "description": {"en": "packages for cloud development"}, "homepage": "https://github.com/d3fy/defiance-overlay.git", "owner": [{"type": "person", "email": "dan@d3fy.net", "name": "Dan Molik"}], "source": [{"type": "git", "uri": "https://github.com/d3fy/defiance-overlay.git"}, {"type": "git", "uri": "git://github.com/d3fy/defiance-overlay.git"}, {"type": "git", "uri": "git@github.com:d3fy/defiance-overlay.git"}], "feed": ["https://github.com/d3fy/defiance-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-02 16:20:01 -0500\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 73}, "delicious-absurdities": {"quality": "experimental", "status": "unofficial", "name": "delicious-absurdities", "description": {"en": "Personal overlay with delicious absurdities"}, "homepage": "https://github.com/paraenggu/delicious-absurdities-overlay", "owner": [{"type": "person", "email": "c.affolter@purplehaze.ch", "name": "Christian Affolter"}], "source": [{"type": "git", "uri": "https://github.com/paraenggu/delicious-absurdities-overlay.git"}, {"type": "git", "uri": "git://github.com/paraenggu/delicious-absurdities-overlay.git"}, {"type": "git", "uri": "git@github.com:paraenggu/delicious-absurdities-overlay.git"}], "feed": ["https://github.com/paraenggu/delicious-absurdities-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2020-05-03 12:55:52 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 12}, "dequbed": {"quality": "experimental", "status": "unofficial", "name": "dequbed", "description": {"en": "Personal overlay containing mostly small utilities and less stable package versions"}, "homepage": "https://github.com/dequbed/overlay.git", "owner": [{"type": "person", "email": "me@dequbed.space"}], "source": [{"type": "git", "uri": "https://github.com/dequbed/overlay.git"}, {"type": "git", "uri": "git://github.com/dequbed/overlay.git"}, {"type": "git", "uri": "git@github.com:dequbed/overlay.git"}], "feed": ["https://github.com/dequbed/overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-02 20:23:07 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "dev1990-overlay": {"quality": "experimental", "status": "unofficial", "name": "dev1990-overlay", "description": {"en": "Personal overlay focused on Qt application development and 3d-printing."}, "homepage": "https://github.com/dev-0x7C6/dev1990-overlay.git", "owner": [{"type": "person", "email": "dev.strikeu@gmail.com", "name": "Bartlomiej Burdukiewicz"}], "source": [{"type": "git", "uri": "https://github.com/dev-0x7C6/dev1990-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-15 11:15:05 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 248}, "devpump-gor": {"quality": "experimental", "status": "unofficial", "name": "devpump-gor", "description": {"en": "DevPump Gentoo Overlay"}, "homepage": "https://github.com/DevPump/gentoo-overlay", "owner": [{"type": "person", "email": "devpump@gmail.com", "name": "Matt Fleming"}], "source": [{"type": "git", "uri": "https://github.com/DevPump/gentoo-overlay.git"}], "x-state": "BAD_CACHE", "x-timestamp": "2016-07-06 07:57:12 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 11}, "didactic-duck": {"quality": "experimental", "status": "unofficial", "name": "didactic-duck", "description": {"en": "Some ebuilds that might work"}, "homepage": "https://github.com/lucianposton/didactic-duck", "owner": [{"type": "person", "email": "lucianposton@pm.me", "name": "Lucian Poston"}], "source": [{"type": "git", "uri": "https://github.com/lucianposton/didactic-duck.git"}], "feed": ["https://github.com/lucianposton/didactic-duck/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2020-03-18 22:02:03 -0500\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 70}, "dilfridge": {"quality": "experimental", "status": "official", "name": "dilfridge", "description": {"en": "Dilfridge overlay: experimental ebuilds and lab software"}, "homepage": "https://cgit.gentoo.org/dev/dilfridge.git/", "owner": [{"type": "person", "email": "dilfridge@gentoo.org", "name": "Andreas K. Huettel (dilfridge)"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/dilfridge.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/dilfridge.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/dilfridge.git"}], "feed": ["https://cgit.gentoo.org/dev/dilfridge.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-02-18 22:09:37 +0100\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 15}, "displacer": {"quality": "experimental", "status": "unofficial", "name": "displacer", "description": {"en": "Fixes and new unstable packages"}, "homepage": "https://cgit.gentoo.org/user/displacer.git/", "owner": [{"type": "person", "email": "disinbox@gmail.com", "name": "Igor Ulyanov"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/displacer.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/displacer.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/displacer.git"}], "feed": ["https://cgit.gentoo.org/user/displacer.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-11-01 16:16:15 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 17}, "distros": {"quality": "experimental", "status": "unofficial", "name": "distros", "description": {"en": "Calculate Linux Profiles"}, "homepage": "http://www.calculate-linux.org", "owner": [{"type": "person", "email": "at@calculate.ru"}], "source": [{"type": "git", "uri": "git://git.calculate-linux.org/calculate/distros-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-11 09:08:24 +0300\n", "x-openpgp-signed": "N", "x-masters": ["calculate", "gentoo"], "x-ebuild-count": 0}, "djc": {"quality": "experimental", "status": "unofficial", "name": "djc", "description": {"en": "Personal overlay; testing and early development"}, "homepage": "https://github.com/djc/djc-overlay", "owner": [{"type": "person", "email": "djc@gentoo.org", "name": "Dirkjan Ochtman"}], "source": [{"type": "git", "uri": "https://github.com/djc/djc-overlay.git"}, {"type": "git", "uri": "git://github.com/djc/djc-overlay.git"}, {"type": "git", "uri": "git@github.com:djc/djc-overlay.git"}], "feed": ["https://github.com/djc/djc-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-25 13:21:27 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 1}, "dlang": {"quality": "experimental", "status": "unofficial", "name": "dlang", "description": {"en": "A collection of ebuilds related to the D programming\n language."}, "homepage": "https://github.com/gentoo/dlang", "owner": [{"type": "person", "email": "Marco.Leise@gmx.de"}], "source": [{"type": "git", "uri": "https://github.com/gentoo/dlang.git"}, {"type": "git", "uri": "git@github.com:gentoo/dlang.git"}, {"type": "git", "uri": "git://github.com/gentoo/dlang.git"}], "feed": ["https://github.com/gentoo/dlang/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-01-25 18:17:03 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 84}, "dm9pZCAq": {"quality": "experimental", "status": "unofficial", "name": "dm9pZCAq", "description": {"en": "personal overlay with different packages, mainly with packages with KISS mindset"}, "homepage": "https://notabug.org/dm9pZCAq/dm9pZCAq-overlay", "owner": [{"type": "person", "email": "v@0x0c.xyz", "name": "dm9pZCAq"}], "source": [{"type": "git", "uri": "https://notabug.org/dm9pZCAq/dm9pZCAq-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-16 13:33:08 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 36}, "dmchurch": {"quality": "experimental", "status": "unofficial", "name": "dmchurch", "description": {"en": "Danielle Church's Portage overlay"}, "homepage": "https://github.com/dmchurch/portage-overlay", "owner": [{"type": "person", "email": "dani.church@gmail.com", "name": "Danielle Church"}], "source": [{"type": "git", "uri": "https://github.com/dmchurch/portage-overlay.git"}, {"type": "git", "uri": "git://github.com/dmchurch/portage-overlay.git"}, {"type": "git", "uri": "git@github.com:dmchurch/portage-overlay.git"}], "feed": ["https://github.com/dmchurch/portage-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-01-25 12:30:43 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 3}, "dotnet": {"quality": "experimental", "status": "official", "name": "dotnet", "description": {"en": "Experimental overlay for .NET packages."}, "homepage": "https://github.com/gentoo/dotnet", "owner": [{"type": "project", "email": "dotnet@gentoo.org", "name": "Dotnet team"}], "source": [{"type": "git", "uri": "https://github.com/gentoo/dotnet.git"}, {"type": "git", "uri": "git@github.com:gentoo/dotnet.git"}], "feed": ["https://github.com/gentoo/dotnet/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-12 12:49:15 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 168}, "drdim": {"quality": "experimental", "status": "unofficial", "name": "drdim", "description": {"en": "Gentoo Layman portage repository for Jetbrains Products"}, "homepage": "https://github.com/drdim/layman", "owner": [{"type": "person", "email": "dr.dim.pro@gmail.com", "name": "Dmitriy Bogatkin"}], "source": [{"type": "git", "uri": "https://github.com/drdim/layman.git"}, {"type": "git", "uri": "git://github.com/drdim/layman.git"}, {"type": "git", "uri": "git@github.com:drdim/layman.git"}], "feed": ["https://github.com/drdim/layman/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2016-04-14 05:51:00 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 44}, "dwfreed": {"quality": "experimental", "status": "unofficial", "name": "dwfreed", "description": {"en": "My random Gentoo packages"}, "homepage": "https://bitbucket.org/dwfreed/dwfreed.gentoo/", "owner": [{"type": "person", "email": "dwfreed@mtu.edu", "name": "Douglas Freed"}], "source": [{"type": "git", "uri": "https://bitbucket.org/dwfreed/dwfreed.gentoo"}], "feed": ["https://bitbucket.org/dwfreed/dwfreed.gentoo/rss"], "x-state": "GOOD", "x-timestamp": "2017-04-09 01:17:09 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "dwosky": {"quality": "experimental", "status": "unofficial", "name": "dwosky", "description": {"en": "Dwosky's personal overlay"}, "homepage": "https://github.com/Dwosky/Dwosky-overlay", "owner": [{"type": "person", "email": "dwosky@pm.me", "name": "Pedro Arizmendi"}], "source": [{"type": "git", "uri": "https://github.com/Dwosky/Dwosky-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/Dwosky/Dwosky-overlay.git"}], "feed": ["https://github.com/Dwosky/Dwosky-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-01 10:31:05 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "earshark": {"quality": "experimental", "status": "unofficial", "name": "earshark", "description": {"en": "personal overlay, mostly games related"}, "homepage": "https://github.com/Chemrat/overlay", "owner": [{"type": "person", "email": "jazzvoid@gmail.com", "name": "Valeriy"}], "source": [{"type": "git", "uri": "https://github.com/Chemrat/overlay.git"}, {"type": "git", "uri": "git://github.com/Chemrat/overlay.git"}], "feed": ["https://github.com/Chemrat/overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-02-10 13:07:00 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 30}, "eclipse": {"quality": "experimental", "status": "official", "name": "eclipse", "description": {"en": "Community effort at packaging Eclipse Java SDK"}, "homepage": "https://github.com/gentoo/eclipse-overlay", "owner": [{"type": "project", "email": "eclipse@gentoo.org", "name": "Eclipse team"}], "source": [{"type": "git", "uri": "https://github.com/gentoo/eclipse-overlay.git"}, {"type": "git", "uri": "git://github.com/gentoo/eclipse-overlay.git"}, {"type": "git", "uri": "git@github.com:gentoo/eclipse-overlay.git"}], "feed": ["https://github.com/gentoo/eclipse-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2017-06-24 14:34:45 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 13}, "edgets": {"quality": "experimental", "status": "unofficial", "name": "edgets", "description": {"en": "Gentoo overlay that brings you the newest versions of modern software."}, "homepage": "https://github.com/BlueManCZ/edgets", "owner": [{"type": "person", "email": "ivo97@centrum.cz", "name": "Ivo \u0160merek"}], "source": [{"type": "git", "uri": "https://github.com/BlueManCZ/edgets.git"}, {"type": "git", "uri": "git+ssh://git@github.com/BlueManCZ/edgets.git"}], "feed": ["https://github.com/BlueManCZ/edgets/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-16 08:06:57 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 83}, "eigenlay": {"quality": "experimental", "status": "unofficial", "name": "eigenlay", "description": {"en": "Eigenlab Gentoo overlay"}, "homepage": "https://gitlab.com/eigennet/eigenlay", "owner": [{"type": "person", "email": "gio@eigenlab.org", "name": "Gioacchino Mazzurco"}], "source": [{"type": "git", "uri": "https://gitlab.com/eigennet/eigenlay.git"}], "x-state": "GOOD", "x-timestamp": "2020-04-01 16:18:39 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 16}, "einflay": {"quality": "experimental", "status": "unofficial", "name": "einflay", "description": {"en": "Personal overlay"}, "homepage": "https://github.com/EinstokFair/einflay", "owner": [{"type": "person", "email": "einfair@zoho.eu", "name": "Einstok Fair"}], "source": [{"type": "git", "uri": "https://github.com/EinstokFair/einflay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/EinstokFair/einflay.git"}], "feed": ["https://github.com/EinstokFair/einflay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-07 19:16:56 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 31}, "ejabberd": {"quality": "experimental", "status": "unofficial", "name": "ejabberd", "description": {"en": "Fresh ejabberd versions and dependencies"}, "homepage": "https://github.com/rion-overlay/ejabberd-overlay", "owner": [{"type": "person", "email": "rion4ik@gmail.com", "name": "Sergey Ilinykh"}], "source": [{"type": "git", "uri": "https://github.com/rion-overlay/ejabberd-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/rion-overlay/ejabberd-overlay.git"}], "feed": ["https://github.com/rion-overlay/ejabberd-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-04-30 13:18:01 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 0}, "electron": {"quality": "experimental", "status": "unofficial", "name": "electron", "description": {"en": "Electron Overlay"}, "homepage": "https://github.com/elprans/electron-overlay", "owner": [{"type": "person", "email": "elvis@magic.io", "name": "Elvis Pranskevichus"}], "source": [{"type": "git", "uri": "https://github.com/elprans/electron-overlay.git"}], "feed": ["https://github.com/elprans/electron-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-08 14:02:03 -0800\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 7}, "elementary": {"quality": "experimental", "status": "unofficial", "name": "elementary", "description": {"en": "The elementary OS experience for Gentoo Linux. "}, "homepage": "https://github.com/pimvullers/elementary", "owner": [{"type": "person", "email": "gentoo.org@vullersmail.nl", "name": "Pim Vullers"}], "source": [{"type": "git", "uri": "https://github.com/pimvullers/elementary.git"}, {"type": "git", "uri": "git://github.com/pimvullers/elementary.git"}], "feed": ["https://github.com/pimvullers/elementary/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2020-12-28 21:04:05 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 118}, "elopez-r-overlay": {"quality": "experimental", "status": "unofficial", "name": "elopez-r-overlay", "description": {"en": "My Gentoo overlay for Ebuilds"}, "homepage": "https://gitlab.com/libre_hackerman/elopez-r-overlay", "owner": [{"type": "person", "email": "gnu_stallman@protonmail.ch", "name": "Esteban L\u00f3pez Rodr\u00edguez"}], "source": [{"type": "git", "uri": "https://gitlab.com/libre_hackerman/elopez-r-overlay.git"}, {"type": "git", "uri": "git+ssh://git@gitlab.com:libre_hackerman/elopez-r-overlay.git"}], "feed": ["https://gitlab.com/libre_hackerman/elopez-r-overlay/-/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-25 18:22:12 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 40}, "emacs": {"quality": "experimental", "status": "official", "name": "emacs", "description": {"en": "Provide Emacs and XEmacs related ebuilds which are\n experimental or work-in-progress. Don't rely on them, but don't\n hesitate to file bugs or write emails."}, "homepage": "https://wiki.gentoo.org/wiki/Project:Emacs/Overlay", "owner": [{"type": "project", "email": "emacs@gentoo.org", "name": "Gentoo Emacs team"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/proj/emacs.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/repo/proj/emacs.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/proj/emacs.git"}], "feed": ["https://cgit.gentoo.org/repo/proj/emacs.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-03-16 13:28:06 +0100\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 33}, "enlightenment-live": {"quality": "experimental", "status": "unofficial", "name": "enlightenment-live", "description": {"en": "Enlightenment WM latest stable version and live ebuilds"}, "homepage": "https://github.com/rafspiny/enlightenment-live", "owner": [{"type": "person", "email": "rafspiny@gmail.com", "name": "Raffaele Spinelli"}], "source": [{"type": "git", "uri": "https://github.com/rafspiny/enlightenment-live.git"}], "feed": ["https://github.com/rafspiny/enlightenment-live/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-13 13:34:34 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 22}, "ennui": {"quality": "experimental", "status": "unofficial", "name": "ennui", "description": {"en": "Facilitate running hardened-desktop hybrid system"}, "homepage": "https://gitweb.gentoo.org/user/ennui.git/", "owner": [{"type": "person", "email": "gentoo@seaofdirac.net", "name": "Nicholas Fish"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/ennui.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/ennui.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/ennui.git"}], "feed": ["https://gitweb.gentoo.org/user/ennui.git/atom/"], "x-state": "BAD_CACHE", "x-timestamp": "2020-04-17 23:15:42 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 35}, "equaeghe": {"quality": "experimental", "status": "unofficial", "name": "equaeghe", "description": {"en": "Erik Quaeghebeur's personal Gentoo overlay"}, "homepage": "https://github.com/equaeghe/gentoo-overlay/", "owner": [{"type": "person", "email": "gentoo@e3q.eu", "name": "Erik Quaeghebeur"}], "source": [{"type": "git", "uri": "https://github.com/equaeghe/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/equaeghe/gentoo-overlay.git"}], "feed": ["https://github.com/equaeghe/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-01-29 13:12:56 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 11}, "erayd": {"quality": "experimental", "status": "unofficial", "name": "erayd", "description": {"en": "Various personal ebuilds"}, "homepage": "https://github.com/erayd/overlay", "owner": [{"type": "person", "email": "steve@erayd.net", "name": "Steve Gilberd"}], "source": [{"type": "git", "uri": "https://github.com/erayd/overlay.git"}, {"type": "git", "uri": "git://github.com/erayd/overlay.git"}, {"type": "git", "uri": "git@github.com:erayd/overlay.git"}], "feed": ["https://github.com/erayd/overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-07-20 17:20:54 +1200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 9}, "escpr2": {"quality": "experimental", "status": "unofficial", "name": "escpr2", "description": {"en": "EPSON ESCPR2 inkjet printer repository"}, "homepage": "https://gitlab.com/at.gentoo.repo/epson-inkjet-printer-escpr2", "owner": [{"type": "person", "email": "andreas.thalhammer@linux.com", "name": "Andreas Thalhammer"}], "source": [{"type": "git", "uri": "https://gitlab.com/at.gentoo.repo/epson-inkjet-printer-escpr2.git"}], "feed": ["https://gitlab.com/at.gentoo.repo/epson-inkjet-printer-escpr2/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-15 07:38:57 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "ethereum": {"quality": "experimental", "status": "unofficial", "name": "ethereum", "description": {"en": "The Ethereum blockchain-based distributed computing platform"}, "homepage": "https://github.com/coolparadox/ethereum-gentoo-overlay", "owner": [{"type": "person", "email": "coolparadox@gmail.com", "name": "Rafael Lorandi"}], "source": [{"type": "git", "uri": "https://github.com/coolparadox/ethereum-gentoo-overlay.git"}, {"type": "git", "uri": "git@github.com:coolparadox/ethereum-gentoo-overlay.git"}], "feed": ["https://github.com/coolparadox/ethereum-gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-11-07 16:42:19 -0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 6}, "eugene-bright": {"quality": "experimental", "status": "unofficial", "name": "eugene-bright", "description": {"en": "The personal overlay of Eugene Bright"}, "homepage": "https://github.com/eugene-bright/eugene-bright-overlay", "owner": [{"type": "person", "email": "eugene@bright.gdn", "name": "Eugene Bright"}], "source": [{"type": "git", "uri": "https://github.com/eugene-bright/eugene-bright-overlay.git"}, {"type": "git", "uri": "git@github.com:eugene-bright/eugene-bright-overlay.git"}], "feed": ["https://github.com/eugene-bright/eugene-bright-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-08-18 15:35:56 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "ext-devlibs": {"quality": "experimental", "status": "unofficial", "name": "ext-devlibs", "description": {"en": "Mostly c/c++ and python libraries"}, "homepage": "https://gitlab.com/extsidvind/ext-devlibs", "owner": [{"type": "person", "email": "ext@sidvind.com", "name": "David Sveningsson"}], "source": [{"type": "git", "uri": "https://gitlab.com/extsidvind/ext-devlibs.git"}, {"type": "git", "uri": "git@gitlab.com:extsidvind/ext-devlibs.git"}], "feed": ["https://gitlab.com/extsidvind/ext-devlibs/-/commits/master?format=atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-02-01 09:41:48 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 22}, "farmboy0": {"quality": "experimental", "status": "unofficial", "name": "farmboy0", "description": {"en": "Personal overlay of Enrico Horn"}, "homepage": "https://github.com/farmboy0/portage-overlay", "owner": [{"type": "person", "email": "farmboy0@googlemail.com", "name": "Enrico Horn"}], "source": [{"type": "git", "uri": "https://github.com/farmboy0/portage-overlay.git"}, {"type": "git", "uri": "git://github.com/farmboy0/portage-overlay.git"}, {"type": "git", "uri": "git@github.com:farmboy0/portage-overlay.git"}], "feed": ["https://github.com/farmboy0/portage-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-07 20:36:17 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 33}, "fem-overlay": {"quality": "experimental", "status": "unofficial", "name": "fem-overlay", "description": {"en": "FeM Gentoo Overlay"}, "homepage": "https://bitbucket.fem.tu-ilmenau.de/projects/GENTOO/repos/fem-overlay/", "owner": [{"type": "person", "email": "frainz@mailbox.org", "name": "Paul Michel"}], "source": [{"type": "git", "uri": "https://bitbucket.fem.tu-ilmenau.de/scm/gentoo/fem-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-15 19:16:20 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 123}, "ferki": {"quality": "experimental", "status": "unofficial", "name": "ferki", "description": {"en": "Ebuilds used and/or proxy maintained by FErki"}, "homepage": "https://github.com/ferki/gentoo-overlay", "owner": [{"type": "person", "email": "erkiferenc@gmail.com", "name": "Ferenc Erki"}], "source": [{"type": "git", "uri": "https://github.com/ferki/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/ferki/gentoo-overlay.git"}], "feed": ["https://github.com/ferki/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-05 23:05:41 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 23}, "fidonet": {"quality": "experimental", "status": "unofficial", "name": "fidonet", "description": {"en": "Overlay of Benny Pedersen"}, "owner": [{"type": "person", "email": "me@junc.org", "name": "Benny Pedersen"}], "source": [{"type": "rsync", "uri": "rsync://fidonet.overlay.junc.org/fidonet/"}], "x-state": "GOOD", "x-timestamp": "2020-11-21 13:15:46.000000000 +0000\n", "x-masters": ["gentoo"], "x-ebuild-count": 26}, "fkmclane": {"quality": "experimental", "status": "unofficial", "name": "fkmclane", "description": {"en": "Personal overlay of fkmclane containing patched ebuilds and new ebuilds"}, "homepage": "https://github.com/fkmclane/overlay", "owner": [{"type": "person", "email": "fkmclane@gmail.com", "name": "Foster McLane"}], "source": [{"type": "git", "uri": "https://github.com/fkmclane/overlay.git"}, {"type": "git", "uri": "git://github.com/fkmclane/overlay.git"}], "feed": ["https://github.com/fkmclane/overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2020-04-28 18:35:22 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 90}, "flammie": {"quality": "experimental", "status": "unofficial", "name": "flammie", "description": {"en": "An overlay for gentoo for things Flammie's worked on: Apertium, HFST, computational linguistics, spell-checking, obscure languages..."}, "homepage": "https://github.com/flammie/flammie-overlay", "owner": [{"type": "person", "email": "flammie@gentoo.org", "name": "Flammie Pirinen"}], "source": [{"type": "git", "uri": "https://github.com/flammie/flammie-overlay.git"}, {"type": "git", "uri": "git://github.com/flammie/flammie-overlay.git"}], "feed": ["https://github.com/flammie/flammie-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-26 14:35:44 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 26}, "flavour": {"quality": "experimental", "status": "unofficial", "name": "flavour", "description": {"en": "Personal overlay of Wim Muskee"}, "homepage": "https://github.com/wimmuskee/flavour", "owner": [{"type": "person", "email": "wimmuskee@gmail.com", "name": "Wim Muskee"}], "source": [{"type": "git", "uri": "https://github.com/wimmuskee/flavour.git"}, {"type": "git", "uri": "git://github.com/wimmuskee/flavour.git"}], "x-state": "GOOD", "x-timestamp": "2021-02-23 05:51:17 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 47}, "flewkey-overlay": {"quality": "experimental", "status": "unofficial", "name": "flewkey-overlay", "description": {"en": "Personal Gentoo overlay for flewkey"}, "homepage": "https://git.sdf.org/flewkey/flewkey-overlay", "owner": [{"type": "person", "email": "flewkey@2a03.party", "name": "Ryan Fox"}], "source": [{"type": "git", "uri": "https://git.sdf.org/flewkey/flewkey-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-15 07:11:45 +0000\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 118}, "flightsim": {"quality": "experimental", "status": "unofficial", "name": "flightsim", "description": {"en": "Overlay with packages for flight simulation, mainly related to X-Plane"}, "homepage": "https://github.com/rafaelmartins/flightsim-overlay", "owner": [{"type": "person", "email": "rafaelmartins@gentoo.org", "name": "Rafael G. Martins"}], "source": [{"type": "git", "uri": "https://github.com/rafaelmartins/flightsim-overlay.git"}, {"type": "git", "uri": "git://github.com/rafaelmartins/flightsim-overlay.git"}, {"type": "git", "uri": "git@github.com:rafaelmartins/flightsim-overlay.git"}], "feed": ["https://github.com/rafaelmartins/flightsim-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2017-05-07 01:00:51 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "floppym": {"quality": "experimental", "status": "unofficial", "name": "floppym", "description": {"en": "floppym's personal overlay"}, "homepage": "https://github.com/floppym/floppym", "owner": [{"type": "person", "email": "floppym@gentoo.org", "name": "Mike Gilbert"}], "source": [{"type": "git", "uri": "https://github.com/floppym/floppym"}], "x-state": "GOOD", "x-timestamp": "2021-01-11 17:41:02 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "flow": {"quality": "experimental", "status": "unofficial", "name": "flow", "description": {"en": "Ebuilds by Florian Schmaus"}, "homepage": "https://gitlab.com/Flow/flow-s-ebuilds", "owner": [{"type": "person", "email": "flo@geekplace.eu", "name": "Florian Schmaus"}], "source": [{"type": "git", "uri": "https://gitlab.com/Flow/flow-s-ebuilds.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-10 15:29:56 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 100}, "flussence": {"quality": "experimental", "status": "unofficial", "name": "flussence", "description": {"en": "Ant P.'s personal overlay"}, "homepage": "https://repo.or.cz/flussence-overlay.git", "owner": [{"type": "person", "email": "ant+gentoo.bugs@flussence.eu", "name": "Anthony Parsons"}], "source": [{"type": "git", "uri": "https://repo.or.cz/flussence-overlay.git"}, {"type": "git", "uri": "git://repo.or.cz/flussence-overlay.git"}, {"type": "git", "uri": "ssh://git@repo.or.cz/flussence-overlay.git"}], "feed": ["https://repo.or.cz/flussence-overlay.git/atom"], "x-state": "GOOD", "x-timestamp": "2021-03-15 22:42:25 +0000\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 50}, "fol4": {"quality": "experimental", "status": "unofficial", "name": "fol4", "description": {"en": "fol4 overlay"}, "homepage": "https://gitlab.com/madsl/fol4", "owner": [{"type": "person", "email": "mads@ab3.no", "name": "Mads"}], "source": [{"type": "git", "uri": "https://gitlab.com/madsl/fol4"}, {"type": "git", "uri": "git+ssh://git@gitlab.com/madsl/fol4.git"}], "feed": ["https://gitlab.com/madsl/fol4/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-16 14:31:36 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 55}, "foo-overlay": {"quality": "experimental", "status": "unofficial", "name": "foo-overlay", "description": {"en": "Piotr's fixes and new packages"}, "homepage": "https://github.com/slashbeast/foo-overlay", "owner": [{"type": "person", "email": "slashbeast@gentoo.org", "name": "Piotr Karbowski"}], "source": [{"type": "git", "uri": "git://github.com/slashbeast/foo-overlay.git"}, {"type": "git", "uri": "https://github.com/slashbeast/foo-overlay.git"}], "feed": ["https://github.com/slashbeast/foo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-01-19 16:39:22 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 12}, "fordfrog": {"quality": "experimental", "status": "official", "name": "fordfrog", "description": {"en": "Developer overlay"}, "homepage": "https://cgit.gentoo.org/dev/fordfrog.git/", "owner": [{"type": "person", "email": "fordfrog@gentoo.org", "name": "Miroslav \u0160ulc"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/fordfrog.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/fordfrog.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/fordfrog.git"}], "feed": ["https://cgit.gentoo.org/dev/fordfrog.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-03-14 09:45:31 +0100\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 286}, "fowlay": {"quality": "experimental", "status": "unofficial", "name": "fowlay", "description": {"en": "Collection of ebuilds"}, "homepage": "https://github.com/fowlay/fowlay-overlay", "owner": [{"type": "person", "email": "rabbe@bahnhof.se", "name": "Rabbe Fogelholm"}], "source": [{"type": "git", "uri": "https://github.com/fowlay/fowlay-overlay.git"}], "feed": ["https://github.com/fowlay/fowlay-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2018-04-07 14:41:09 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 1}, "foxiverlay": {"quality": "experimental", "status": "unofficial", "name": "foxiverlay", "description": {"en": "Personal overlay for unofficial ebuilds"}, "homepage": "https://github.com/Pekkari/foxiverlay", "owner": [{"type": "person", "email": "koalinux@gmail.com", "name": "Jos\u00e9 Pekkarinen"}], "source": [{"type": "git", "uri": "https://github.com/Pekkari/foxiverlay.git"}, {"type": "git", "uri": "git://github.com/Pekkari/foxiverlay.git"}, {"type": "git", "uri": "git@github.com:Pekkari/foxiverlay.git"}], "feed": ["https://github.com/Pekkari/foxiverlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-03 16:19:16 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "fritteli": {"quality": "experimental", "status": "unofficial", "name": "fritteli", "description": {"en": "fritteli's Gentoo Overlay"}, "homepage": "https://github.com/fritteli/gentoo-overlay", "owner": [{"type": "person", "email": "manuel@fritteli.ch", "name": "Manuel Friedli"}], "source": [{"type": "git", "uri": "https://github.com/fritteli/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/fritteli/gentoo-overlay.git"}], "feed": ["https://github.com/fritteli/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-08 15:55:27 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 45}, "frr-gentoo": {"quality": "stable", "status": "official", "name": "frr-gentoo", "description": {"en": "Free Range Routing Gentoo Overlay"}, "homepage": "https://frrouting.org/", "owner": [{"type": "person", "email": "f0o@devilcode.org", "name": "Daniel 'f0o' Preussker"}], "source": [{"type": "git", "uri": "https://github.com/FRRouting/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com:FRRouting/gentoo-overlay.git"}], "feed": ["https://github.com/FRRouting/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-12-01 08:18:20 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 47}, "fusion809": {"quality": "experimental", "status": "unofficial", "name": "fusion809", "description": {"en": "Brenton's Portage overlay"}, "homepage": "https://github.com/fusion809/fusion809-overlay", "owner": [{"type": "person", "email": "brentonhorne77@gmail.com", "name": "Brenton Horne"}], "source": [{"type": "git", "uri": "https://github.com/fusion809/fusion809-overlay.git"}, {"type": "git", "uri": "git://github.com/fusion809/fusion809-overlay.git"}], "feed": ["https://github.com/fusion809/fusion809-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-16 08:50:55 +1000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 9}, "fuverlay": {"quality": "experimental", "status": "unofficial", "name": "fuverlay", "description": {"en": "Funkill's overlay"}, "homepage": "https://github.com/funkill/fuverlay", "owner": [{"type": "person", "email": "funkill2@gmail.com", "name": "Funkill"}], "source": [{"type": "git", "uri": "https://github.com/funkill/fuverlay.git"}], "feed": ["https://github.com/funkill/fuverlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2019-02-03 01:49:12 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 6}, "gamarouns": {"quality": "experimental", "status": "unofficial", "name": "gamarouns", "description": {"en": "Bits and pieces missing in gentoo or layman repos I need"}, "homepage": "https://github.com/Amaroun/gamarouns", "owner": [{"type": "person", "email": "vit.kasal@gmail.com", "name": "amaroun"}], "source": [{"type": "git", "uri": "https://github.com/Amaroun/gamarouns.git"}], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-08 11:12:23 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 52}, "gambas-overlay": {"quality": "experimental", "status": "unofficial", "name": "gambas-overlay", "description": {"en": "Gambas IDE overlay for Gentoo Linux"}, "homepage": "https://github.com/damex/gambas-overlay", "owner": [{"type": "person", "email": "damex.pp@gmail.com", "name": "Roman Kuzmitsky"}], "source": [{"type": "git", "uri": "https://github.com/damex/gambas-overlay.git"}], "feed": ["https://github.com/damex/gambas-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2016-02-10 01:31:50 +0700\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 0}, "gamerlay": {"quality": "experimental", "status": "unofficial", "name": "gamerlay", "description": {"en": "\n Gamers overlay for all various games. Not related with games team.\n "}, "homepage": "https://cgit.gentoo.org/proj/gamerlay.git", "owner": [{"type": "person", "email": "mva@gentoo.org", "name": "Vadim A. Misbakh-Soloviov"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/gamerlay.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/gamerlay.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/gamerlay.git"}], "feed": ["https://cgit.gentoo.org/proj/gamerlay.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-02-24 22:32:19 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 103}, "gcarq": {"quality": "experimental", "status": "unofficial", "name": "gcarq", "description": {"en": "Personal overlay"}, "homepage": "https://github.com/gcarq/gcarq-overlay", "owner": [{"type": "person", "email": "michael.egger@tsn.at", "name": "Michael Egger"}], "source": [{"type": "git", "uri": "https://github.com/gcarq/gcarq-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/gcarq/gcarq-overlay.git"}], "feed": ["https://github.com/gcarq/gcarq-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-28 18:54:56 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 8}, "genthree": {"quality": "experimental", "status": "unofficial", "name": "genthree", "description": {"en": "Gentoo overlay from the genthree project"}, "homepage": "https://genthree.io/overlay", "owner": [{"type": "person", "email": "nyronium@genthree.io", "name": "nyronium"}], "source": [{"type": "git", "uri": "https://gitlab.com/genthree/overlay.git"}], "feed": ["https://gitlab.com/genthree/overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2020-04-18 16:27:50 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 48}, "gentoo": {"quality": "core", "status": "official", "name": "gentoo", "description": {"en": "Official Gentoo ebuild repository"}, "homepage": "https://gentoo.org/", "owner": [{"type": "project", "email": "bug-wranglers@gentoo.org"}], "source": [{"type": "rsync", "uri": "rsync://rsync.gentoo.org/gentoo-portage"}, {"type": "git", "uri": "https://anongit.gentoo.org/git/repo/gentoo.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/repo/gentoo.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/gentoo.git"}], "feed": ["https://cgit.gentoo.org/repo/gentoo.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-03-16 17:42:26 +0100\n", "x-openpgp-signed": "U", "x-masters": [], "x-ebuild-count": 29454}, "gentoo-bootstrap": {"quality": "experimental", "status": "unofficial", "name": "gentoo-bootstrap", "description": {"en": "Overlay providing packages to bootstrap OpenJDK and Rust"}, "homepage": "https://gitlab.com/stikonas/gentoo-bootstrap", "owner": [{"type": "person", "email": "andrius@stikonas.eu", "name": "Andrius \u0160tikonas"}], "source": [{"type": "git", "uri": "https://gitlab.com/stikonas/gentoo-bootstrap.git"}, {"type": "git", "uri": "git+ssh://git@gitlab.com:stikonas/gentoo-bootstrap.git"}], "x-state": "GOOD", "x-timestamp": "2020-11-13 21:17:12 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 48}, "gentoo-clang": {"quality": "experimental", "status": "unofficial", "name": "gentoo-clang", "description": {"en": "Gentoo overlay providing patches to build entire system with clang"}, "homepage": "https://github.com/BilyakA/gentoo-clang", "owner": [{"type": "person", "email": "bilyak.alexander@gmail.com", "name": "Alexander Bilyak"}], "source": [{"type": "git", "uri": "https://github.com/BilyakA/gentoo-clang.git"}, {"type": "git", "uri": "git://github.com/BilyakA/gentoo-clang.git"}, {"type": "git", "uri": "git@github.com:BilyakA/gentoo-clang.git"}], "feed": ["https://github.com/BilyakA/gentoo-clang/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-05-29 09:13:01 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 12}, "gentoo-mate": {"quality": "experimental", "status": "official", "name": "gentoo-mate", "description": {"en": "Gentoo MATE Desktop Project Repo"}, "homepage": "https://wiki.gentoo.org/wiki/Project:MATE", "owner": [{"type": "project", "email": "mate@gentoo.org", "name": "MATE Desktop Project"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/gentoo-mate.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/gentoo-mate.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/gentoo-mate.git"}], "feed": ["https://cgit.gentoo.org/proj/gentoo-mate.git/atom/"], "x-state": "BAD_CACHE", "x-timestamp": "2020-09-07 22:21:22 -0400\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 173}, "gentoo-zh": {"quality": "experimental", "status": "unofficial", "name": "gentoo-zh", "description": {"en": "To provide programs useful to Chinese speaking users (merged\n from gentoo-china and gentoo-taiwan)."}, "homepage": "https://github.com/microcai/gentoo-zh", "owner": [{"type": "person", "email": "microcai@fedoraproject.org"}], "source": [{"type": "git", "uri": "git://github.com/microcai/gentoo-zh.git"}], "feed": ["https://github.com/microcai/gentoo-zh/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-16 19:20:11 +0800\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 290}, "gentoobr": {"quality": "experimental", "status": "unofficial", "name": "gentoobr", "description": {"en": "Overlay containing experimental packages developed\n by the brazilian community, with focus on providing programs useful to\n portuguese speaking users and introducing new people to contribute.", "pt": "Overlay contendo pacotes experimentais desenvolvidos\n pela comunidade brasileira, com foco em oferecer programas \u00fateis \u00e0 falantes\n da l\u00edngua portuguesa e em introduzir novas pessoas a contribuir."}, "homepage": "https://github.com/gentoobr/overlay", "owner": [{"type": "person", "email": "leonardohn@null.net", "name": "Leonardo Henrique Neumann"}], "source": [{"type": "git", "uri": "https://github.com/gentoobr/overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/gentoobr/overlay.git"}], "feed": ["https://github.com/gentoobr/overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-15 10:40:32 -0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 27}, "gerislay": {"quality": "experimental", "status": "unofficial", "name": "gerislay", "description": {"en": "A personal overlay with no specific focus (mainly to\n test ebuilds). Highly experimental. It is meant as a playground for me,\n but others might be interested."}, "homepage": "https://cgit.gentoo.org/repo/user/gerislay.git", "owner": [{"type": "person", "email": "gerion.entrup@flump.de", "name": "gerion"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/user/gerislay.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/user/gerislay.git"}], "feed": ["https://cgit.gentoo.org/repo/user/gerislay.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-02-24 22:52:03 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 34}, "gig": {"quality": "experimental", "status": "unofficial", "name": "gig", "description": {"en": "Gig OS's Overlay"}, "homepage": "https://github.com/Gig-OS/gig", "owner": [{"type": "person", "email": "yangmame@i2pmail.org"}], "source": [{"type": "git", "uri": "https://github.com/Gig-OS/gig.git"}], "feed": ["https://github.com/Gig-OS/gig/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-06 15:11:38 +0800\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 35}, "gitlab": {"quality": "experimental", "status": "unofficial", "name": "gitlab", "description": {"en": "Unofficial ebuilds for Gitlab"}, "homepage": "https://gitlab.awesome-it.de/overlays/gitlab", "owner": [{"type": "person", "email": "prote@fmi.uni-stuttgart.de", "name": "Horst Prote"}], "source": [{"type": "git", "uri": "https://gitlab.awesome-it.de/overlays/gitlab.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-15 10:12:31 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 61}, "glarbs-overlay": {"quality": "experimental", "status": "unofficial", "name": "glarbs-overlay", "description": {"en": "A Gentoo overlay used by GLARBS.", "sv": "Ett Gentoo \u00f6verl\u00e4gg som anv\u00e4nds av GLARBS."}, "homepage": "https://wiki.gentoo.org/wiki/User:Et-8/GLARBS", "owner": [{"type": "person", "email": "et-8@emiliatrollros.se", "name": "Emilia Trollros"}], "source": [{"type": "git", "uri": "https://gitlab.com/et-8/glarbs-overlay.git"}], "feed": ["https://gitlab.com/et-8/glarbs-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-11-22 19:46:06 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 21}, "gnome": {"quality": "experimental", "status": "official", "name": "gnome", "description": {"en": "experimental gnome ebuilds"}, "homepage": "https://cgit.gentoo.org/proj/gnome.git/", "owner": [{"type": "project", "email": "gnome@gentoo.org", "name": "GNOME team"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/gnome.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/gnome.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/gnome.git"}], "feed": ["https://cgit.gentoo.org/proj/gnome.git/atom/"], "x-state": "BAD_CACHE", "x-timestamp": "2021-01-30 22:02:41 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 111}, "gnome-next": {"quality": "experimental", "status": "unofficial", "name": "gnome-next", "description": {"en": "experimental newer gnome ebuilds"}, "homepage": "https://github.com/Heather/gentoo-gnome", "owner": [{"type": "person", "email": "cynede@gentoo.org", "name": "Mikhail Pukhlikov"}], "source": [{"type": "git", "uri": "https://github.com/Heather/gentoo-gnome.git"}, {"type": "git", "uri": "git@github.com:Heather/gentoo-gnome.git"}], "feed": ["https://github.com/Heather/gentoo-gnome/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-02-04 10:43:15 +0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 191}, "gnuradio": {"quality": "experimental", "status": "unofficial", "name": "gnuradio", "description": {"en": "A repository for GNURadio packages/addons"}, "homepage": "https://github.com/hololeap/gentoo-gnuradio", "owner": [{"type": "person", "email": "hololeap@gmail.com"}], "source": [{"type": "git", "uri": "https://github.com/hololeap/gentoo-gnuradio"}], "feed": ["https://github.com/hololeap/gentoo-gnuradio/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-15 20:24:11 -0700\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 128}, "gnustep": {"quality": "experimental", "status": "official", "name": "gnustep", "description": {"en": "Experimental ebuilds for GNUstep packages in Gentoo. Comments and bugreports are welcome!"}, "homepage": "https://cgit.gentoo.org/proj/gnustep.git/", "owner": [{"type": "project", "email": "gnustep@gentoo.org"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/gnustep.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/gnustep.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/gnustep.git"}], "feed": ["https://cgit.gentoo.org/proj/gnustep.git/atom/"], "x-state": "GOOD", "x-timestamp": "2019-01-14 17:11:46 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "gnux32": {"quality": "experimental", "status": "unofficial", "name": "gnux32", "description": {"en": "A personal overlay with ebuilds for the x32 ABI"}, "homepage": "https://github.com/1camper/gnux32", "owner": [{"type": "person", "email": "theonetruecamper@gmx.de", "name": "Matthias R\u00e4ncker"}], "source": [{"type": "git", "uri": "https://github.com/1camper/gnux32.git"}, {"type": "git", "uri": "git://github.com/1camper/gnux32.git"}], "feed": ["https://github.com/1camper/gnux32/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2020-05-24 11:36:38 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 82}, "go-overlay": {"quality": "experimental", "status": "unofficial", "name": "go-overlay", "description": {"en": "Golang related ebuilds"}, "homepage": "https://github.com/Dr-Terrible/go-overlay", "owner": [{"type": "person", "email": "toffanin.mauro@gmail.com", "name": "Mauro Toffanin"}], "source": [{"type": "git", "uri": "https://github.com/Dr-Terrible/go-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2021-01-27 21:38:55 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 241}, "godin": {"quality": "experimental", "status": "unofficial", "name": "godin", "description": {"en": "Godin's Gentoo Overlay"}, "homepage": "https://github.com/Godin/gentoo-overlay", "owner": [{"type": "person", "email": "mandrikov@gmail.com", "name": "Evgeny Mandrikov"}], "source": [{"type": "git", "uri": "https://github.com/Godin/gentoo-overlay.git"}, {"type": "git", "uri": "git://github.com/Godin/gentoo-overlay.git"}], "feed": ["https://github.com/Godin/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-02-20 12:08:54 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 14}, "goduck777": {"quality": "experimental", "status": "unofficial", "name": "goduck777", "description": {"en": "Personal overlay containing some not-so-popular apps"}, "homepage": "https://github.com/goduck777/gentoo-overlay", "owner": [{"type": "person", "email": "goduck777@gmail.com", "name": "Chang Liu"}], "source": [{"type": "git", "uri": "https://github.com/goduck777/gentoo-overlay.git"}, {"type": "git", "uri": "git://github.com/goduck777/gentoo-overlay.git"}, {"type": "git", "uri": "git@github.com:goduck777/gentoo-overlay.git"}], "feed": ["https://github.com/Godin/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-12-16 23:07:27 -0500\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 3}, "goris": {"quality": "experimental", "status": "unofficial", "name": "goris", "description": {"en": "Goris overlay"}, "homepage": "https://cgit.gentoo.org/repo/user/goris.git/", "owner": [{"type": "person", "email": "norayr.am@gmail.com", "name": "Norayr Mirakyan"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/user/goris.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/repo/user/goris.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/user/goris.git"}], "feed": ["https://cgit.gentoo.org/repo/user/goris.git/atom/"], "x-state": "GOOD", "x-timestamp": "2015-10-16 19:37:55 +0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 8}, "graaff": {"quality": "experimental", "status": "official", "name": "graaff", "description": {"en": "Developer overlay of Hans de Graaff with mostly ruby and\n xemacs ebuilds, and a few assorted other goodies."}, "homepage": "http://moving-innovations.com/blog/", "owner": [{"type": "person", "email": "graaff@gentoo.org", "name": "Hans de Graaff"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/graaff.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/graaff.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/graaff.git"}], "feed": ["https://cgit.gentoo.org/dev/graaff.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-03-15 06:58:52 +0100\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 424}, "griffon_overlay": {"quality": "experimental", "status": "unofficial", "name": "griffon_overlay", "description": {"en": "Personal overlay of GriffOn Yi"}, "homepage": "https://github.com/windfail/griffon_overlay", "owner": [{"type": "person", "email": "yily_101@163.com", "name": "GriffOn Yi"}], "source": [{"type": "git", "uri": "https://github.com/windfail/griffon_overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/windfail/griffon_overlay.git"}], "feed": ["https://github.com/windfail/griffon_overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-03 20:29:59 +0800\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "grub2-themes": {"quality": "experimental", "status": "official", "name": "grub2-themes", "description": {"en": "Overlay dedicated to Grub2 themes (of any distribution)"}, "homepage": "https://gitweb.gentoo.org/repo/proj/grub2-themes.git/", "owner": [{"type": "person", "email": "sping@gentoo.org", "name": "Sebastian Pipping"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/proj/grub2-themes.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/proj/grub2-themes.git"}], "feed": ["https://gitweb.gentoo.org/repo/proj/grub2-themes.git/atom/?h=master"], "x-state": "GOOD", "x-timestamp": "2015-07-19 17:38:24 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 24}, "gsview-overlay": {"quality": "experimental", "status": "unofficial", "name": "gsview-overlay", "description": {"en": "Overlay for the gsview and some other plotting/scientific soft"}, "homepage": "https://github.com/uleysky/gsview-overlay", "owner": [{"type": "person", "email": "uleysky@gmail.com", "name": "Michael Uleysky"}], "source": [{"type": "git", "uri": "https://github.com/uleysky/gsview-overlay.git"}, {"type": "git", "uri": "git://github.com/uleysky/gsview-overlay.git"}, {"type": "git", "uri": "git@github.com:uleysky/gsview-overlay.git"}], "feed": ["https://github.com/uleysky/gsview-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-21 12:19:15 +1000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 12}, "guru": {"quality": "experimental", "status": "official", "name": "guru", "description": {"en": "GURU: Ebuild repository entirely maintained by Gentoo users"}, "homepage": "https://wiki.gentoo.org/wiki/Project:GURU", "owner": [{"type": "project", "email": "guru@gentoo.org", "name": "GURU"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/proj/guru.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/proj/guru.git"}], "feed": ["https://cgit.gentoo.org/repo/proj/guru.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-03-16 14:16:30 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 934}, "haarp": {"quality": "experimental", "status": "unofficial", "name": "haarp", "description": {"en": "misc ebuilds that aren't in the main tree"}, "homepage": "https://cgit.gentoo.org/user/haarp.git/", "owner": [{"type": "person", "email": "main.haarp@gmail.com", "name": "haarp"}], "source": [{"type": "git", "uri": "git://anongit.gentoo.org/user/haarp.git"}], "x-state": "GOOD", "x-timestamp": "2021-02-24 22:31:40 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 44}, "hamper-overlay": {"quality": "experimental", "status": "unofficial", "name": "hamper-overlay", "description": {"en": "User overlay"}, "homepage": "https://github.com/hamper/hamper-overlay", "owner": [{"type": "person", "email": "hamper.nhs@gmail.com", "name": "Alexander Pilipenko"}], "source": [{"type": "git", "uri": "https://github.com/Hamper/hamper-overlay.git"}, {"type": "git", "uri": "git://github.com/hamper/hamper-overlay.git"}], "feed": ["https://github.com/hamper/hamper-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-02 05:01:47 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 18}, "han": {"quality": "experimental", "status": "unofficial", "name": "han", "description": {"en": "Han's personal ebuild repository"}, "homepage": "https://github.com/hanmertens/han-overlay", "owner": [{"type": "person", "email": "hanmertens@outlook.com", "name": "Han Mertens"}], "source": [{"type": "git", "uri": "https://github.com/hanmertens/han-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/hanmertens/han-overlay.git"}], "feed": ["https://github.com/hanmertens/han-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-10 08:31:16 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 9}, "hangul-typing": {"quality": "experimental", "status": "unofficial", "name": "hangul-typing", "description": {"en": "It contains hangul-typing tutors."}, "homepage": "https://gitlab.com/espresso.tiger/hangul-typing", "owner": [{"type": "person", "email": "espresso.tiger@gmail.com", "name": "espresso tiger"}], "source": [{"type": "git", "uri": "https://gitlab.com/espresso.tiger/hangul-typing.git"}, {"type": "git", "uri": "git+ssh://git@gitlab.com/espresso.tiger/hangul-typing.git"}], "feed": ["https://gitlab.com/espresso.tiger/hangul-typing/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2018-12-23 22:47:42 +0900\n", "x-openpgp-signed": "N", "x-masters": ["gentoo", "haskell"], "x-ebuild-count": 3}, "haskell": {"quality": "experimental", "status": "official", "name": "haskell", "description": {"en": "The Official Gentoo Haskell overlay."}, "homepage": "https://github.com/gentoo-haskell", "owner": [{"type": "project", "email": "haskell@gentoo.org"}], "source": [{"type": "git", "uri": "https://github.com/gentoo-haskell/gentoo-haskell.git"}, {"type": "git", "uri": "git://github.com/gentoo-haskell/gentoo-haskell.git"}, {"type": "git", "uri": "https://github.com/gentoo-haskell/gentoo-haskell.git"}], "feed": ["https://github.com/gentoo-haskell/gentoo-haskell/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-16 06:56:05 +1100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 2483}, "heindsight": {"quality": "experimental", "status": "unofficial", "name": "heindsight", "description": {"en": "heindsight's personal overlay"}, "homepage": "https://github.com/heindsight/gentoo_overlay", "owner": [{"type": "person", "email": "heindsight@kruger.dev", "name": "Heinrich Kruger"}], "source": [{"type": "git", "uri": "https://github.com/heindsight/gentoo_overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/heindsight/gentoo_overlay.git"}], "feed": ["https://github.com/heindsight/gentoo_overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-11-18 18:40:23 +0000\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 6}, "hering-overlay": {"quality": "experimental", "status": "unofficial", "name": "hering-overlay", "description": {"en": "Richard Hering's gentoo overlay"}, "homepage": "https://github.com/internethering/hering-overlay", "owner": [{"type": "person", "email": "richard@internethering.de", "name": "Richard Hering"}], "source": [{"type": "git", "uri": "https://github.com/internethering/hering-overlay.git"}], "feed": ["https://github.com/internethering/hering-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-02 13:33:06 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 47}, "hexedit-overlay": {"quality": "experimental", "status": "unofficial", "name": "hexedit-overlay", "description": {"en": "Ebuilds for infrastructure-related packages and my own projects"}, "homepage": "http://hexedit.me/gentoo/", "owner": [{"type": "person", "email": "hexedit@ifproject.ru", "name": "Timofey Negrebetsky"}], "source": [{"type": "git", "uri": "https://git.ifproject.ru/hexedit/gentoo-overlay.git"}], "x-timestamp-command": ["git", "log", "--format=%ci", "-1"], "x-openpgp-signature-command": ["git", "show", "-q", "--pretty=format:%G?", "HEAD"], "x-state": "SYNC_FAIL"}, "hibiscus": {"quality": "experimental", "status": "unofficial", "name": "hibiscus", "description": {"en": "Hibiscus homebanking overlay"}, "homepage": "https://cgit.gentoo.org/user/hibiscus.git/", "owner": [{"type": "person", "email": "gentoo@posteo.de", "name": "Fabian K\u00f6ster"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/hibiscus.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/hibiscus.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/hibiscus.git"}], "feed": ["https://cgit.gentoo.org/user/hibiscus.git/atom/"], "x-state": "GOOD", "x-timestamp": "2015-10-28 17:09:06 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 22}, "holgersson-overlay": {"quality": "experimental", "status": "unofficial", "name": "holgersson-overlay", "description": {"en": "Nils \"holgersson\" Freydank's personal overlay"}, "homepage": "https://git.holgersson.xyz", "owner": [{"type": "person", "email": "holgersson@posteo.de", "name": "Nils Freydank"}], "source": [{"type": "git", "uri": "https://git.holgersson.xyz/foss/holgersson-overlay"}], "x-state": "GOOD", "x-timestamp": "2021-03-14 20:23:40 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 36}, "hossie": {"quality": "experimental", "status": "unofficial", "name": "hossie", "description": {"en": "gentoo-overlay from hossie"}, "homepage": "https://git.hossie.de/projects/GEN/repos/gentoo-overlay/browse", "owner": [{"type": "person", "email": "hossie@hossie.de"}], "source": [{"type": "git", "uri": "https://git.hossie.de/scm/gen/gentoo-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2021-02-15 21:21:47 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 75}, "hotstoast": {"quality": "experimental", "status": "unofficial", "name": "hotstoast", "description": {"en": "Tom Hotston's personal overlay"}, "homepage": "https://github.com/TomHotston/hotstoast-overlay", "owner": [{"type": "person", "email": "hotston.tom@gmail.com", "name": "Tom Hotston"}], "source": [{"type": "git", "uri": "https://github.com/TomHotston/hotstoast-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/TomHotston/hotstoast-overlay.git"}], "feed": ["https://github.com/TomHotston/hotstoast-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-13 16:09:09 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 1}, "ikelos": {"quality": "experimental", "status": "unofficial", "name": "ikelos", "description": {"en": "Ikelos's hospice for broken and damaged ebuilds."}, "homepage": "https://cgit.gentoo.org/dev/ikelos.git/", "owner": [{"type": "person", "email": "ikelos@gentoo.org", "name": "Mike Auty"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/ikelos.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/ikelos.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/ikelos.git"}], "feed": ["https://cgit.gentoo.org/dev/ikelos.git/atom/"], "x-state": "BAD_CACHE", "x-timestamp": "2021-02-10 12:50:41 +0000\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 100}, "imaging": {"quality": "experimental", "status": "unofficial", "name": "imaging", "description": {"en": "Gentoo overlay for image processing and visualization"}, "homepage": "https://github.com/gerddie/gentoo-imaging", "owner": [{"type": "person", "email": "gw.fossdev@gmail.com"}], "source": [{"type": "git", "uri": "https://github.com/gerddie/gentoo-imaging.git"}], "x-state": "BAD_CACHE", "x-timestamp": "2020-10-24 10:31:27 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 35}, "interactive-fiction": {"quality": "experimental", "status": "unofficial", "name": "interactive-fiction", "description": {"en": "Packages for players and authors of interactive\n fiction"}, "owner": [{"type": "person", "email": "levertond@googlemail.com"}], "source": [{"type": "git", "uri": "git://repo.or.cz/gentoo-interactive-fiction.git"}], "feed": ["http://repo.or.cz/w/gentoo-interactive-fiction.git?a=rss"], "x-state": "BAD_CACHE", "x-timestamp": "2020-02-22 15:48:44 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 23}, "ixit": {"quality": "experimental", "status": "unofficial", "name": "ixit", "description": {"en": "iXit overlay"}, "homepage": "https://github.com/okias/ixit", "owner": [{"type": "person", "email": "david@ixit.cz", "name": "David Heidelberger"}], "source": [{"type": "git", "uri": "https://github.com/okias/ixit.git"}, {"type": "git", "uri": "git://github.com/okias/ixit.git"}, {"type": "git", "uri": "git@github.com:okias/ixit.git"}], "feed": ["https://github.com/okias/ixit/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-09-11 15:08:56 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 7}, "jacendi-overlay": {"quality": "experimental", "status": "unofficial", "name": "jacendi-overlay", "description": {"en": "id Software games overlay"}, "homepage": "https://bitbucket.org/jacendi/jacendi-overlay", "owner": [{"type": "person", "email": "jacendi@protonmail.com", "name": "Vladimir Gavrilov"}], "source": [{"type": "git", "uri": "https://bitbucket.org/jacendi/jacendi-overlay"}], "feed": ["https://bitbucket.org/jacendi/jacendi-overlay/atom"], "x-state": "GOOD", "x-timestamp": "2021-02-25 06:34:02 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 11}, "jamesbroadhead": {"quality": "experimental", "status": "unofficial", "name": "jamesbroadhead", "description": {"en": "James Broadhead's personal overlay and pre-sunrise testing ground"}, "homepage": "https://cgit.gentoo.org/user/jamesbroadhead.git/", "owner": [{"type": "person", "email": "jamesbroadhead@gmail.com", "name": "James Broadhead"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/jamesbroadhead.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/jamesbroadhead.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/jamesbroadhead.git"}], "feed": ["https://cgit.gentoo.org/user/jamesbroadhead.git/atom/"], "x-state": "GOOD", "x-timestamp": "2017-02-25 09:15:45 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 3}, "java": {"quality": "experimental", "status": "official", "name": "java", "description": {"en": "Java overlay"}, "homepage": "https://cgit.gentoo.org/proj/java.git/", "owner": [{"type": "project", "email": "java@gentoo.org", "name": "Gentoo Java team"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/java.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/java.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/java.git"}], "feed": ["https://cgit.gentoo.org/proj/java.git/atom/"], "x-state": "BAD_CACHE", "x-timestamp": "2021-02-15 09:36:31 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 137}, "jboro-overlay": {"quality": "experimental", "status": "unofficial", "name": "jboro-overlay", "description": {"en": "personal experimental ebuilds"}, "homepage": "https://github.com/JBoro/portage", "owner": [{"type": "person", "email": "justin.borodinsky@gmail.com", "name": "justin borodinsky"}], "source": [{"type": "git", "uri": "https://github.com/JBoro/portage.git"}], "x-state": "GOOD", "x-timestamp": "2015-08-08 11:25:17 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "jkolo": {"quality": "experimental", "status": "unofficial", "name": "jkolo", "description": {"en": "Jerzy Kolosowski's Gentoo overlay"}, "homepage": "https://git.kolosowscy.pl/jurek/gentoo-overlay", "owner": [{"type": "person", "email": "jerzy@kolosowscy.pl", "name": "Jerzy Kolosowski"}], "source": [{"type": "git", "uri": "https://git.kolosowscy.pl/jurek/gentoo-overlay.git"}], "x-state": "BAD_CACHE", "x-timestamp": "2021-02-01 13:22:42 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 25}, "jm-overlay": {"quality": "experimental", "status": "unofficial", "name": "jm-overlay", "description": {"en": "Personal overlay with more or less random ebuilds"}, "homepage": "https://github.com/Jannis234/jm-overlay", "owner": [{"type": "person", "email": "jannis@ctrl-c.xyz", "name": "Jannis234"}], "source": [{"type": "git", "uri": "https://github.com/Jannis234/jm-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-14 21:27:23 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 933}, "jmbsvicetto": {"quality": "experimental", "status": "official", "name": "jmbsvicetto", "description": {"en": "Jorge Manuel B. S. Vicetto developer overlay"}, "homepage": "https://cgit.gentoo.org/dev/jmbsvicetto.git", "owner": [{"type": "person", "email": "jmbsvicetto@gentoo.org", "name": "Jorge Manuel B. S. Vicetto"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/jmbsvicetto.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/jmbsvicetto.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/jmbsvicetto.git"}], "feed": ["https://cgit.gentoo.org/dev/jmbsvicetto.git/atom/"], "x-state": "BAD_CACHE", "x-timestamp": "2021-01-22 09:20:47 -0100\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 75}, "johnmh": {"quality": "experimental", "status": "unofficial", "name": "johnmh", "description": {"en": "Personal overlay of johnmh"}, "homepage": "https://cgit.gentoo.org/repo/user/johnmh.git/", "owner": [{"type": "person", "email": "johnmh@openblox.org", "name": "John Harris"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/user/johnmh.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/repo/user/johnmh"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/user/johnmh.git"}], "feed": ["https://cgit.gentoo.org/repo/user/johnmh.git/atom/"], "x-state": "GOOD", "x-timestamp": "2016-10-15 23:51:35 -0400\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "johu": {"quality": "experimental", "status": "official", "name": "johu", "description": {"en": "Johannes Huber developer overlay"}, "homepage": "https://cgit.gentoo.org/dev/johu.git", "owner": [{"type": "person", "email": "johu@gentoo.org", "name": "Johannes Huber"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/johu.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/johu.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/johu.git"}], "feed": ["https://cgit.gentoo.org/dev/johu.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-04-18 11:42:18 +0200\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "jorgicio": {"quality": "experimental", "status": "unofficial", "name": "jorgicio", "description": {"en": "Gentoo repository made by Jorgicio."}, "homepage": "https://github.com/jorgicio/jorgicio-gentoo", "owner": [{"type": "person", "email": "jpizarrocallejas@gmail.com", "name": "Jorge Pizarro Callejas"}], "source": [{"type": "git", "uri": "https://github.com/jorgicio/jorgicio-gentoo.git"}, {"type": "git", "uri": "git://github.com/jorgicio/jorgicio-gentoo.git"}, {"type": "git", "uri": "git@github.com:jorgicio/jorgicio-gentoo.git"}], "feed": ["https://github.com/jorgicio/jorgicio-gentoo/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-10 12:32:48 -0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 522}, "jsteward": {"quality": "experimental", "status": "unofficial", "name": "jsteward", "description": {"en": "jsteward's personal overlay"}, "homepage": "https://github.com/KireinaHoro/jsteward", "owner": [{"type": "person", "email": "i@jsteward.moe", "name": "KireinaHoro"}], "source": [{"type": "git", "uri": "https://github.com/KireinaHoro/jsteward.git"}, {"type": "git", "uri": "git://github.com/KireinaHoro/jsteward.git"}, {"type": "git", "uri": "git@github.com:KireinaHoro/jsteward.git"}], "feed": ["https://github.com/KireinaHoro/jsteward/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-27 13:11:37 +0800\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 11}, "junkdrawer": {"quality": "experimental", "status": "unofficial", "name": "junkdrawer", "description": {"en": "Various development tools, libraries, and patches not in Gentoo (yet)"}, "homepage": "https://github.com/doctaweeks/junkdrawer-overlay", "owner": [{"type": "person", "email": "dan@danweeks.net", "name": "Daniel M. Weeks"}], "source": [{"type": "git", "uri": "https://github.com/doctaweeks/junkdrawer-overlay.git"}], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-15 12:14:05 -0400\n", "x-openpgp-signed": "N", "x-masters": ["dlang", "gentoo"], "x-ebuild-count": 348}, "kaa": {"quality": "experimental", "status": "unofficial", "name": "kaa", "description": {"en": "Kaa's experimental overlay"}, "homepage": "http://www.kaa.org.ua", "owner": [{"type": "person", "email": "oleg@kaa.org.ua", "name": "Oleg Kravchenko"}], "source": [{"type": "git", "uri": "https://github.com/Oleh-Kravchenko/kaa-layman.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-13 15:22:42 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 20}, "kde": {"quality": "experimental", "status": "official", "name": "kde", "description": {"en": "Official KDE team's testing overlay."}, "homepage": "https://kde.gentoo.org", "owner": [{"type": "project", "email": "kde@gentoo.org", "name": "KDE Team"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/kde.git"}, {"type": "git", "uri": "https://github.com/gentoo/kde.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/kde.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/kde.git"}], "feed": ["https://cgit.gentoo.org/proj/kde.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-03-13 17:36:41 +0100\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 553}, "keepbot-overlay": {"quality": "experimental", "status": "unofficial", "name": "keepbot-overlay", "description": {"en": "keepbot's personal ebuild repository"}, "homepage": "https://github.com/d-k-ivanov/gentoo-overlay.git", "owner": [{"type": "person", "email": "d.k.ivanov@live.com", "name": "Dmitry Ivanov"}], "source": [{"type": "git", "uri": "https://github.com/d-k-ivanov/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/d-k-ivanov/gentoo-overlay.git"}], "feed": ["https://github.com/d-k-ivanov/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-06 01:48:27 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "khoverlay": {"quality": "experimental", "status": "unofficial", "name": "khoverlay", "description": {"en": "Khumba's overlay, mainly Haskell packages"}, "homepage": "https://gitlab.com/khumba/khoverlay", "owner": [{"type": "person", "email": "bog@khumba.net", "name": "Bryan Gardiner"}], "source": [{"type": "git", "uri": "https://gitlab.com/khumba/khoverlay.git"}, {"type": "git", "uri": "git+ssh://git@gitlab.com/khumba/khoverlay.git"}], "feed": ["https://gitlab.com/khumba/khoverlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-03 18:26:47 -0800\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 98}, "klondike": {"quality": "experimental", "status": "unofficial", "name": "klondike", "description": {"en": "Ebuilds made and modified by klondike, mainly sound and virtualization"}, "homepage": "https://cgit.gentoo.org/user/klondike.git/", "owner": [{"type": "person", "email": "klondike@gentoo.org", "name": "Francisco Blas Izquierdo Riera"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/klondike.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/klondike.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/klondike.git"}], "feed": ["https://cgit.gentoo.org/user/klondike.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-03-01 00:06:53 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 16}, "konsolebox": {"quality": "experimental", "status": "unofficial", "name": "konsolebox", "description": {"en": "konsolebox's overlay"}, "homepage": "https://github.com/konsolebox/overlay", "owner": [{"type": "person", "email": "konsolebox@gmail.com", "name": "konsolebox"}], "source": [{"type": "git", "uri": "https://github.com/konsolebox/overlay.git"}], "feed": ["https://github.com/konsolebox/overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-14 05:43:12 +0800\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 39}, "kripton-overlay": {"quality": "experimental", "status": "unofficial", "name": "kripton-overlay", "description": {"en": "Gentoo portage overlay with packages needed or developed by kripton"}, "homepage": "https://github.com/kripton/kripton-overlay", "owner": [{"type": "person", "email": "kripton@kripserver.net", "name": "Jannis Achstetter"}], "source": [{"type": "git", "uri": "https://github.com/kripton/kripton-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/kripton/kripton-overlay.git"}], "feed": ["https://github.com/kripton/kripton-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-12 21:22:03 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 17}, "kske": {"quality": "experimental", "status": "unofficial", "name": "kske", "description": {"en": "Kai S. K. Engelbart's personal overlay"}, "homepage": "https://git.kske.dev/kske/gentoo-overlay", "owner": [{"type": "person", "email": "kai@kske.dev", "name": "Kai S. K. Engelbart"}], "source": [{"type": "git", "uri": "https://git.kske.dev/kske/gentoo-overlay.git"}, {"type": "git", "uri": "ssh://git@git.kske.dev:420/kske/gentoo-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-13 10:07:04 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "lanodanOverlay": {"quality": "experimental", "status": "unofficial", "name": "lanodanOverlay", "description": {"en": "Additionnal goals; experiments, necromancy, portability, diversity, \u2026", "fr": "Buts additionnels; Exp\u00e9rimentations, n\u00e9cromancie, portabilit\u00e9e, diversit\u00e9e, \u2026"}, "homepage": "https://hacktivis.me/git/overlay", "owner": [{"type": "person", "email": "contact@hacktivis.me", "name": "Haelwenn (lanodan) Monnier"}], "source": [{"type": "git", "uri": "https://hacktivis.me/git/overlay.git"}, {"type": "git", "uri": "https://gitlab.com/lanodan/overlay.git"}, {"type": "git", "uri": "git://hacktivis.me/git/overlay.git"}, {"type": "git", "uri": "git://gitlab.com/lanodan/overlay.git"}], "feed": ["https://hacktivis.me/git/overlay/atom.xml"], "x-state": "GOOD", "x-timestamp": "2021-03-16 15:39:12 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 232}, "laurentb": {"quality": "experimental", "status": "unofficial", "name": "laurentb", "description": {"en": "Various packages"}, "homepage": "https://github.com/laurentb/gentoo-overlay", "owner": [{"type": "person", "email": "laurent@bachelier.name", "name": "Laurent Bachelier"}], "source": [{"type": "git", "uri": "git://github.com/laurentb/gentoo-overlay.git"}, {"type": "git", "uri": "https://github.com/laurentb/gentoo-overlay.git"}], "feed": ["https://github.com/feeds/laurentb/commits/gentoo-overlay/master"], "x-state": "BAD_CACHE", "x-timestamp": "2020-03-27 20:38:31 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 49}, "leechcraft": {"quality": "experimental", "status": "unofficial", "name": "leechcraft", "description": {"en": "Overlay with LeechCraft ebuilds"}, "homepage": "https://github.com/0xd34df00d/leechcraft-overlay", "owner": [{"type": "person", "email": "0xd34df00d@gmail.com", "name": "Georg Rudoy"}], "source": [{"type": "git", "uri": "https://github.com/0xd34df00d/leechcraft-overlay.git"}, {"type": "git", "uri": "git://github.com/0xd34df00d/leechcraft-overlay.git"}], "feed": ["https://github.com/0xd34df00d/leechcraft-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-28 12:06:16 -0600\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 89}, "leio": {"quality": "experimental", "status": "official", "name": "leio", "description": {"en": "Mart Raudsepp developer overlay"}, "homepage": "https://cgit.gentoo.org/dev/leio.git", "owner": [{"type": "person", "email": "leio@gentoo.org", "name": "Mart Raudsepp"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/leio.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/leio.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/leio.git"}], "feed": ["https://cgit.gentoo.org/dev/leio.git/atom/"], "x-state": "BAD_CACHE", "x-timestamp": "2021-01-30 22:07:20 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 8}, "levenkov": {"quality": "experimental", "status": "unofficial", "name": "levenkov", "description": {"en": "levenkov personal overlay"}, "homepage": "https://cgit.gentoo.org/user/levenkov.git", "owner": [{"type": "person", "email": "artem@levenkov.org", "name": "Artem Levenkov"}], "source": [{"type": "git", "uri": "git://anongit.gentoo.org/user/levenkov.git"}, {"type": "git", "uri": "http://cgit.gentooexperimental.org/user/levenkov.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/levenkov.git"}], "x-state": "BAD_CACHE", "x-timestamp": "2015-02-20 13:13:52 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "librepilot": {"quality": "experimental", "status": "unofficial", "name": "librepilot", "description": {"en": "Librepilot flight control software overlay"}, "homepage": "https://github.com/paul-jewell/librepilot-overlay", "owner": [{"type": "person", "email": "paul@teulu.org", "name": "Paul Jewell"}], "source": [{"type": "git", "uri": "https://github.com/paul-jewell/librepilot-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/paul-jewell/librepilot-overlay.git"}], "feed": ["https://github.com/paul-jewell/librepilot-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-01-22 17:16:47 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "libressl": {"quality": "experimental", "status": "official", "name": "libressl", "description": {"en": "LibreSSL ebuilds testing repository"}, "homepage": "https://wiki.gentoo.org/wiki/Project:LibreSSL", "owner": [{"type": "project", "email": "libressl@gentoo.org"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/proj/libressl.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/proj/libressl.git"}], "feed": ["https://cgit.gentoo.org/repo/proj/libressl.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-02-03 20:12:55 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 87}, "liftm": {"quality": "experimental", "status": "unofficial", "name": "liftm", "description": {"en": "Personal Overlay"}, "owner": [{"type": "person", "email": "gentoobug@liftm.de", "name": "Julius Michaelis"}], "source": [{"type": "git", "uri": "https://github.com/jcaesar/liftm-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/jcaesar/liftm-overlay.git"}], "feed": ["https://github.com/jcaesar/liftm-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-14 18:38:40 +0900\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 18}, "linux-be": {"quality": "experimental", "status": "unofficial", "name": "linux-be", "description": {"en": "Port of Boot Environments for GNU/Linux"}, "homepage": "https://gitlab.com/linux-be", "owner": [{"type": "person", "email": "vitaut.bayaryn@gmail.com", "name": "Witaut Bajaryn"}, {"type": "person", "email": "a.mistewicz@gmail.com", "name": "Aleksander Mistewicz"}], "source": [{"type": "git", "uri": "https://gitlab.com/linux-be/overlay.git"}, {"type": "git", "uri": "git+ssh://git@gitlab.com/linux-be/overlay.git"}], "feed": ["https://gitlab.com/linux-be/overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-01-12 19:09:26 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 8}, "linuxunderground-overlay": {"quality": "experimental", "status": "unofficial", "name": "linuxunderground-overlay", "description": {"en": "experimental ebuilds from linuxunderground.be"}, "homepage": "https://github.com/linuxunderground/gentoo.overlay", "owner": [{"type": "person", "email": "vincent.hardy.be@gmail.com", "name": "linuxunderground"}], "source": [{"type": "git", "uri": "git://github.com/linuxunderground/gentoo.overlay.git"}, {"type": "git", "uri": "https://github.com/linuxunderground/gentoo.overlay.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-11 21:41:44 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 155}, "linxon": {"quality": "experimental", "status": "unofficial", "name": "linxon", "description": {"en": "linxon personal overlay"}, "homepage": "https://github.com/linxon/gentoo-overlay", "owner": [{"type": "person", "email": "email@linxon.ru", "name": "linxon"}], "source": [{"type": "git", "uri": "https://github.com/linxon/gentoo-overlay.git"}], "feed": ["https://github.com/linxon/gentoo-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2020-09-24 16:43:15 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 198}, "lisp": {"quality": "experimental", "status": "official", "name": "lisp", "description": {"en": "Common Lisp/Scheme development, recruitment and live overlay.\n Support and feedback in `#gentoo-lisp' and via\n `gentoo-lisp@lists.gentoo.org'."}, "homepage": "https://cgit.gentoo.org/proj/lisp.git", "owner": [{"type": "project", "email": "lisp@gentoo.org"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/lisp.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/lisp.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/lisp.git"}], "feed": ["https://cgit.gentoo.org/proj/lisp.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-12-21 13:59:34 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 381}, "lmiphay": {"quality": "experimental", "status": "unofficial", "name": "lmiphay", "description": {"en": "Personal overlay of Paul Healy"}, "homepage": "https://cgit.gentoo.org/user/lmiphay.git/", "owner": [{"type": "person", "email": "lmiphay@gmail.com", "name": "Paul Healy"}], "source": [{"type": "git", "uri": "git://anongit.gentoo.org/user/lmiphay.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-16 16:46:49 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 234}, "lto-overlay": {"quality": "experimental", "status": "unofficial", "name": "lto-overlay", "description": {"en": "A Portage configuration for O3, Graphite, and LTO system-wide"}, "homepage": "https://github.com/InBetweenNames/gentooLTO", "owner": [{"type": "person", "email": "lookatyouhacker@gmail.com", "name": "Shane Peelar"}], "source": [{"type": "git", "uri": "https://github.com/InBetweenNames/gentooLTO.git"}, {"type": "git", "uri": "git+ssh://git@github.com:InBetweenNames/gentooLTO.git"}], "feed": ["https://github.com/InBetweenNames/gentooLTO/commits/master"], "x-state": "GOOD", "x-timestamp": "2021-02-27 16:16:27 -0500\n", "x-openpgp-signed": "E", "x-masters": ["gentoo", "mv"], "x-ebuild-count": 13}, "luke-jr": {"quality": "experimental", "status": "unofficial", "name": "luke-jr", "description": {"en": "Misc ebuilds by Luke-Jr"}, "homepage": "http://luke.dashjr.org", "owner": [{"type": "person", "email": "luke-jr+gentoobugs@utopios.org"}], "source": [{"type": "git", "uri": "https://scm.dashjr.org/scmroot/git/portage-overlays/luke-jr"}], "x-state": "GOOD", "x-timestamp": "2021-03-14 21:00:23 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 167}, "luxifer": {"quality": "experimental", "status": "unofficial", "name": "luxifer", "description": {"en": "Personal Overlay, contains stoken ebuilds"}, "homepage": "https://github.com/luxifr/olgentoo", "owner": [{"type": "person", "email": "dhertel@gmail.com", "name": "Dominik Keil"}], "source": [{"type": "git", "uri": "https://github.com/luxifr/olgentoo.git"}], "feed": ["https://github.com/luxifr/olgentoo/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2016-04-04 07:38:43 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "lxde-gtk3": {"quality": "experimental", "status": "unofficial", "name": "lxde-gtk3", "description": {"en": "lxde-gtk3 overlay"}, "homepage": "https://github.com/rilian-la-te/lxde-gtk3-overlay", "owner": [{"type": "person", "email": "ria.freelander@gmail.com", "name": "Konstantin"}], "source": [{"type": "git", "uri": "https://github.com/rilian-la-te/lxde-gtk3-overlay.git"}, {"type": "git", "uri": "git://github.com/rilian-la-te/lxde-gtk3-overlay.git"}, {"type": "git", "uri": "git@github.com:rilian-la-te/lxde-gtk3-overlay.git"}], "feed": ["https://github.com/rilian-la-te/lxde-gtk3-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2020-02-12 16:03:52 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 18}, "maekke": {"quality": "experimental", "status": "official", "name": "maekke", "description": {"en": "Markus Meier developer overlay"}, "homepage": "https://cgit.gentoo.org/dev/maekke.git", "owner": [{"type": "person", "email": "maekke@gentoo.org", "name": "Markus Meier"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/maekke.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/maekke.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/maekke.git"}], "feed": ["https://cgit.gentoo.org/dev/maekke.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-02-07 06:49:16 +0100\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 20}, "mate-de-gentoo": {"quality": "experimental", "status": "unofficial", "name": "mate-de-gentoo", "description": {"en": "Updated ebuilds for mate-desktop environment"}, "homepage": "https://github.com/oz123/mate-de-gentoo", "owner": [{"type": "person", "email": "oz.tiram@gmail.com", "name": "OzTiram"}], "source": [{"type": "git", "uri": "https://github.com/oz123/mate-de-gentoo.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-15 22:17:12 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 114}, "matrix": {"quality": "experimental", "status": "official", "name": "matrix", "description": {"en": "Overlay containing clients, servers and services for the Matrix protocol", "nl": "Overlay met clients, servers en services voor het Matrix protocol"}, "homepage": "https://github.com/gentoo/matrix", "owner": [{"type": "person", "email": "steils@gentoo.org", "name": "Stefan Strogin"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/proj/matrix.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/proj/matrix.git"}], "feed": ["https://cgit.gentoo.org/repo/proj/matrix.git/atom/"], "x-state": "BAD_CACHE", "x-timestamp": "2020-10-15 18:52:27 +0300\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 17}, "megacoffee": {"quality": "experimental", "status": "unofficial", "name": "megacoffee", "description": {"en": "Mixed ebuilds from various sources: self-written missing ebuilds, more current ebuilds, ebuilds that just needed a slight update from official portage, ebuilds others posted on Gentoo Bugzilla, ebuilds with added patches, old ebuilds that were removed from official portage etc.", "de": "Verschiedene ebuilds aus verschiedenen Quellen: selbsterstellte ebuilds, ebuilds mit geringf\u00fcgigen \u00c4nderungen, gegen\u00fcber dem aktuellen Baum, ebuilds aus Gentoos Bugzilla, ebuilds mit erweiterten patches, alte ebuilds die nicht mehr im offiziellen Baum existieren, etc."}, "homepage": "http://gentoo-overlay.megacoffee.net", "owner": [{"type": "person", "email": "gentoo-overlay@megacoffee.net", "name": "MegaCoffee"}], "source": [{"type": "git", "uri": "https://gitlab.megacoffee.net/gentoo-overlay/megacoffee-overlay.git"}], "feed": ["https://gitlab.megacoffee.net/gentoo-overlay/megacoffee-overlay/-/commits/master?format=atom"], "x-state": "GOOD", "x-timestamp": "2021-02-28 13:36:36 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo", "go-overlay"], "x-ebuild-count": 34}, "menelkir": {"quality": "experimental", "status": "unofficial", "name": "menelkir", "description": {"en": "Various ebuilds from different sources"}, "homepage": "https://gitlab.com/menelkir/gentoo-overlay", "owner": [{"type": "person", "email": "menelkir@itroll.org", "name": "Daniel Menelkir"}], "source": [{"type": "git", "uri": "https://gitlab.com/menelkir/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@gitlab.com/menelkir/gentoo-overlay.git"}], "feed": ["https://gitlab.com/menelkir/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-15 09:58:13 -0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 483}, "metahax": {"quality": "experimental", "status": "unofficial", "name": "metahax", "description": {"en": "Some ebuilds that didn't seem to exist yet."}, "homepage": "https://github.com/metafarion/metahax", "owner": [{"type": "person", "email": "miles@ctrl-shift.net", "name": "Miles V."}], "source": [{"type": "git", "uri": "https://github.com/metafarion/metahax.git"}], "feed": ["https://github.com/metafarion/metahax/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-01-30 12:45:00 -0600\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 18}, "milos-rs": {"quality": "experimental", "status": "unofficial", "name": "milos-rs", "description": {"en": "A pocket repository for few unavailable packages"}, "homepage": "https://github.com/milos-rs/gentoo-overlay", "owner": [{"type": "person", "email": "milos.om.dj@gmail.com", "name": "Milo\u0161 E. \u0110ur\u0111evi\u0107"}], "source": [{"type": "git", "uri": "https://github.com/milos-rs/gentoo-overlay.git"}], "feed": ["https://github.com/milos-rs/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-09-09 04:50:35 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "miramir": {"quality": "experimental", "status": "unofficial", "name": "miramir", "description": {"en": "Miramir repository"}, "homepage": "https://github.com/miramir/miramir-layman", "owner": [{"type": "person", "email": "gmiramir@gmail.com"}], "source": [{"type": "git", "uri": "https://github.com/miramir/miramir-layman.git"}], "feed": ["https://github.com/miramir/miramir-layman/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-01-29 09:00:44 +0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 42}, "mklich": {"quality": "experimental", "status": "unofficial", "name": "mklich", "description": {"en": "For learning purposes."}, "homepage": "https://cgit.gentoo.org/user/mklich.git/", "owner": [{"type": "person", "email": "michal@michalklich.com", "name": "Micha\u0142 Klich"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/mklich.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/mklich.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/mklich.git"}], "feed": ["https://cgit.gentoo.org/user/mklich.git/atom/"], "x-state": "BAD_CACHE", "x-timestamp": "2015-09-24 07:21:41 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 0}, "mkr-overlay": {"quality": "experimental", "status": "unofficial", "name": "mkr-overlay", "description": {"en": "MalakymR's overlay"}, "homepage": "https://github.com/MalakymR/mkr-overlay", "owner": [{"type": "person", "email": "MalakymR@esdf.uk"}], "source": [{"type": "git", "uri": "https://github.com/MalakymR/mkr-overlay.git"}, {"type": "git", "uri": "git://github.com/MalakymR/mkr-overlay.git"}, {"type": "git", "uri": "git@github.com:MalakymR/mkr-overlay.git"}], "feed": ["https://github.com/MalakymR/mkr-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2019-03-12 11:24:30 +0000\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "moaxcp": {"quality": "experimental", "status": "unofficial", "name": "moaxcp", "description": {"en": "gentoo overlay for packages"}, "homepage": "https://github.com/moaxcp/moaxcp-gentoo-overlay", "owner": [{"type": "person", "email": "moaxcp@gmail.com", "name": "John Mercier"}], "source": [{"type": "git", "uri": "https://github.com/moaxcp/moaxcp-gentoo-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2015-08-11 18:15:55 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 1}, "moexiami": {"quality": "testing", "status": "unofficial", "name": "moexiami", "description": {"en": "Contains updated ebuilds (w/ more feature/control)\n for packages in the Gentoo tree, latest version ebuilds and newpackages\n not yet in the tree. Targeting high-quality for production use."}, "homepage": "https://github.com/Xiami2012/moexiami-ovl-dev", "owner": [{"type": "person", "email": "i@f2light.com", "name": "Xiami"}], "source": [{"type": "git", "uri": "https://github.com/Xiami2012/moexiami-ovl-sync.git"}, {"type": "git", "uri": "git+ssh://git@github.com/Xiami2012/moexiami-ovl-sync.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-01 23:22:17 +0800\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 8}, "moltonel": {"quality": "experimental", "status": "unofficial", "name": "moltonel", "description": {"en": "Vincent de Phily's private overlay"}, "homepage": "https://github.com/vincentdephily/moltonel-ebuilds/", "owner": [{"type": "person", "email": "moltonel@gmail.com", "name": "Vincent de Phily"}], "source": [{"type": "git", "uri": "git://github.com/vincentdephily/moltonel-ebuilds.git"}], "x-state": "GOOD", "x-timestamp": "2020-12-26 18:30:33 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 11}, "monero": {"quality": "experimental", "status": "unofficial", "name": "monero", "description": {"en": "Ebuilds for the Monero cryptocurrency and\n related software."}, "homepage": "https://github.com/gentoo-monero/gentoo-monero", "owner": [{"type": "person", "email": "matt@offtopica.uk", "name": "Matt Smith"}], "source": [{"type": "git", "uri": "https://github.com/gentoo-monero/gentoo-monero.git"}, {"type": "git", "uri": "git+ssh://git@github.com/gentoo-monero/gentoo-monero.git"}], "feed": ["https://github.com/gentoo-monero/gentoo-monero/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-12-19 22:24:23 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 20}, "mozilla": {"quality": "experimental", "status": "official", "name": "mozilla", "description": {"en": "New mozilla development that is not yet in tree"}, "homepage": "https://cgit.gentoo.org/proj/mozilla.git", "owner": [{"type": "project", "email": "mozilla@gentoo.org"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/mozilla.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/mozilla.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/mozilla.git"}], "feed": ["https://cgit.gentoo.org/proj/mozilla.git/atom/"], "x-state": "BAD_CACHE", "x-timestamp": "2020-05-03 19:48:39 +0200\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 6}, "mrhappyhof-gentoo": {"quality": "experimental", "status": "unofficial", "name": "mrhappyhof-gentoo", "description": {"en": "mr_happy_hof's personal Overlay"}, "homepage": "https://github.com/mrhappyhof/mrhappyhof-gentoo", "owner": [{"type": "person", "email": "mrhappyhof@gmail.com", "name": "mr_happy_hof"}], "source": [{"type": "git", "uri": "https://github.com/mrhappyhof/mrhappyhof-gentoo.git"}, {"type": "git", "uri": "git+ssh://git@github.com/mrhappyhof/mrhappyhof-gentoo.git"}], "feed": ["https://github.com/mrhappyhof/mrhappyhof-gentoo/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2020-11-03 10:26:57 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 1}, "mschiff": {"quality": "experimental", "status": "official", "name": "mschiff", "description": {"en": "Developer overlay"}, "homepage": "https://cgit.gentoo.org/dev/mschiff.git/", "owner": [{"type": "person", "email": "mschiff@gentoo.org", "name": "Marc Schiffbauer"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/mschiff.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/mschiff.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/mschiff.git"}], "feed": ["https://cgit.gentoo.org/dev/mschiff.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-09-08 01:02:40 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 9}, "multilib-portage": {"quality": "experimental", "status": "official", "name": "multilib-portage", "description": {"en": "multilib-overlay: emul-linux-x86 must die ;)"}, "homepage": "https://cgit.gentoo.org/proj/multilib-portage.git/", "owner": [{"type": "person", "email": "tommy@gentoo.org", "name": "Thomas Sachau"}], "source": [{"type": "git", "uri": "git://anongit.gentoo.org/proj/multilib-portage.git"}], "x-state": "GOOD", "x-timestamp": "2021-02-14 17:48:50 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 21}, "musl": {"quality": "experimental", "status": "official", "name": "musl", "description": {"en": "musl development overlay"}, "homepage": "https://cgit.gentoo.org/proj/musl.git/", "owner": [{"type": "project", "email": "musl@gentoo.org", "name": "Gentoo musl team"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/musl.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/musl.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/musl.git"}], "feed": ["https://cgit.gentoo.org/proj/musl.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-03-13 21:34:25 +0000\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 131}, "musl-clang": {"quality": "experimental", "status": "unofficial", "name": "musl-clang", "description": {"en": "musl clang/libc++ overlay"}, "homepage": "https://github.com/karlguy/musl-clang/", "owner": [{"type": "person", "email": "bjornpagen@gmail.com", "name": "Bjorn Pagen"}], "source": [{"type": "git", "uri": "https://github.com/karlguy/musl-clang"}, {"type": "git", "uri": "git://github.com/karlguy/musl-clang"}], "feed": ["https://github.com/karlguy/musl-clang/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2018-03-01 16:56:29 -0500\n", "x-openpgp-signed": "E", "x-masters": ["musl", "gentoo"], "x-ebuild-count": 1}, "mv": {"quality": "experimental", "status": "unofficial", "name": "mv", "description": {"en": "Ebuilds for packages not in the Gentoo tree\n (lack of maintainer or too experimental) and live ebuilds\n or extensions/bugfixes for packages in the tree"}, "homepage": "https://cgit.gentoo.org/user/mv.git", "owner": [{"type": "person", "email": "martin@mvath.de", "name": "Martin V\u00e4th"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/mv.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/mv.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/mv.git"}], "feed": ["https://cgit.gentoo.org/user/mv.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-03-10 19:18:55 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 158}, "mva": {"quality": "experimental", "status": "unofficial", "name": "mva", "description": {"en": "mva's sandbox overlay"}, "homepage": "https://github.com/msva/mva-overlay/", "owner": [{"type": "person", "email": "mva@gentoo.org", "name": "Vadim A. Misbakh-Soloviov"}], "source": [{"type": "git", "uri": "https://github.com/msva/mva-overlay"}, {"type": "git", "uri": "git://github.com/msva/mva-overlay"}], "feed": ["https://github.com/msva/mva-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-16 11:19:25 +0700\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 549}, "myrvolay": {"quality": "experimental", "status": "unofficial", "name": "myrvolay", "description": {"en": "myrvogna's personal Gentoo overlay"}, "homepage": "https://github.com/myrvogna/myrvolay", "owner": [{"type": "person", "email": "octiabrina@myrvogna.net", "name": "Octiabrina Terrien-Puig"}], "source": [{"type": "git", "uri": "https://github.com/myrvogna/myrvolay.git"}, {"type": "git", "uri": "git://github.com/myrvogna/myrvolay.git"}, {"type": "git", "uri": "git@github.com:myrvogna/myrvolay.git"}], "feed": ["https://github.com/myrvogna/myrvolay/commits/main.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-08 18:04:22 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 27}, "mysql": {"quality": "experimental", "status": "official", "name": "mysql", "description": {"en": "Gentoo MySQL overlay"}, "homepage": "https://cgit.gentoo.org/proj/mysql.git/", "owner": [{"type": "project", "email": "mysql-bugs@gentoo.org", "name": "MySQL Team"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/mysql.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/mysql.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/mysql.git"}], "feed": ["https://cgit.gentoo.org/proj/mysql.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-02-12 01:11:50 +0100\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 0}, "natinst": {"quality": "experimental", "status": "unofficial", "name": "natinst", "description": {"en": "VISA and National Instruments drivers"}, "homepage": "https://github.com/AndrewAmmerlaan/natinst", "owner": [{"type": "person", "email": "andrewammerlaan@riseup.net", "name": "Andrew Ammerlaan"}], "source": [{"type": "git", "uri": "https://github.com/AndrewAmmerlaan/natinst.git"}, {"type": "git", "uri": "git+ssh://git@github.com/AndrewAmmerlaan/natinst.git"}], "feed": ["https://github.com/AndrewAmmerlaan/natinst/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-18 19:41:13 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 1644}, "nelson-graca": {"quality": "experimental", "status": "unofficial", "name": "nelson-graca", "description": {"en": "Nelson Gra\u00e7a personal Overlay"}, "homepage": "https://github.com/nelsongraca/gentoo-overlay", "owner": [{"type": "person", "email": "graca.nelson@gmail.com", "name": "Nelson Gra\u00e7a"}], "source": [{"type": "git", "uri": "https://github.com/nelsongraca/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/nelsongraca/gentoo-overlay.git"}], "feed": ["https://github.com/nelsongraca/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-25 11:46:45 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 38}, "nest": {"quality": "experimental", "status": "unofficial", "name": "nest", "description": {"en": "Personal Gentoo overlay"}, "homepage": "https://github.com/SpiderX/portage-overlay", "owner": [{"type": "person", "email": "spiderx@spiderx.dp.ua", "name": "Vladimir Pavljuchenkov"}], "source": [{"type": "git", "uri": "https://github.com/SpiderX/portage-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/SpiderX/portage-overlay.git"}], "feed": ["https://github.com/SpiderX/portage-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-14 22:32:19 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 998}, "nico": {"quality": "experimental", "status": "unofficial", "name": "nico", "description": {"en": "various ebuilds"}, "homepage": "https://cgit.gentoo.org/user/nico.git/", "owner": [{"type": "person", "email": "nico@overninethousand.de", "name": "Nico Suhl"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/nico.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/nico.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/nico.git"}], "feed": ["https://cgit.gentoo.org/user/nico.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-02-25 19:06:03 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 0}, "nitratesky": {"quality": "experimental", "status": "unofficial", "name": "nitratesky", "description": {"en": "Personal overlay of Vladimir Timofeenko"}, "homepage": "https://github.com/VTimofeenko/nitratesky", "owner": [{"type": "person", "email": "overlay.maintain@vtimofeenko.com", "name": "Vladimir Timofeenko"}], "source": [{"type": "git", "uri": "https://github.com/VTimofeenko/nitratesky.git"}, {"type": "git", "uri": "git+ssh://git@github.com/VTimofeenko/nitratesky.git"}], "feed": ["https://github.com/VTimofeenko/nitratesky/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-14 21:20:25 -0700\n", "x-openpgp-signed": "E", "x-masters": ["gentoo", "nest"], "x-ebuild-count": 43}, "nix-guix": {"quality": "experimental", "status": "official", "name": "nix-guix", "description": {"en": "Overlay for nix anf guix functional package managers"}, "homepage": "https://github.com/trofi/nix-guix-gentoo", "owner": [{"type": "person", "email": "slyfox@gentoo.org", "name": "Sergei Trofimovich"}], "source": [{"type": "git", "uri": "https://github.com/trofi/nix-guix-gentoo.git"}], "feed": ["https://github.com/trofi/nix-guix-gentoo/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-06 09:14:39 +0000\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 7}, "np-hardass-overlay": {"quality": "experimental", "status": "unofficial", "name": "np-hardass-overlay", "description": {"en": "NP-Hardass's Personal Overlay"}, "homepage": "https://github.com/np-hardass/np-hardass-overlay", "owner": [{"type": "person", "email": "NP-Hardass@gentoo.org", "name": "NP-Hardass"}], "source": [{"type": "git", "uri": "https://github.com/np-hardass/np-hardass-overlay.git"}], "x-state": "BAD_CACHE", "x-timestamp": "2020-12-21 15:12:55 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 34}, "nx": {"quality": "experimental", "status": "official", "name": "nx", "description": {"en": "Overlay for the NX/FreeNX packages for Gentoo."}, "homepage": "https://cgit.gentoo.org/proj/nx.git/", "owner": [{"type": "project", "email": "nx@gentoo.org"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/nx.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/nx.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/nx.git"}], "feed": ["https://cgit.gentoo.org/proj/nx.git/atom/"], "x-state": "GOOD", "x-timestamp": "2018-08-08 21:48:58 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "octopus": {"quality": "experimental", "status": "unofficial", "name": "octopus", "description": {"en": "Own and claimed ebuilds"}, "homepage": "https://github.com/Bfgeshka/octopus", "owner": [{"type": "person", "email": "bfg@derpy.ru", "name": "Bfgeshka"}], "source": [{"type": "git", "uri": "https://github.com/Bfgeshka/octopus.git"}], "feed": ["https://github.com/Bfgeshka/octopus/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-01 03:32:31 +0900\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 16}, "oddlama": {"quality": "experimental", "status": "unofficial", "name": "oddlama", "description": {"en": "oddlama's gentoo overlay"}, "homepage": "https://github.com/oddlama/overlay", "owner": [{"type": "person", "email": "overlay@oddlama.org", "name": "oddlama"}], "source": [{"type": "git", "uri": "https://github.com/oddlama/overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/oddlama/overlay.git"}], "feed": ["https://github.com/oddlama/overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-24 17:02:26 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 6}, "olifre": {"quality": "experimental", "status": "unofficial", "name": "olifre", "description": {"en": "Personal overlay of Oliver Freyermuth."}, "homepage": "https://github.com/olifre/olifre-portage", "owner": [{"type": "person", "email": "o.freyermuth@googlemail.com", "name": "Oliver Freyermuth"}], "source": [{"type": "git", "uri": "https://github.com/olifre/olifre-portage.git"}, {"type": "git", "uri": "git://github.com/olifre/olifre-portage.git"}, {"type": "git", "uri": "git@github.com:olifre/olifre-portage.git"}], "feed": ["https://github.com/olifre/olifre-portage/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-14 21:21:59 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 13}, "openclonk": {"quality": "experimental", "status": "unofficial", "name": "openclonk", "description": {"en": "Overlay for the game OpenClonk"}, "homepage": "http://www.openclonk.org/", "owner": [{"type": "person", "email": "gentoobug@liftm.de", "name": "Julius Michaelis"}], "source": [{"type": "git", "uri": "https://github.com/jcaesar/openclonk-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/jcaesar/openclonk-overlay.git"}], "feed": ["https://github.com/jcaesar/openclonk-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-07-30 23:29:47 +0900\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "openwrt": {"quality": "experimental", "status": "unofficial", "name": "openwrt", "description": {"en": "Overlay for network configuration packages found in OpenWRT"}, "homepage": "https://github.com/pavlix/gentoo-openwrt", "owner": [{"type": "person", "email": "pavlix@pavlix.net", "name": "Pavel \u0160imerda"}], "source": [{"type": "git", "uri": "https://github.com/pavlix/gentoo-openwrt"}], "x-state": "GOOD", "x-timestamp": "2016-09-14 11:46:36 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 8}, "oubliette": {"quality": "experimental", "status": "unofficial", "name": "oubliette", "description": {"en": "personal overlay of forgotten ebuilds"}, "homepage": "https://github.com/nabbi/oubliette-overlay", "owner": [{"type": "person", "email": "nic@boet.cc", "name": "nic"}], "source": [{"type": "git", "uri": "https://github.com/nabbi/oubliette-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/nabbi/oubliette-overlay.git"}], "feed": ["https://github.com/nabbi/oubliette-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-01 11:22:07 -0600\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 56}, "overseerr-overlay": {"quality": "experimental", "status": "unofficial", "name": "overseerr-overlay", "description": {"en": "third party overlay to install overseerr"}, "homepage": "https://github.com/chriscpritchard/overseerr-overlay", "owner": [{"type": "person", "email": "chris@christopherpritchard.co.uk", "name": "Chris Pritchard"}], "source": [{"type": "git", "uri": "https://github.com/chriscpritchard/overseerr-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com:chriscpritchard/overseerr-overlay.git"}], "feed": ["https://github.com/chriscpritchard/overseerr-overlay/commits/main.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-06 12:23:03 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 8}, "palemoon": {"quality": "experimental", "status": "unofficial", "name": "palemoon", "description": {"en": "Unofficial Gentoo overlay for the Pale Moon (http://www.palemoon.org/) web browser."}, "homepage": "https://github.com/deu/palemoon-overlay", "owner": [{"type": "person", "email": "de@uio.re", "name": "deu"}], "source": [{"type": "git", "uri": "https://github.com/deu/palemoon-overlay.git"}, {"type": "git", "uri": "git://github.com/deu/palemoon-overlay.git"}, {"type": "git", "uri": "git@github.com:deu/palemoon-overlay.git"}], "feed": ["https://github.com/deu/palemoon-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-15 19:17:25 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 13}, "panther": {"quality": "experimental", "status": "unofficial", "name": "panther", "description": {"en": "Fun useful packages not found elsewhere"}, "homepage": "https://github.com/orangeturtle739/panther", "owner": [{"type": "person", "email": "swimgiraffe435@gmail.com", "name": "Jacob Glueck"}], "source": [{"type": "git", "uri": "https://github.com/orangeturtle739/panther.git"}, {"type": "git", "uri": "git+ssh://git@github.com/orangeturtle739/panther.git"}], "feed": ["https://github.com/orangeturtle739/panther/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-24 16:53:39 -0500\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 26}, "pdilung": {"quality": "experimental", "status": "unofficial", "name": "pdilung", "description": {"en": "Personal Gentoo overlay of Pavol Dilung"}, "homepage": "https://github.com/pdilung/gentoo-overlay/", "owner": [{"type": "person", "email": "pavol.dilung@gmail.com", "name": "Pavol Dilung"}], "source": [{"type": "git", "uri": "https://github.com/pdilung/gentoo-overlay.git"}, {"type": "git", "uri": "git://github.com/pdilung/gentoo-overlay.git"}, {"type": "git", "uri": "git@github.com:pdilung/gentoo-overlay.git"}], "feed": ["https://github.com/pdilung/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2016-09-25 19:28:59 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 1}, "pentoo": {"quality": "experimental", "status": "official", "name": "pentoo", "description": {"en": "The overlay contains new or updated security tools."}, "homepage": "http://www.pentoo.ch", "owner": [{"type": "person", "email": "zerochaos@gentoo.org"}], "source": [{"type": "git", "uri": "https://github.com/pentoo/pentoo-overlay.git"}, {"type": "git", "uri": "git://github.com/pentoo/pentoo-overlay.git"}, {"type": "git", "uri": "git@github.com:pentoo/pentoo-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-14 22:51:08 +0800\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 1305}, "perl-experimental": {"quality": "experimental", "status": "official", "name": "perl-experimental", "description": {"en": "Experimental ebuilds for Perl packages in Gentoo. Comments and\n bugreports are welcome!"}, "homepage": "https://cgit.gentoo.org/proj/perl-overlay.git/", "owner": [{"type": "project", "email": "perl@gentoo.org", "name": "Perl Team"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/perl-overlay.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/perl-overlay.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/perl-overlay.git"}], "feed": ["https://cgit.gentoo.org/proj/perl-overlay.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-08-26 10:49:03 +1200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 761}, "perl-experimental-snapshots": {"quality": "experimental", "status": "unofficial", "name": "perl-experimental-snapshots", "description": {"en": "Unofficial mirror of overlay \"perl-experimental\" with metadata cache"}, "homepage": "https://github.com/gentoo-perl/perl-experimental-snapshots", "owner": [{"type": "person", "email": "kentnl@gentoo.org", "name": "Kent Fredric"}], "source": [{"type": "git", "uri": "https://github.com/gentoo-perl/perl-experimental-snapshots.git"}, {"type": "git", "uri": "git://github.com/gentoo-perl/perl-experimental-snapshots.git"}], "feed": ["https://github.com/gentoo-perl/perl-experimental-snapshots/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-08-26 11:01:24 +1200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 761}, "petkovich": {"quality": "experimental", "status": "unofficial", "name": "petkovich", "description": {"en": "Personal overlay of Jean-Christophe Petkovich"}, "homepage": "https://github.com/jcpetkovich/overlay-petkovich", "owner": [{"type": "person", "email": "jcpetkovich@gmail.com", "name": "Jean-Christophe Petkovich"}], "source": [{"type": "git", "uri": "https://github.com/jcpetkovich/overlay-petkovich.git"}, {"type": "git", "uri": "git://github.com/jcpetkovich/overlay-petkovich.git"}, {"type": "git", "uri": "git@github.com:jcpetkovich/overlay-petkovich.git"}], "feed": ["https://github.com/jcpetkovich/overlay-petkovich/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-02-13 14:57:26 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 47}, "pf4public": {"quality": "experimental", "status": "unofficial", "name": "pf4public", "description": {"en": "Personal overlay"}, "homepage": "https://github.com/PF4Public/gentoo-overlay", "owner": [{"type": "person", "email": "PF4Public@mail.ru", "name": "PF4Public"}], "source": [{"type": "git", "uri": "https://github.com/PF4Public/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/PF4Public/gentoo-overlay.git"}], "feed": ["https://github.com/PF4Public/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-15 20:00:58 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 77}, "pg_overlay": {"quality": "experimental", "status": "unofficial", "name": "pg_overlay", "description": {"en": "User overlay"}, "homepage": "https://gitlab.com/Perfect_Gentleman/PG_Overlay", "owner": [{"type": "person", "email": "perfect007gentleman@gmail.com", "name": "Perfect Gentleman"}], "source": [{"type": "git", "uri": "https://gitlab.com/Perfect_Gentleman/PG_Overlay.git"}], "feed": ["https://gitlab.com/Perfect_Gentleman/PG_Overlay/-/commits/master?format=atom"], "x-state": "GOOD", "x-timestamp": "2021-03-14 21:42:17 +0700\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 247}, "phackerlay": {"quality": "experimental", "status": "unofficial", "name": "phackerlay", "description": {"en": "Overlay for phackers"}, "homepage": "https://gitlab.phys-el.ru/ustinov/phackerlay", "owner": [{"type": "person", "email": "ustinov@phys-el.ru", "name": "Alexander B. Ustinov"}], "source": [{"type": "git", "uri": "https://gitlab.phys-el.ru/ustinov/phackerlay.git"}], "feed": ["https://gitlab.phys-el.ru/ustinov/phackerlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-13 22:13:15 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 43}, "phoenix591": {"quality": "experimental", "status": "unofficial", "name": "phoenix591", "description": {"en": "My personal overlay with a few random packages"}, "homepage": "https://github.com/Phoenix591/gentoo-overlay", "owner": [{"type": "person", "email": "kcelbert@gmail.com", "name": "Kyle Elbert"}], "source": [{"type": "git", "uri": "https://github.com/Phoenix591/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/Phoenix591/gentoo-overlay.git"}], "feed": ["https://github.com/Phoenix591/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-14 01:12:00 -0600\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 52}, "pholthaus-overlay": {"quality": "experimental", "status": "unofficial", "name": "pholthaus-overlay", "description": {"en": "pholthaus' personal overlay"}, "homepage": "https://github.com/pholthau/pholthaus-overlay", "owner": [{"type": "person", "email": "patrick.holthaus@googlemail.com", "name": "Patrick Holthaus"}], "source": [{"type": "git", "uri": "https://github.com/pholthau/pholthaus-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/pholthau/pholthaus-overlay.git"}], "feed": ["https://github.com//pholthau/pholthaus-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-01-29 14:09:45 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "pica-pica": {"quality": "experimental", "status": "unofficial", "name": "pica-pica", "description": {"en": "Pica Pica ebuilds"}, "homepage": "https://github.com/antonsviridenko/pica-pica-gentoo-overlay", "owner": [{"type": "person", "email": "anton@picapica.im", "name": "Anton Sviridenko"}], "source": [{"type": "git", "uri": "https://github.com/antonsviridenko/pica-pica-gentoo-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2020-02-12 19:28:26 +0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "picarica-overlay": {"quality": "experimental", "status": "unofficial", "name": "picarica-overlay", "description": {"en": "Gentoo overlay for apps that dont exist or are unmaintaned"}, "homepage": "https://gitlab.com/picarica/picarica-overlay", "owner": [{"type": "person", "email": "dohaje@azet.sk", "name": "George Bucek"}], "source": [{"type": "git", "uri": "https://gitlab.com/picarica/picarica-overlay.git"}, {"type": "git", "uri": "git+ssh://git@gitlab.com/picarica/picarica-overlay.git"}], "x-state": "BAD_CACHE", "x-timestamp": "2020-03-21 15:52:44 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 12}, "pigfoot": {"quality": "experimental", "status": "unofficial", "name": "pigfoot", "description": {"en": "Ebuilds for experimental packages and chinese patches"}, "homepage": "https://cgit.gentoo.org/user/pigfoot.git/", "owner": [{"type": "person", "email": "pigfoot@gmail.com", "name": "pigfoot"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/pigfoot.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/pigfoot.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/pigfoot.git"}], "feed": ["https://cgit.gentoo.org/user/pigfoot.git/atom/"], "x-state": "BAD_CACHE", "x-timestamp": "2021-02-25 00:16:12 +0800\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 65}, "piniverlay": {"quality": "experimental", "status": "unofficial", "name": "piniverlay", "description": {"en": "Various packages and patches for developers"}, "homepage": "https://github.com/pinicarus/gentoo-overlay", "owner": [{"type": "person", "email": "pini@tuxfamily.org", "name": "Pierre-Nicolas Clauss"}], "source": [{"type": "git", "uri": "https://github.com/pinicarus/gentoo-overlay.git"}, {"type": "git", "uri": "git://github.com/pinicarus/gentoo-overlay.git"}, {"type": "git", "uri": "git@github.com:pinicarus/gentoo-overlay.git"}], "feed": ["https://github.com/pinicarus/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-12-14 18:44:03 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 3}, "pinkbyte": {"quality": "experimental", "status": "official", "name": "pinkbyte", "description": {"en": "Pinkbyte's developer overlay"}, "homepage": "https://github.com/Pinkbyte/pinkbyte-overlay", "owner": [{"type": "person", "email": "pinkbyte@gentoo.org", "name": "Sergey Popov"}], "source": [{"type": "git", "uri": "https://github.com/Pinkbyte/pinkbyte-overlay.git"}, {"type": "git", "uri": "git://github.com/Pinkbyte/pinkbyte-overlay.git"}], "feed": ["https://github.com/Pinkbyte/pinkbyte-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-01-12 15:50:52 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 27}, "pixlra": {"quality": "experimental", "status": "unofficial", "name": "pixlra", "description": {"en": "Pixlra collaborative overlay"}, "homepage": "https://cgit.gentoo.org/user/carreira.git/", "owner": [{"type": "person", "email": "jfmcarreira@gmail.com", "name": "Joao Carreira"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/carreira.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/carreira.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/carreira.git"}, {"type": "git", "uri": "https://github.com/pixlra/pixlra-gentoo-overlay.git"}], "feed": ["https://cgit.gentoo.org/user/carreira.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-02-25 13:29:50 +0000\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 20}, "pkalin": {"quality": "experimental", "status": "unofficial", "name": "pkalin", "description": {"en": "My Gentoo overlay, somewhat regularly maintained"}, "homepage": "https://github.com/thinrope/pkalin", "owner": [{"type": "person", "email": "kalin@ThinRope.net", "name": "Kalin KOZHUHAROV"}], "source": [{"type": "git", "uri": "https://github.com/thinrope/pkalin.git"}, {"type": "git", "uri": "git+ssh://git@github.com/thinrope/pkalin.git"}], "feed": ["https://github.com/thinrope/pkalin/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-25 00:08:43 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 93}, "plex-overlay": {"quality": "experimental", "status": "unofficial", "name": "plex-overlay", "description": {"en": "Personal overlay of comio containing Plex related ebuilds"}, "homepage": "https://github.com/comio/plex-overlay", "owner": [{"type": "person", "email": "luigi.mantellini@gmail.com", "name": "Luigi Mantellini"}], "source": [{"type": "git", "uri": "https://github.com/comio/plex-overlay.git"}], "feed": ["https://github.com/comio/plex-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-11 07:25:32 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 18}, "poly-c": {"quality": "experimental", "status": "official", "name": "poly-c", "description": {"en": "Polynomial-C's overlay"}, "homepage": "http://www.gentoofan.org/gentoo/", "owner": [{"type": "person", "email": "polynomial-c@gentoo.org", "name": "Lars Wendler"}], "source": [{"type": "rsync", "uri": "rsync://rsync.gentoofan.org/poly-c"}], "x-state": "GOOD", "x-timestamp": "2021-03-08 20:24:05.000000000 +0000\n", "x-masters": ["gentoo"], "x-ebuild-count": 292}, "powerman": {"quality": "experimental", "status": "unofficial", "name": "powerman", "description": {"en": "Overlay of Alex Efros"}, "homepage": "https://github.com/powerman/powerman-overlay", "owner": [{"type": "person", "email": "powerman-asdf@yandex.ru", "name": "Alex Efros"}], "source": [{"type": "git", "uri": "https://github.com/powerman/powerman-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2021-02-18 17:46:00 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 134}, "ppfeufer-gentoo-overlay": {"quality": "experimental", "status": "unofficial", "name": "ppfeufer-gentoo-overlay", "description": {"en": "ppfeufer's personal overlay."}, "homepage": "https://github.com/ppfeufer/gentoo-overlay", "owner": [{"type": "person", "email": "info@ppfeufer.de", "name": "Peter Pfeufer"}], "source": [{"type": "git", "uri": "https://github.com/ppfeufer/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/ppfeufer/gentoo-overlay.git"}], "feed": ["https://github.com/ppfeufer/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-12 15:38:59 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 38}, "pross": {"quality": "experimental", "status": "unofficial", "name": "pross", "description": {"en": "Up to date ck-sources"}, "homepage": "https://github.com/Pross/pross-overlay", "owner": [{"type": "person", "email": "pross@pross.org.uk", "name": "Simon Prosser"}], "source": [{"type": "git", "uri": "https://github.com/Pross/pross-overlay.git"}], "feed": ["https://github.com/Pross/pross-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-05 01:00:12 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "pyfa": {"quality": "experimental", "status": "unofficial", "name": "pyfa", "description": {"en": "Newest versions of Pyfa (Python fitting assistant for EVE Online)"}, "homepage": "https://github.com/ZeroPointEnergy/gentoo-pyfa-overlay", "owner": [{"type": "person", "email": "a.zuber@gmx.ch", "name": "Andreas Zuber"}], "source": [{"type": "git", "uri": "https://github.com/ZeroPointEnergy/gentoo-pyfa-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/ZeroPointEnergy/gentoo-pyfa-overlay.git"}], "feed": ["https://github.com/ZeroPointEnergy/gentoo-pyfa-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-01 08:45:53 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "python": {"quality": "experimental", "status": "official", "name": "python", "description": {"en": "Python project repository"}, "homepage": "https://cgit.gentoo.org/proj/python.git/", "owner": [{"type": "project", "email": "python@gentoo.org", "name": "Gentoo Python project"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/python.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/python.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/python.git"}], "feed": ["https://cgit.gentoo.org/proj/python.git/atom/"], "x-state": "GOOD", "x-timestamp": "2019-12-29 12:56:32 +0100\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "qemu-init": {"quality": "experimental", "status": "official", "name": "qemu-init", "description": {"en": "qemu init script and tools"}, "homepage": "https://cgit.gentoo.org/dev/qiaomuf.git/", "owner": [{"type": "person", "email": "dolsen@gentoo.org", "name": "Brian Dolbec"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/kvm-tools.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/kvm-tools.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/kvm-tools.git"}], "feed": ["https://cgit.gentoo.org/proj/kvm-tools.git/atom/"], "x-state": "GOOD", "x-timestamp": "2016-03-23 10:53:56 -0700\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 1}, "qgp": {"quality": "experimental", "status": "unofficial", "name": "qgp", "description": {"en": "qgp overlay (mostly computing and HEP)"}, "homepage": "https://github.com/qgp/gentoo-qgp", "owner": [{"type": "person", "email": "qgp1024@gmail.com", "name": "Jochen Klein"}], "source": [{"type": "git", "uri": "https://github.com/qgp/gentoo-qgp.git"}, {"type": "git", "uri": "git://github.com/qgp/gentoo-qgp.git"}, {"type": "git", "uri": "git+ssh://git@github.com:qgp/gentoo-qgp.git"}], "feed": ["https://github.com/qgp/gentoo-qgp/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-07 11:14:15 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 10}, "qownnotes-overlay": {"quality": "experimental", "status": "unofficial", "name": "qownnotes-overlay", "description": {"en": "QOwnNotes overlay"}, "homepage": "http://www.qownnotes.org", "owner": [{"type": "person", "email": "patrizio@bekerle.com", "name": "Patrizio Bekerle"}], "source": [{"type": "git", "uri": "https://github.com/qownnotes/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/qownnotes/gentoo-overlay.git"}], "feed": ["https://github.com/qownnotes/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-12 12:20:13 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 556}, "qsx": {"quality": "experimental", "status": "unofficial", "name": "qsx", "description": {"en": "qsx\u2019 ebuilds"}, "homepage": "https://github.com/qsuscs/gentoo-overlay", "owner": [{"type": "person", "email": "qsx@chaotikum.eu", "name": "Thomas Schneider"}], "source": [{"type": "git", "uri": "https://github.com/qsuscs/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/qsuscs/gentoo-overlay.git"}], "feed": ["https://github.com/qsuscs/gentoo-overlay/commits/main.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-01 11:02:27 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 24}, "qt": {"quality": "experimental", "status": "official", "name": "qt", "description": {"en": "Official testing overlay for Qt and related packages, provided\n by Gentoo's Qt team. Contains ebuilds for Qt4 and Qt5 prereleases and live ebuilds,\n plus various (non-KDE) applications and utilities that use Qt."}, "homepage": "https://github.com/gentoo/qt", "owner": [{"type": "project", "email": "qt@gentoo.org", "name": "Qt Team"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/qt.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/qt.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/qt.git"}], "feed": ["https://cgit.gentoo.org/proj/qt.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-03-14 16:35:16 +0100\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 86}, "quarks": {"quality": "experimental", "status": "unofficial", "name": "quarks", "description": {"en": "Quarks's overlay; needful things around Security, Penetration Testing and gaming"}, "homepage": "https://git.zero-downtime.net/quark", "owner": [{"type": "person", "email": "it@startux.de", "name": "Stefan Reimer"}], "source": [{"type": "git", "uri": "https://git.zero-downtime.net/quark/quarks.git"}], "x-state": "GOOD", "x-timestamp": "2021-02-19 15:35:17 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 35}, "qwin-overlay": {"quality": "experimental", "status": "unofficial", "name": "qwin-overlay", "description": {"en": "Gentoo overlay with some patched packages."}, "homepage": "https://github.com/Flex1911/", "owner": [{"type": "person", "email": "dedsa2002@gmail.com"}], "source": [{"type": "git", "uri": "git://github.com/Flex1911/qwin-overlay.git"}], "x-state": "BAD_CACHE", "x-timestamp": "2017-10-21 16:11:32 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "rafaelmartins": {"quality": "experimental", "status": "official", "name": "rafaelmartins", "description": {"en": "Rafael Martins' Gentoo overlay"}, "homepage": "https://github.com/rafaelmartins/gentoo-overlay", "owner": [{"type": "person", "email": "rafaelmartins@gentoo.org", "name": "Rafael G. Martins"}], "source": [{"type": "git", "uri": "https://github.com/rafaelmartins/gentoo-overlay.git"}, {"type": "git", "uri": "git://github.com/rafaelmartins/gentoo-overlay.git"}], "feed": ["https://github.com/rafaelmartins/gentoo-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2015-10-19 20:09:06 -0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 25}, "rage": {"quality": "experimental", "status": "unofficial", "name": "rage", "description": {"en": "rage's personal overlay"}, "homepage": "https://gitlab.com/oxr463/overlay", "owner": [{"type": "person", "email": "ramage.lucas@protonmail.com", "name": "Lucas Ramage"}], "source": [{"type": "git", "uri": "https://gitlab.com/oxr463/overlay.git"}, {"type": "git", "uri": "git+ssh://git@gitlab.com/oxr463/overlay.git"}], "feed": ["https://gitlab.com/oxr463/overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-06-24 07:51:33 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 48}, "raiagent": {"quality": "experimental", "status": "unofficial", "name": "raiagent", "description": {"en": "Well-documented ebuilds en-route to a bandersnatch near you"}, "homepage": "https://github.com/leycec/raiagent", "owner": [{"type": "person", "email": "leycec@gmail.com", "name": "Cecil Curry"}], "source": [{"type": "git", "uri": "https://github.com/leycec/raiagent"}, {"type": "git", "uri": "git://github.com/leycec/raiagent.git"}], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-15 23:14:14 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 105}, "rasdark": {"quality": "experimental", "status": "unofficial", "name": "rasdark", "description": {"en": "rasdark personal overlay"}, "homepage": "https://github.com/rasdark/overlay", "owner": [{"type": "person", "email": "andrew.senik@gmail.com", "name": "Andrey Senik"}], "source": [{"type": "git", "uri": "https://github.com/rasdark/overlay"}, {"type": "git", "uri": "git://github.com/rasdark/overlay.git"}], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-09 20:04:45 +0300\n", "x-openpgp-signed": "N", "x-masters": ["calculate", "gentoo"], "x-ebuild-count": 50}, "raw": {"quality": "experimental", "status": "unofficial", "name": "raw", "description": {"en": "some raw stuff"}, "homepage": "https://github.com/mahatma-kaganovich/raw", "owner": [{"type": "person", "email": "mahatma@eu.by", "name": "Denis Kaganovich (aka Dzianis Kahanovich)"}], "source": [{"type": "git", "uri": "https://github.com/mahatma-kaganovich/raw.git"}], "feed": ["https://github.com/mahatma-kaganovich/raw/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-15 18:42:29 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 56}, "rdnetto-overlay": {"quality": "experimental", "status": "unofficial", "name": "rdnetto-overlay", "description": {"en": "Personal Overlay"}, "homepage": "https://github.com/rdnetto/rdnetto-overlay", "owner": [{"type": "person", "email": "rdnetto@gmail.com", "name": "Reuben D'Netto"}], "source": [{"type": "git", "uri": "https://github.com/rdnetto/rdnetto-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com:rdnetto/rdnetto-overlay.git"}], "feed": ["https://github.com/rdnetto/rdnetto-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-01-04 12:01:09 +1100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 95}, "reagentoo": {"quality": "experimental", "status": "unofficial", "name": "reagentoo", "description": {"en": "reagentoo's overlay"}, "homepage": "https://gitlab.com/reagentoo/gentoo-overlay", "owner": [{"type": "person", "email": "reagentoo@gmail.com"}], "source": [{"type": "git", "uri": "https://gitlab.com/reagentoo/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@gitlab.com/reagentoo/gentoo-overlay.git"}], "feed": ["https://gitlab.com/reagentoo/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-12 01:12:11 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 83}, "ricerlay": {"quality": "experimental", "status": "unofficial", "name": "ricerlay", "description": {"en": "Overlay for ricing enthusiasts"}, "homepage": "https://github.com/azahi/ricerlay", "owner": [{"type": "person", "email": "azahi@teknik.io", "name": "azahi"}], "source": [{"type": "git", "uri": "https://github.com/azahi/ricerlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/azahi/ricerlay.git"}], "feed": ["https://github.com/azahi/ricerlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-15 12:18:24 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 93}, "rich0": {"quality": "experimental", "status": "official", "name": "rich0", "description": {"en": "Rich0's developer overlay"}, "homepage": "https://github.com/rich0/rich0-overlay", "owner": [{"type": "person", "email": "rich0@gentoo.org", "name": "Richard Freeman"}], "source": [{"type": "git", "uri": "git://github.com/rich0/rich0-overlay.git"}], "feed": ["https://github.com/rich0/rich0-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-24 21:06:51 -0500\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 48}, "ring-overlay": {"quality": "experimental", "status": "unofficial", "name": "ring-overlay", "description": {"en": "Ring is free software for universal communication which respects freedoms and privacy of its users."}, "homepage": "https://github.com/stefan-langenmaier/ring-overlay", "owner": [{"type": "person", "email": "stefan.langenmaier+gentoo@gmail.com", "name": "Stefan Langenmaier"}], "source": [{"type": "git", "uri": "https://github.com/stefan-langenmaier/ring-overlay.git"}, {"type": "git", "uri": "git://github.com/stefan-langenmaier/ring-overlay.git"}, {"type": "git", "uri": "git@github.com:stefan-langenmaier/ring-overlay.git"}], "feed": ["https://github.com/stefan-langenmaier/ring-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2020-04-17 10:23:59 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 49}, "rion": {"quality": "experimental", "status": "unofficial", "name": "rion", "description": {"en": "Russian overlay with a some patched and specific\n software"}, "homepage": "https://github.com/rion-overlay", "owner": [{"type": "person", "email": "rion4ik@gmail.com", "name": "Sergey Ilinykh"}], "source": [{"type": "git", "uri": "https://github.com/rion-overlay/rion-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/rion-overlay/rion-overlay.git"}], "feed": ["https://github.com/rion-overlay/rion-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-02-20 14:18:19 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 102}, "riru": {"quality": "experimental", "status": "unofficial", "name": "riru", "description": {"en": "Home overlay for development, patches and live ebuilds", "ru": "\u0414\u043e\u043c\u0430\u0448\u043d\u0438\u0439 \u043e\u0432\u0435\u0440\u043b\u0435\u0439 \u0434\u043b\u044f \u0440\u0430\u0437\u0440\u0430\u0431\u043e\u0442\u043a\u0438, \u043f\u0430\u0442\u0447\u0435\u0439 \u0438 \u043b\u0430\u0439\u0432 \u0435\u0431\u0438\u043b\u0434\u043e\u0432"}, "homepage": "https://github.com/pkulev/riru", "owner": [{"type": "person", "email": "kulyov.pavel@gmail.com", "name": "Pavel Kulyov"}], "source": [{"type": "git", "uri": "https://github.com/pkulev/riru.git"}, {"type": "git", "uri": "git://github.com/pkulev/riru.git"}, {"type": "git", "uri": "git@github.com:pkulev/riru.git"}], "feed": ["https://github.com/pkulev/riru/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-01-11 00:54:42 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 22}, "robert7k": {"quality": "experimental", "status": "unofficial", "name": "robert7k", "description": {"en": "personal overlay of robert7k"}, "homepage": "https://github.com/robert7k/gentoo-overlay", "owner": [{"type": "person", "email": "gentoo.2019@r123.de"}], "source": [{"type": "git", "uri": "https://github.com/robert7k/gentoo-overlay.git"}], "feed": ["https://github.com/robert7k/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-15 22:29:42 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 38}, "robertgzr": {"quality": "experimental", "status": "unofficial", "name": "robertgzr", "description": {"en": "robertgzr's personal overlay."}, "homepage": "https://git.sr.ht/~robertgzr/portage", "owner": [{"type": "person", "email": "robert@gnzler.io", "name": "Robert G\u00fcnzler"}], "source": [{"type": "git", "uri": "https://git.sr.ht/~robertgzr/portage"}, {"type": "git", "uri": "ssh://git@git.sr.ht:~robertgzr/portage"}], "feed": ["https://git.sr.ht/~robertgzr/portage/log/rss.xml"], "x-state": "GOOD", "x-timestamp": "2021-03-12 12:51:42 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 65}, "roslin": {"quality": "experimental", "status": "unofficial", "name": "roslin", "description": {"en": "This is roslin, my small overlay. Enjoy! (:"}, "homepage": "https://gitlab.com/roslin-uberlay/roslin", "owner": [{"type": "person", "email": "szarpaj@grubelek.pl", "name": "Piotr Szymaniak"}, {"type": "person", "email": "mziab@o2.pl", "name": "Micha\u0142 Zi\u0105bkowski"}], "source": [{"type": "git", "uri": "https://gitlab.com/roslin-uberlay/roslin.git"}], "x-state": "GOOD", "x-timestamp": "2021-02-05 09:20:02 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 186}, "rpm": {"quality": "experimental", "status": "unofficial", "name": "rpm", "description": {"en": "Overlay for RPM packagers targeting Fedora, EPEL, CentOS and similar distros"}, "homepage": "https://github.com/pavlix/gentoo-rpm", "owner": [{"type": "person", "email": "pavlix@pavlix.net", "name": "Pavel \u0160imerda"}], "source": [{"type": "git", "uri": "https://github.com/pavlix/gentoo-rpm.git"}], "x-state": "BAD_CACHE", "x-timestamp": "2017-02-16 11:49:24 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 3}, "ruby": {"quality": "experimental", "status": "official", "name": "ruby", "description": {"en": "Experimental ebuilds from the Ruby edge."}, "homepage": "https://cgit.gentoo.org/proj/ruby", "owner": [{"type": "project", "email": "ruby@gentoo.org", "name": "Ruby Team"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/ruby-overlay.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/ruby-overlay.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/ruby-overlay.git"}], "feed": ["https://cgit.gentoo.org/proj/ruby-overlay.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-09-15 09:39:31 +0200\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 7}, "rukruk": {"quality": "experimental", "status": "unofficial", "name": "rukruk", "description": {"en": "some packages not found in other overlays, for issues create ticket in github"}, "homepage": "https://github.com/Atoms/rukruk", "owner": [{"type": "person", "email": "atoms@tups.lv", "name": "Aivars Sterns"}], "source": [{"type": "git", "uri": "https://github.com/Atoms/rukruk.git"}, {"type": "git", "uri": "git://github.com/Atoms/rukruk.git"}, {"type": "git", "uri": "git@github.com:Atoms/rukruk.git"}], "feed": ["https://github.com/Atoms/rukruk/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2019-04-05 10:07:56 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 20}, "rust": {"quality": "experimental", "status": "unofficial", "name": "rust", "description": {"en": "rust modules and tools"}, "homepage": "https://github.com/gentoo/gentoo-rust", "owner": [{"type": "project", "email": "rust@gentoo.org", "name": "Rust Team"}], "source": [{"type": "git", "uri": "https://github.com/gentoo/gentoo-rust.git"}, {"type": "git", "uri": "git://github.com/gentoo/gentoo-rust.git"}, {"type": "git", "uri": "git@github.com:gentoo/gentoo-rust.git"}], "feed": ["https://github.com/gentoo/gentoo-rust/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-09 15:21:38 +0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 55}, "ryans": {"quality": "experimental", "status": "unofficial", "name": "ryans", "description": {"en": "Personal ebuild repository."}, "homepage": "https://github.com/bekcpear/ryans-repos", "owner": [{"type": "person", "email": "i@bitbili.net", "name": "Ryan Qian"}], "source": [{"type": "git", "uri": "https://github.com/bekcpear/ryans-repos.git"}, {"type": "git", "uri": "git@github.com:bekcpear/ryans-repos.git"}], "feed": ["https://github.com/bekcpear/ryans-repos/commits/main.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-08 02:20:09 +0800\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "sabayon": {"quality": "experimental", "status": "unofficial", "name": "sabayon", "description": {"en": "Sabayon ebuilds that could be upstreamed to\n Gentoo (or just being useful for Gentoo users as well):\n hot fixes, ebuild updates, etc.\n For Sabayon-only ebuilds, please use the sabayon-distro overlay.\n Bugs to http://bugs.sabayon.org"}, "homepage": "http://sabayon.org", "owner": [{"type": "person", "email": "joost.ruis@sabayonlinux.org"}], "source": [{"type": "git", "uri": "git://github.com/Sabayon/for-gentoo.git"}], "feed": ["https://github.com/feeds/Sabayon/commits/for-gentoo/master"], "x-state": "BAD_CACHE", "x-timestamp": "2021-02-19 23:00:39 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 150}, "sabayon-distro": {"quality": "experimental", "status": "unofficial", "name": "sabayon-distro", "description": {"en": "Sabayon related ebuilds such as artwork, kernel binaries,\n split packages, etc.\n Bugs to http://bugs.sabayon.org"}, "homepage": "http://sabayon.org", "owner": [{"type": "person", "email": "joost.ruis@sabayonlinux.org"}], "source": [{"type": "git", "uri": "git://github.com/Sabayon/sabayon-distro.git"}], "feed": ["https://github.com/feeds/Sabayon/commits/sabayon-distro/master"], "x-state": "BAD_CACHE", "x-timestamp": "2021-02-20 18:36:17 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 535}, "sage-on-gentoo": {"quality": "experimental", "status": "unofficial", "name": "sage-on-gentoo", "description": {"en": "Split ebuilds for the Sage computer algebra system"}, "homepage": "https://github.com/cschwan/sage-on-gentoo", "owner": [{"type": "person", "email": "frp.bissey@gmail.com", "name": "Francois Bissey"}], "source": [{"type": "git", "uri": "git://github.com/cschwan/sage-on-gentoo.git"}, {"type": "git", "uri": "https://github.com/cschwan/sage-on-gentoo.git"}], "feed": ["https://github.com/feeds/cschwan/commits/sage-on-gentoo/master"], "x-state": "GOOD", "x-timestamp": "2021-03-15 13:24:23 +1300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 258}, "salfter": {"quality": "experimental", "status": "unofficial", "name": "salfter", "description": {"en": "Scott Alfter's ebuilds"}, "homepage": "https://gitlab.com/salfter/portage", "owner": [{"type": "person", "email": "scott@alfter.us", "name": "Scott Alfter"}], "source": [{"type": "git", "uri": "https://gitlab.com/salfter/portage.git"}], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-15 17:10:34 -0700\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 154}, "sam_c": {"quality": "experimental", "status": "unofficial", "name": "sam_c", "description": {"en": "sam_c's personal overlay"}, "homepage": "https://github.com/thesamesam/overlay", "owner": [{"type": "person", "email": "sam@cmpct.info", "name": "Sam James"}], "source": [{"type": "git", "uri": "https://github.com/thesamesam/overlay"}, {"type": "git", "uri": "git+ssh://git@github.com/thesamesam/overlay.git"}], "feed": ["https://github.com/thesamesam/overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-27 15:32:48 +0000\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 8}, "sarnex-overlay": {"quality": "experimental", "status": "unofficial", "name": "sarnex-overlay", "description": {"en": "Sarnex's personal overlay"}, "homepage": "https://github.com/sarnex/sarnex-overlay.git", "owner": [{"type": "person", "email": "commendsarnex@gmail.com", "name": "Nick Sarnie"}], "source": [{"type": "git", "uri": "https://github.com/sarnex/sarnex-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/sarnex/sarnex-overlay.git"}], "feed": ["https://github.com/sarnex/sarnex-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2017-10-01 00:04:35 -0400\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "sattvik": {"quality": "experimental", "status": "unofficial", "name": "sattvik", "description": {"en": "sattvik's overlay with personalized bug fixes and tweaks"}, "homepage": "https://cgit.gentoo.org/user/sattvik.git/", "owner": [{"type": "person", "email": "gentoo@sattvik.com", "name": "Daniel Solano Gomez"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/sattvik.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/sattvik.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/sattvik.git"}], "feed": ["https://cgit.gentoo.org/user/sattvik.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-03-04 18:47:35 -0600\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 32}, "science": {"quality": "experimental", "status": "official", "name": "science", "description": {"en": "The Gentoo Science Overlay is intended as a place to work\n outside of the main portage tree on experimental ebuilds. Our aim is to\n increase the rate of development of scientific packages for Gentoo, but\n ebuilds in this repository are by their very nature more experimental. If\n you wish to use them you should be willing to help test and report\n bugs. For contribution read https://wiki.gentoo.org/wiki/Project:Science/Contributing\n "}, "homepage": "https://wiki.gentoo.org/wiki/Project:Science", "owner": [{"type": "project", "email": "sci@gentoo.org", "name": "sci"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/sci.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/sci.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/sci.git"}, {"type": "git", "uri": "https://github.com/gentoo-science/sci.git"}, {"type": "git", "uri": "git://github.com/gentoo-science/sci.git"}, {"type": "git", "uri": "git@github.com:gentoo-science/sci.git"}], "feed": ["https://cgit.gentoo.org/proj/sci.git/atom/", "https://github.com/gentoo-science/sci/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-16 17:46:36 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 727}, "scrill": {"quality": "experimental", "status": "unofficial", "name": "scrill", "description": {"en": "Some admin tools"}, "homepage": "https://github.com/scrill/scrill-overlay", "owner": [{"type": "person", "email": "sergey.zhuga@gmail.com", "name": "Sergey Zhuga"}], "source": [{"type": "git", "uri": "git://github.com/scrill/scrill-overlay.git"}], "feed": ["https://github.com/scrill/scrill-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-06-26 15:18:11 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 25}, "seadep": {"quality": "experimental", "status": "unofficial", "name": "seadep", "description": {"en": "just a few ebuilds, I couldn't find elsewhere"}, "homepage": "https://github.com/Keepco/gentoo-overlay-seadep", "owner": [{"type": "person", "email": "Rasmus.thomsen@live.de", "name": "Rasmus Thomsen"}], "source": [{"type": "git", "uri": "https://github.com/Keepco/gentoo-overlay-seadep.git"}, {"type": "git", "uri": "git://github.com/Keepco/gentoo-overlay-seadep.git"}, {"type": "git", "uri": "git@github.com:Keepco/gentoo-overlay-seadep.git"}], "feed": ["https://github.com/Keepco/gentoo-overlay-seadep/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2017-11-25 19:15:52 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "seden": {"quality": "experimental", "status": "unofficial", "name": "seden", "description": {"en": "Experimental ebuilds that are still unmaintained"}, "homepage": "https://cgit.gentoo.org/user/seden.git/", "owner": [{"type": "person", "email": "yamakuzure@gmx.net", "name": "Sven Eden"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/seden.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/seden.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/seden.git"}], "feed": ["https://cgit.gentoo.org/user/seden.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-03-12 08:22:49 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 29}, "setkeh": {"quality": "experimental", "status": "unofficial", "name": "setkeh", "description": {"en": "setkeh maintained ebuilds"}, "homepage": "https://github.com/setkeh/Portage-Overlay", "owner": [{"type": "person", "email": "setkeh@gmail.com", "name": "James (setkeh) Griffis"}], "source": [{"type": "git", "uri": "https://github.com/setkeh/Portage-Overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com:setkeh/Portage-Overlay.git"}], "feed": ["https://github.com/setkeh/Portage-Overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-05-19 14:57:04 +1000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "sevcsik": {"quality": "experimental", "status": "unofficial", "name": "sevcsik", "description": {"en": "Mainly cryptocurrency/blockchain related ebuilds"}, "homepage": "https://github.com/sevcsik/overlay", "owner": [{"type": "person", "email": "sevcsik@sevdev.hu", "name": "Andras Sevcsik"}], "source": [{"type": "git", "uri": "https://github.com/sevcsik/overlay.git"}, {"type": "git", "uri": "git://github.com/sevcsik/overlay.git"}, {"type": "git", "uri": "git@github.com:sevcsik/overlay.git"}], "feed": ["https://github.com/sevcsik/overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2017-08-29 00:43:36 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 8}, "sft": {"quality": "experimental", "status": "unofficial", "name": "sft", "description": {"en": "SFT Technologies gentoo overlay"}, "homepage": "https://github.com/SFTtech/gentoo-overlay", "owner": [{"type": "person", "email": "jj@stusta.net", "name": "Jonas Jelten"}], "source": [{"type": "git", "uri": "https://github.com/SFTtech/gentoo-overlay.git"}], "feed": ["https://github.com/SFTtech/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-15 23:33:30 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 24}, "sgs": {"quality": "experimental", "status": "unofficial", "name": "sgs", "description": {"en": "Simeon Simeonov's personal Gentoo overlay"}, "homepage": "https://github.com/blackm0re/sgs-overlay", "owner": [{"type": "person", "email": "sgs@pichove.org", "name": "Simeon Simeonov"}], "source": [{"type": "git", "uri": "https://github.com/blackm0re/sgs-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com:blackm0re/sgs-overlay.git"}], "feed": ["https://github.com/blackm0re/sgs-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-12-29 13:56:15 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "shnurise": {"quality": "experimental", "status": "unofficial", "name": "shnurise", "description": {"en": "packages for mono environment and other", "ru": "\u043f\u0430\u043a\u0435\u0442\u044b \u0434\u043b\u044f \u043c\u043e\u043d\u043e \u0438 \u0440\u0430\u0437\u043d\u043e\u0435 \u043f\u0440\u043e\u0447\u0435\u0435"}, "homepage": "https://github.com/ArsenShnurkov/shnurise", "owner": [{"type": "person", "email": "Arsen.Shnurkov@gmail.com", "name": "Arsen Shnurkov"}], "source": [{"type": "git", "uri": "https://github.com/ArsenShnurkov/shnurise.git"}, {"type": "git", "uri": "git://github.com/ArsenShnurkov/shnurise.git"}, {"type": "git", "uri": "git@github.com:ArsenShnurkov/shnurise.git"}], "feed": ["https://github.com/ArsenShnurkov/shnurise/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-02-07 13:09:42 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 40}, "sihnon": {"quality": "experimental", "status": "unofficial", "name": "sihnon", "description": {"en": "optiz0r's sihnon overlay"}, "homepage": "https://github.com/optiz0r/gentoo-overlay", "owner": [{"type": "person", "email": "optiz0r@gmail.com", "name": "optiz0r"}], "source": [{"type": "git", "uri": "https://github.com/optiz0r/gentoo-overlay.git"}, {"type": "git", "uri": "git://github.com/optiz0r/gentoo-overlay.git"}, {"type": "git", "uri": "git@github.com:optiz0r/gentoo-overlay.git"}], "feed": ["https://github.com/optiz0r/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-01-19 17:55:04 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 11}, "simonvanderveldt": {"quality": "experimental", "status": "unofficial", "name": "simonvanderveldt", "description": {"en": "Personal Gentoo overlay focused on music production and engineering applications"}, "homepage": "https://github.com/simonvanderveldt/simonvanderveldt-overlay", "owner": [{"type": "person", "email": "simon.vanderveldt@gmail.com", "name": "Simon van der Veldt"}], "source": [{"type": "git", "uri": "https://github.com/simonvanderveldt/simonvanderveldt-overlay.git"}, {"type": "git", "uri": "git://github.com/simonvanderveldt/simonvanderveldt-overlay.git"}, {"type": "git", "uri": "git@github.com:simonvanderveldt/simonvanderveldt-overlay.git"}], "feed": ["https://github.com/simonvanderveldt/simonvanderveldt-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-13 15:36:27 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 8}, "sinustrom": {"quality": "experimental", "status": "unofficial", "name": "sinustrom", "description": {"en": "Sinustrom Gentoo Overlay"}, "homepage": "https://github.com/zpuskas/sinustrom-gentoo-overlay", "owner": [{"type": "person", "email": "zoltan@sinustrom.info", "name": "Zoltan Puskas"}], "source": [{"type": "git", "uri": "https://github.com/zpuskas/sinustrom-gentoo-overlay.git"}, {"type": "git", "uri": "git://github.com/zpuskas/sinustrom-gentoo-overlay.git"}, {"type": "git", "uri": "git@github.com:zpuskas/sinustrom-gentoo-overlay.git"}], "feed": ["https://github.com/zpuskas/sinustrom-gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-13 13:14:52 -0800\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 21}, "sk-overlay": {"quality": "experimental", "status": "unofficial", "name": "sk-overlay", "description": {"en": "The Scriptkitties overlay for additional ebuilds"}, "homepage": "https://github.com/scriptkitties/overlay", "owner": [{"type": "person", "email": "p.spek@tyil.work", "name": "Patrick Spek"}], "source": [{"type": "git", "uri": "https://github.com/scriptkitties/overlay.git"}, {"type": "git", "uri": "git://github.com/scriptkitties/overlay.git"}, {"type": "git", "uri": "git@github.com:scriptkitties/overlay.git"}], "feed": ["https://github.com/scriptkitties/overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-07 20:27:46 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 53}, "slonko": {"quality": "experimental", "status": "unofficial", "name": "slonko", "description": {"en": "Personal portage overlay"}, "homepage": "https://slonko.net/portage", "owner": [{"type": "person", "email": "marcin.deranek@slonko.net", "name": "Marcin Deranek"}], "source": [{"type": "git", "uri": "https://slonko.net/git/portage"}], "feed": ["https://slonko.net/git/portage/atom/"], "x-state": "GOOD", "x-timestamp": "2021-03-12 16:42:03 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 21}, "slyfox": {"quality": "experimental", "status": "official", "name": "slyfox", "description": {"en": "slyfox's ebuild den"}, "homepage": "https://github.com/trofi/slyfox-gentoo", "owner": [{"type": "person", "email": "slyfox@gentoo.org", "name": "Sergei Trofimovich"}], "source": [{"type": "git", "uri": "https://github.com/trofi/slyfox-gentoo"}], "feed": ["https://github.com/trofi/slyfox-gentoo/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-11 10:10:56 +0000\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 18}, "smaeul": {"quality": "experimental", "status": "unofficial", "name": "smaeul", "description": {"en": "Personal overlay, mainly packages patched for musl compatibility"}, "homepage": "https://github.com/smaeul/portage-overlay", "owner": [{"type": "person", "email": "samuel@sholland.org", "name": "Samuel Holland"}], "source": [{"type": "git", "uri": "https://github.com/smaeul/portage-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/smaeul/portage-overlay.git"}], "feed": ["https://github.com/smaeul/portage-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-19 21:29:49 -0600\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 19}, "snapd": {"quality": "experimental", "status": "unofficial", "name": "snapd", "description": {"en": "ebuilds for canaonicals snapd"}, "homepage": "https://github.com/zigford/snapd", "owner": [{"type": "person", "email": "zigford@gmail.com", "name": "Jesse Harris"}], "source": [{"type": "git", "uri": "https://github.com/zigford/snapd.git"}], "feed": ["https://github.com/zigford/snapd/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-31 14:42:39 +1000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "sogo-connector": {"quality": "experimental", "status": "unofficial", "name": "sogo-connector", "description": {"en": "SOGO connector overlay"}, "homepage": "https://cgit.gentoo.org/repo/user/sogo-connector.git/", "owner": [{"type": "person", "email": "gentoo@posteo.de", "name": "Fabian K\u00f6ster"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/user/sogo-connector.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/repo/user/sogo-connector.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/user/sogo-connector.git"}], "feed": ["https://cgit.gentoo.org/repo/user/sogo-connector.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-04-02 11:14:25 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 1}, "soltys": {"quality": "experimental", "status": "unofficial", "name": "soltys", "description": {"en": "tools usefull on CTFs and things that aren't in the portage tristelune"}, "homepage": "https://github.com/soltysek/soltys-overlay", "owner": [{"type": "person", "email": "bgo@soltys.info", "name": "Krzysztof Koro\u015bcik"}], "source": [{"type": "git", "uri": "https://github.com/soltysek/soltys-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/soltysek/soltys-overlay.git"}], "feed": ["https://github.com/soltysek/soltys-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-01-27 19:09:18 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 30}, "sorinp": {"quality": "experimental", "status": "unofficial", "name": "sorinp", "description": {"en": "A collection of ebuilds that are missing or outdated or incomplete on the Gentoo portage official repository.."}, "homepage": "https://github.com/psihozefir/sorinp-gentoo-overlay", "owner": [{"type": "person", "email": "sorin.panca@gmail.com", "name": "Sorin Panca"}], "source": [{"type": "git", "uri": "https://github.com/psihozefir/sorinp-gentoo-overlay"}], "x-state": "GOOD", "x-timestamp": "2016-11-20 14:11:02 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "sorrow": {"quality": "experimental", "status": "unofficial", "name": "sorrow", "description": {"en": "Ebuilds for some wayland-related software and some other stuff"}, "homepage": "https://gitlab.com/eternal-sorrow/gentoo-local", "owner": [{"type": "person", "email": "sergamena@inbox.ru", "name": "sorrow"}], "source": [{"type": "git", "uri": "https://gitlab.com/eternal-sorrow/gentoo-local.git"}, {"type": "git", "uri": "git+ssh://git@gitlab.com:eternal-sorrow/gentoo-local.git"}], "feed": ["https://gitlab.com/eternal-sorrow/gentoo-local/commits/master?format=atom"], "x-state": "GOOD", "x-timestamp": "2021-03-03 15:58:12 +1000\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 16}, "spikyatlinux": {"quality": "experimental", "status": "unofficial", "name": "spikyatlinux", "description": {"en": "Here are some of my own or modified ebuilds. Also some of them I've found in the web."}, "homepage": "https://github.com/spikyatlinux/ebuilds_for_gentoo", "owner": [{"type": "person", "email": "spikyatlinux@gmail.com", "name": "SpikyAtLinux"}], "source": [{"type": "git", "uri": "https://github.com/spikyatlinux/ebuilds_for_gentoo.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-07 12:03:09 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 17}, "sping": {"quality": "experimental", "status": "official", "name": "sping", "description": {"en": "Overlay of Gentoo developer Sebastian Pipping; for issues, please open tickets at GitHub"}, "homepage": "https://github.com/hartwork/gentoo-overlay-sping", "owner": [{"type": "person", "email": "sping@gentoo.org", "name": "Sebastian Pipping"}], "source": [{"type": "git", "uri": "https://github.com/hartwork/gentoo-overlay-sping.git"}, {"type": "git", "uri": "git://github.com/hartwork/gentoo-overlay-sping.git"}, {"type": "git", "uri": "git@github.com:hartwork/gentoo-overlay-sping.git"}], "feed": ["https://github.com/hartwork/gentoo-overlay-sping/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-01-04 19:49:25 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "squeezebox": {"quality": "experimental", "status": "unofficial", "name": "squeezebox", "description": {"en": "Packages for the Squeezebox network audio player from Logitech"}, "homepage": "https://cgit.gentoo.org/user/squeezebox.git/", "owner": [{"type": "person", "email": "stuart@hickinbottom.com", "name": "Stuart Hickinbottom"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/squeezebox.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/squeezebox.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/squeezebox.git"}], "feed": ["https://cgit.gentoo.org/user/squeezebox.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-02-27 10:50:29 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 14}, "src_prepare-overlay": {"quality": "experimental", "status": "unofficial", "name": "src_prepare-overlay", "description": {"en": "src_prepare group's Gentoo overlay"}, "homepage": "https://gitlab.com/src_prepare/src_prepare-overlay.git", "owner": [{"type": "person", "name": "XGQT", "email": "xgqt@protonmail.com"}], "source": [{"type": "git", "uri": "https://gitlab.com/src_prepare/src_prepare-overlay.git"}, {"type": "git", "uri": "git+ssh://git@gitlab.com/src_prepare/src_prepare-overlay.git"}], "feed": ["https://gitlab.com/src_prepare/src_prepare-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-15 15:52:36 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 223}, "ssnb": {"quality": "experimental", "status": "unofficial", "name": "ssnb", "description": {"en": "Gentoo repository made by ssnb"}, "homepage": "https://cgit.gentoo.org/repo/user/ssnb.git/", "owner": [{"type": "person", "email": "samuelbernardo.mail@gmail.com", "name": "Samuel Bernardo"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/user/ssnb.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/repo/user/ssnb"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/user/ssnb.git"}], "feed": ["https://cgit.gentoo.org/repo/user/ssnb.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-03-08 00:31:07 +0000\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 330}, "sspreitz": {"quality": "experimental", "status": "unofficial", "name": "sspreitz", "description": {"en": "My Gentoo repository and ebuilds"}, "homepage": "https://github.com/sspreitzer/gentoo-repo", "owner": [{"type": "person", "email": "sspreitz@redhat.com", "name": "Sascha Spreitzer"}], "source": [{"type": "git", "uri": "https://github.com/sspreitzer/gentoo-repo.git"}, {"type": "git", "uri": "git+ssh://git@github.com/sspreitzer/gentoo-repo.git"}, {"type": "git", "uri": "git@github.com:sspreitzer/gentoo-repo.git"}], "feed": ["https://github.com/sspreitzer/gentoo-repo/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-09-24 10:35:30 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 24}, "steam-overlay": {"quality": "experimental", "status": "unofficial", "name": "steam-overlay", "description": {"en": "Gentoo overlay for Valve's Steam client and Steam-based games"}, "homepage": "https://github.com/anyc/steam-overlay", "owner": [{"type": "person", "email": "dev@kicherer.org", "name": "Mario Kicherer"}], "source": [{"type": "git", "uri": "https://github.com/anyc/steam-overlay.git"}, {"type": "git", "uri": "git://github.com/anyc/steam-overlay.git"}, {"type": "git", "uri": "git@github.com:anyc/steam-overlay.git"}], "feed": ["https://github.com/anyc/steam-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-13 23:10:18 +0000\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 14}, "stefantalpalaru": {"quality": "experimental", "status": "unofficial", "name": "stefantalpalaru", "description": {"en": "Gentoo overlay with ebuilds by Stefan Talpalaru that are not in the tree"}, "homepage": "https://github.com/stefantalpalaru/gentoo-overlay", "owner": [{"type": "person", "email": "stefantalpalaru@yahoo.com", "name": "Stefan Talpalaru"}], "source": [{"type": "git", "uri": "https://github.com/stefantalpalaru/gentoo-overlay.git"}, {"type": "git", "uri": "git://github.com/stefantalpalaru/gentoo-overlay.git"}, {"type": "git", "uri": "git@github.com:stefantalpalaru/gentoo-overlay.git"}], "feed": ["https://github.com/stefantalpalaru/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-13 22:12:35 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 969}, "stha09": {"quality": "experimental", "status": "unofficial", "name": "stha09", "description": {"en": "stha09's personal overlay"}, "homepage": "https://github.com/stha09/gpo-stha09", "owner": [{"type": "person", "email": "sultan@gentoo.org", "name": "Stephan Hartmann"}], "source": [{"type": "git", "uri": "https://github.com/stha09/gpo-stha09.git"}, {"type": "git", "uri": "git://github.com:stha09/gpo-stha09.git"}, {"type": "git", "uri": "git@github.com:stha09/gpo-stha09.git"}], "feed": ["https://github.com/stha09/gpo-stha09/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-08 13:33:47 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 12}, "stowe-verlay": {"quality": "experimental", "status": "unofficial", "name": "stowe-verlay", "description": {"en": "Few things that have either broken elsewhere or fallen unmaintained, such as winexe, a source-based version of logitech media server, a patched version of dansguardian"}, "homepage": "https://github.com/mwstowe/stowe-verlay", "owner": [{"type": "person", "email": "mstowe@chicago.us.mensa.org", "name": "Michael Stowe"}], "source": [{"type": "git", "uri": "https://github.com/mwstowe/stowe-verlay.git"}], "feed": ["https://github.com/mwstowe/stowe-verlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-04 08:39:13 -0600\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 33}, "strohel": {"quality": "experimental", "status": "unofficial", "name": "strohel", "description": {"en": "strohel's overlay"}, "homepage": "https://github.com/strohel/strohel-overlay", "owner": [{"type": "person", "email": "matej@laitl.cz", "name": "Mat\u011bj Laitl"}], "source": [{"type": "git", "uri": "https://strohel@github.com/strohel/strohel-overlay.git"}, {"type": "git", "uri": "git://github.com/strohel/strohel-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com:strohel/strohel-overlay.git"}], "feed": ["https://github.com/strohel/strohel-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-02-15 11:27:29 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "stuff": {"quality": "experimental", "status": "unofficial", "name": "stuff", "description": {"en": "stuff"}, "homepage": "https://github.com/istitov/stuff", "owner": [{"type": "person", "email": "iohann.s.titov@gmail.com"}], "source": [{"type": "git", "uri": "https://github.com/istitov/stuff.git"}], "feed": ["https://github.com/istitov/stuff/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-01 17:05:28 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 285}, "sublime-text": {"quality": "experimental", "status": "unofficial", "name": "sublime-text", "description": {"en": "Collection of ebuilds to install Sublime Text 2 or Sublime Text 3"}, "homepage": "https://github.com/DamnWidget/sublime-text", "owner": [{"type": "person", "email": "oscar.campos@member.fsf.org", "name": "Oscar Campos"}], "source": [{"type": "git", "uri": "https://github.com/DamnWidget/sublime-text.git"}, {"type": "git", "uri": "git://github.com/DamnWidget/sublime-text.git"}, {"type": "git", "uri": "git@github.com:DamnWidget/sublime-text.git"}], "feed": ["https://github.com/DamnWidget/sublime-text/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2019-04-08 13:16:10 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 13}, "superposition": {"quality": "experimental", "status": "unofficial", "name": "superposition", "description": {"en": "Phil's overlay"}, "homepage": "https://cgit.gentoo.org/repo/user/superposition.git/", "owner": [{"type": "person", "email": "Phil_miess@yahoo.com", "name": "Philip Miess"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/user/superposition.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/repo/user/superposition.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/user/superposition.git"}], "feed": ["https://cgit.gentoo.org/repo/user/superposition.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-03-10 17:58:16 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 57}, "swegener": {"quality": "experimental", "status": "official", "name": "swegener", "description": {"en": "This overlay contains some experimental stuff, but mostly\n stuff I quickly wrote an ebuild for or grabed it from bugzilla and did not\n have the time to commit it to the official tree or do not consider it ready\n for it."}, "homepage": "https://dev.gentoo.org/~swegener/", "owner": [{"type": "person", "email": "swegener@gentoo.org"}], "source": [{"type": "rsync", "uri": "rsync://rsync.gentoo.stealer.net/swegener-overlay/"}], "x-state": "GOOD", "x-timestamp": "2020-10-24 13:35:01.000000000 +0000\n", "x-masters": ["gentoo"], "x-ebuild-count": 33}, "tabinol": {"quality": "experimental", "status": "unofficial", "name": "tabinol", "description": {"en": "Tabinol personal overlay with no special focus"}, "homepage": "https://github.com/Tabinol/tabinol-overlay", "owner": [{"type": "person", "email": "mblanchet@fastmail.com", "name": "Michel Blanchet"}], "source": [{"type": "git", "uri": "https://github.com/Tabinol/tabinol-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/Tabinol/tabinol-overlay.git"}], "feed": ["https://github.com/Tabinol/tabinol-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2019-02-25 22:30:56 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "tamiko": {"quality": "experimental", "status": "unofficial", "name": "tamiko", "description": {"en": "Developer overlay"}, "homepage": "https://cgit.gentoo.org/repo/dev/tamiko.git/", "owner": [{"type": "person", "email": "tamiko@gentoo.org", "name": "Matthias Maier"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/dev/tamiko.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/repo/dev/tamiko.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/dev/tamiko.git"}], "feed": ["https://cgit.gentoo.org/repo/dev/tamiko.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-02-27 22:25:41 -0600\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 10}, "tante": {"quality": "experimental", "status": "unofficial", "name": "tante", "description": {"en": "Overlay of tante"}, "homepage": "https://github.com/tante/overlay", "owner": [{"type": "person", "email": "tante@tante.cc"}], "source": [{"type": "git", "uri": "https://github.com/tante/overlay.git"}], "x-state": "GOOD", "x-timestamp": "2017-02-26 14:13:35 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "tarantool": {"quality": "experimental", "status": "unofficial", "name": "tarantool", "description": {"en": "Tarantool Gentoo Overlay"}, "homepage": "https://github.com/tarantool/gentoo-overlay", "owner": [{"type": "person", "email": "totktonada.ru@gmail.com", "name": "Alexander Turenko"}], "source": [{"type": "git", "uri": "https://github.com/tarantool/gentoo-overlay.git"}, {"type": "git", "uri": "git://github.com/tarantool/gentoo-overlay.git"}, {"type": "git", "uri": "git@github.com:tarantool/gentoo-overlay.git"}], "feed": ["https://github.com/tarantool/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-04 03:36:05 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 56}, "tastytea": {"quality": "experimental", "status": "unofficial", "name": "tastytea", "description": {"en": "Overlay of tastytea"}, "homepage": "https://schlomp.space/tastytea/overlay", "owner": [{"type": "person", "email": "gentoo@tastytea.de", "name": "tastytea"}], "source": [{"type": "git", "uri": "https://schlomp.space/tastytea/overlay.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-13 10:18:41 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 39}, "tatsh-overlay": {"quality": "experimental", "status": "unofficial", "name": "tatsh-overlay", "description": {"en": "Overlay from Tatsh - emulators/fonts/game/misc"}, "homepage": "https://github.com/Tatsh/tatsh-overlay", "owner": [{"type": "person", "email": "audvare+overlay@gmail.com", "name": "Andrew Udvare"}], "source": [{"type": "git", "uri": "https://github.com/Tatsh/tatsh-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/Tatsh/tatsh-overlay.git"}], "feed": ["https://github.com/Tatsh/tatsh-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-16 02:03:24 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 84}, "telans": {"quality": "experimental", "status": "unofficial", "name": "telans", "description": {"en": "Overlay from telans - gaming/misc"}, "homepage": "https://github.com/telans/EBUILDS", "owner": [{"type": "person", "email": "telans@posteo.de", "name": "telans"}], "source": [{"type": "git", "uri": "https://github.com/telans/EBUILDS.git"}], "feed": ["https://github.com/telans/EBUILDS/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-01-27 18:17:53 +1300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 9}, "tengine-overlay": {"quality": "experimental", "status": "unofficial", "name": "tengine-overlay", "description": {"en": "Tengine overlay for Gentoo Linux"}, "homepage": "https://github.com/damex/tengine-overlay", "owner": [{"type": "person", "email": "damex.pp@gmail.com", "name": "Roman Kuzmitsky"}], "source": [{"type": "git", "uri": "https://github.com/damex/tengine-overlay.git"}], "feed": ["https://github.com/damex/tengine-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2017-11-29 08:54:54 -0800\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 6}, "tf201": {"quality": "experimental", "status": "unofficial", "name": "tf201", "description": {"en": "TF201 (Asus Transformer Prime) overlay for Gentoo"}, "homepage": "https://github.com/Tux1c/tf201-overlay", "owner": [{"type": "person", "email": "tux1cc@gmail.com", "name": "Yan A."}], "source": [{"type": "git", "uri": "https://github.com/Tux1c/tf201-overlay"}], "x-state": "GOOD", "x-timestamp": "2015-04-11 16:03:12 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "tgbugs-overlay": {"quality": "experimental", "status": "unofficial", "name": "tgbugs-overlay", "description": {"en": "tgbugs portage overlay for custom ebuilds"}, "homepage": "https://github.com/tgbugs/tgbugs-overlay", "owner": [{"type": "person", "email": "tgbugs@gmail.com", "name": "Tom Gillespie"}], "source": [{"type": "git", "uri": "https://github.com/tgbugs/tgbugs-overlay.git"}, {"type": "git", "uri": "git://github.com/tgbugs/tgbugs-overlay.git"}, {"type": "git", "uri": "git@github.com:tgbugs/tgbugs-overlay.git"}], "feed": ["https://github.com/tgbugs/tgbugs-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-14 21:43:21 -0700\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 352}, "thabairne": {"quality": "experimental", "status": "unofficial", "name": "thabairne", "description": {"en": "ntnn's Overlay"}, "homepage": "https://github.com/ntnn/gentoo-thabairne", "owner": [{"type": "person", "email": "nelo@wallus.de", "name": "Nelo-Thara Wallus"}], "source": [{"type": "git", "uri": "https://github.com/ntnn/gentoo-thabairne.git"}], "feed": ["https://github.com/ntnn/gentoo-thabairne/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-22 20:38:59 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 15}, "thegreatmcpain": {"quality": "experimental", "status": "unofficial", "name": "thegreatmcpain", "description": {"en": "TheGreatMcPain's personal ebuild overlay"}, "homepage": "https://gitlab.com/TheGreatMcPain/thegreatmcpain-overlay", "owner": [{"type": "person", "email": "sixsupersonic@gmail.com", "name": "James McClain"}], "source": [{"type": "git", "uri": "https://gitlab.com/TheGreatMcPain/thegreatmcpain-overlay.git"}, {"type": "git", "uri": "git@gitlab.com:TheGreatMcPain/thegreatmcpain-overlay.git"}], "feed": ["https://gitlab.com/TheGreatMcPain/thegreatmcpain-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-14 20:13:26 -0500\n", "x-openpgp-signed": "E", "x-masters": ["gentoo", "bobwya"], "x-ebuild-count": 133}, "tmacedo": {"quality": "experimental", "status": "unofficial", "name": "tmacedo", "description": {"en": "User Overlay"}, "homepage": "https://github.com/tmacedo/portage", "owner": [{"type": "person", "email": "tftfmacedo@gmail.com", "name": "Tiago Macedo"}], "source": [{"type": "git", "uri": "git://github.com/tmacedo/portage.git"}], "feed": ["https://github.com/tmacedo/portage/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-02 17:26:30 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 25}, "tocaro": {"quality": "experimental", "status": "unofficial", "name": "tocaro", "description": {"en": "tocaro personnal o.g.o"}, "homepage": "https://cgit.gentoo.org/user/tocaro.git/", "owner": [{"type": "person", "email": "tocaro@thocar.org", "name": "Thomas Carri\u00e9"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/tocaro.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/tocaro.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/tocaro.git"}], "feed": ["https://cgit.gentoo.org/user/tocaro.git/atom/"], "x-state": "GOOD", "x-timestamp": "2015-03-28 19:02:11 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 7}, "toniz4-overlay": {"quality": "experimental", "status": "unofficial", "name": "toniz4-overlay", "description": {"en": "Useful packages for your person use"}, "homepage": "https://github.com/toniz4/toniz4-overlay.git/", "owner": [{"type": "person", "email": "cassioavila@yandex.com", "name": "C\u00e1ssio Ribeiro Alves de \u00c1vila"}], "source": [{"type": "git", "uri": "https://github.com/toniz4/toniz4-overlay.git"}, {"type": "git", "uri": "git://github.com/toniz4/toniz4-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com:toniz4/toniz4-overlay.git"}], "feed": ["https://github.com/toniz4/toniz4-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-12-16 23:28:35 -0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 8}, "toolchain": {"quality": "experimental", "status": "official", "name": "toolchain", "description": {"en": "Toolchain ebuilds that are unsuitable for the tree. Snapshots,\n unstable versions, etc..."}, "homepage": "https://cgit.gentoo.org/proj/toolchain.git/", "owner": [{"type": "project", "email": "toolchain@gentoo.org"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/toolchain.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/toolchain.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/toolchain.git"}], "feed": ["https://cgit.gentoo.org/proj/toolchain.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-02-22 09:39:04 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 0}, "torbrowser": {"quality": "experimental", "status": "unofficial", "name": "torbrowser", "description": {"en": "Tor Browser related ebuilds"}, "homepage": "https://github.com/MeisterP/torbrowser-overlay", "owner": [{"type": "person", "email": "poncho@spahan.ch", "name": "MeisterP"}], "source": [{"type": "git", "uri": "https://github.com/MeisterP/torbrowser-overlay.git"}, {"type": "git", "uri": "git://github.com/MeisterP/torbrowser-overlay.git"}, {"type": "git", "uri": "git@github.com:MeisterP/torbrowser-overlay.git"}], "feed": ["https://github.com/MeisterP/torbrowser-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-12 18:23:21 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 12}, "trolltoo": {"quality": "experimental", "status": "unofficial", "name": "trolltoo", "description": {"en": "An ebuild overlay for Gentoo."}, "homepage": "https://github.com/dallenwilson/trolltoo", "owner": [{"type": "person", "email": "dallen.wilson@gmail.com", "name": "Dallen Wilson"}], "source": [{"type": "git", "uri": "https://github.com/dallenwilson/trolltoo.git"}, {"type": "git", "uri": "git+ssh://git@github.com/dallenwilson/trolltoo.git"}], "feed": ["https://github.com/dallenwilson/trolltoo/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-22 14:29:50 -0700\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 20}, "tryton": {"quality": "experimental", "status": "unofficial", "name": "tryton", "description": {"en": "Tryton"}, "homepage": "http://www.tryton.org/", "owner": [{"type": "person", "email": "cedk@gentoo.org"}], "source": [{"type": "mercurial", "uri": "https://hg.tryton.org/tryton-overlay"}], "x-state": "GOOD", "x-timestamp": "2021-03-03 22:57:07 +0100", "x-masters": ["gentoo"], "x-ebuild-count": 492}, "twister": {"quality": "experimental", "status": "unofficial", "name": "twister", "description": {"en": "Unoffical gentoo overlay for twister"}, "homepage": "https://github.com/ddorian1/gentoo-twister-overlay", "owner": [{"type": "person", "email": "mail@jschwab.org", "name": "Johannes Schwab"}], "source": [{"type": "git", "uri": "https://github.com/ddorian1/gentoo-twister-overlay.git"}, {"type": "git", "uri": "git://github.com/ddorian1/gentoo-twister-overlay.git"}, {"type": "git", "uri": "git@github.com:ddorian1/gentoo-twister-overlay.git"}], "feed": ["https://github.com/ddorian1/gentoo-twister-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2018-01-06 12:40:31 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "ulm": {"quality": "experimental", "status": "official", "name": "ulm", "description": {"en": "Developer overlay"}, "homepage": "https://cgit.gentoo.org/repo/dev/ulm.git/", "owner": [{"type": "person", "email": "ulm@gentoo.org", "name": "Ulrich M\u00fcller"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/dev/ulm.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/repo/dev/ulm.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/dev/ulm.git"}], "feed": ["https://cgit.gentoo.org/repo/dev/ulm.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-02-21 22:16:56 +0100\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 10}, "ultrabug": {"quality": "experimental", "status": "official", "name": "ultrabug", "description": {"en": "Developer Overlay"}, "homepage": "https://cgit.gentoo.org/dev/ultrabug.git/", "owner": [{"type": "person", "email": "ultrabug@gentoo.org", "name": "Alexys Jacob"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/ultrabug.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/ultrabug.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/ultrabug.git"}], "feed": ["https://cgit.gentoo.org/dev/ultrabug.git/atom/"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-10 17:43:11 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 22}, "unc3nsored": {"quality": "experimental", "status": "unofficial", "name": "unc3nsored", "description": {"en": "Overlay for software I didn't find in the main tree"}, "homepage": "https://github.com/xxc3nsoredxx/unc3nsored", "owner": [{"type": "person", "email": "xxc3ncoredxx@gmail.com", "name": "Oskari Pirhonen"}], "source": [{"type": "git", "uri": "https://github.com/xxc3nsoredxx/unc3nsored.git"}], "feed": ["https://github.com/xxc3nsoredxx/unc3nsored/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-27 21:39:14 -0600\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 3}, "unity-gentoo": {"quality": "experimental", "status": "unofficial", "name": "unity-gentoo", "description": {"en": "Overlay to install the Unity desktop"}, "homepage": "https://github.com/shiznix/unity-gentoo", "owner": [{"type": "person", "email": "rickfharris@yahoo.com.au", "name": "Rick Harris"}], "source": [{"type": "git", "uri": "https://github.com/shiznix/unity-gentoo"}, {"type": "git", "uri": "git://github.com/shiznix/unity-gentoo.git"}], "feed": ["https://github.com/feeds/shiznix/commits/unity-gentoo/master"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-02 21:59:41 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 185}, "usenet-overlay": {"quality": "experimental", "status": "unofficial", "name": "usenet-overlay", "description": {"en": "Personal Overlay for Lidarr, Radarr and Sonarr "}, "homepage": "https://github.com/xartin/gentoo-overlay", "owner": [{"type": "person", "email": "mcrawford@eliteitminds.com", "name": "Michael Crawford"}], "source": [{"type": "git", "uri": "https://github.com/xartin/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/xartin/gentoo-overlay.git"}], "feed": ["https://github.com/xartin/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-11 20:20:57 -0600\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 16}, "vampire": {"quality": "experimental", "status": "unofficial", "name": "vampire", "description": {"en": "A personal repository. So much bleeding edge, you would bet a vampire was involved."}, "homepage": "https://github.com/TheCrueltySage/vampire-overlay", "owner": [{"type": "person", "email": "miltenfiremage@gmail.com", "name": "TheCrueltySage"}], "source": [{"type": "git", "uri": "https://github.com/TheCrueltySage/vampire-overlay.git"}, {"type": "git", "uri": "git://github.com/TheCrueltySage/vampire-overlay.git"}], "feed": ["https://github.com/TheCrueltySage/vampire-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-02-17 20:46:19 +0700\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 20}, "vapoursynth": {"quality": "experimental", "status": "unofficial", "name": "vapoursynth", "description": {"en": "Unofficial repository with all vapoursynth related ebuilds"}, "homepage": "https://github.com/4re/vapoursynth-portage", "owner": [{"type": "person", "email": "surukko@gmail.com"}], "source": [{"type": "git", "uri": "https://github.com/4re/vapoursynth-portage.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-13 15:52:20 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 302}, "vayerx": {"quality": "experimental", "status": "unofficial", "name": "vayerx", "description": {"en": "Personal overlay of Vasiliy Yeremeyev"}, "homepage": "https://github.com/vayerx/vayerx-gentoo/", "owner": [{"type": "person", "email": "vayerx@gmail.com", "name": "Vasiliy Yeremeyev"}], "source": [{"type": "git", "uri": "https://github.com/vayerx/vayerx-gentoo.git"}, {"type": "git", "uri": "git://github.com/vayerx/vayerx-gentoo.git"}, {"type": "git", "uri": "git@github.com:vayerx/vayerx-gentoo.git"}], "feed": ["https://github.com/vayerx/vayerx-gentoo/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-16 15:38:48 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 68}, "vdr-devel": {"quality": "experimental", "status": "official", "name": "vdr-devel", "description": {"en": "Overlay for VDR, that contains ebuilds for development version\n of VDR, and specific plugins for that version."}, "homepage": "https://cgit.gentoo.org/proj/vdr/devel.git/", "owner": [{"type": "project", "email": "vdr@gentoo.org"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/vdr/devel.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/vdr/devel.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/vdr/devel.git"}], "feed": ["https://cgit.gentoo.org/proj/vdr/devel.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-08-27 20:54:04 +0200\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 37}, "vifino-overlay": {"quality": "experimental", "status": "unofficial", "name": "vifino-overlay", "description": {"en": "vifino's personal overlay"}, "homepage": "https://github.com/vifino/vifino-overlay", "owner": [{"type": "person", "email": "vifino@tty.sh", "name": "Adrian \"vifino\" Pistol"}], "source": [{"type": "git", "uri": "https://github.com/vifino/vifino-overlay.git"}, {"type": "git", "uri": "git://github.com/vifino/vifino-overlay.git"}, {"type": "git", "uri": "git@github.com:vifino/vifino-overlay.git"}], "feed": ["https://github.com/vifino/vifino-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-16 14:33:28 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 46}, "vklimovs": {"quality": "experimental", "status": "unofficial", "name": "vklimovs", "description": {"en": "vklimovs' personal portage overlay"}, "homepage": "https://github.com/vklimovs/portage-overlay", "owner": [{"type": "person", "email": "vklimovs@gmail.com", "name": "Vjaceslavs Klimovs"}], "source": [{"type": "git", "uri": "https://github.com/vklimovs/portage-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/vklimovs/portage-overlay.git"}], "feed": ["https://github.com/vklimovs/portage-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-14 10:14:16 -0800\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 24}, "vmacs": {"quality": "experimental", "status": "unofficial", "name": "vmacs", "description": {"en": "VMACS Personal Gentoo Overlay"}, "homepage": "https://cgit.gentoo.org/user/vmacs.git/", "owner": [{"type": "person", "email": "vance.m.allen@gmail.com", "name": "Vance M. Allen"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/vmacs.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/vmacs.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/vmacs.git"}], "feed": ["https://cgit.gentoo.org/user/vmacs.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-10-30 20:09:52 -0600\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 7}, "vortex": {"quality": "experimental", "status": "unofficial", "name": "vortex", "description": {"en": "Personal overlay"}, "homepage": "https://github.com/nE0sIghT/vortex-overlay", "owner": [{"type": "person", "email": "ykonotopov@gnome.org", "name": "Yuri 'nE0sIghT' Konotopov"}], "source": [{"type": "git", "uri": "https://github.com/nE0sIghT/vortex-overlay.git"}, {"type": "git", "uri": "git://github.com/nE0sIghT/vortex-overlay.git"}], "feed": ["https://github.com/nE0sIghT/vortex-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-01-24 10:27:38 +0400\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 77}, "vowstar": {"quality": "experimental", "status": "unofficial", "name": "vowstar", "description": {"en": "Ebuilds from vowstar's git"}, "homepage": "https://github.com/vowstar/vowstar-overlay", "owner": [{"type": "person", "email": "vowstar@gmail.com"}], "source": [{"type": "git", "uri": "https://github.com/vowstar/vowstar-overlay.git"}, {"type": "git", "uri": "git://github.com/vowstar/vowstar-overlay.git"}, {"type": "git", "uri": "git@github.com:vowstar/vowstar-overlay.git"}], "feed": ["https://github.com/vowstar/vowstar-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-10 11:48:58 +0800\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 74}, "voyageur": {"quality": "experimental", "status": "official", "name": "voyageur", "description": {"en": "Voyageur's random ebuilds stuff"}, "homepage": "https://cafarelli.fr/cgi-bin/cgit.cgi/voyageur-overlay/", "owner": [{"type": "person", "email": "voyageur@gentoo.org"}], "source": [{"type": "git", "uri": "https://cafarelli.fr/git/voyageur-overlay/"}], "feed": ["https://cafarelli.fr/cgi-bin/cgit.cgi/voyageur-overlay/atom"], "x-state": "GOOD", "x-timestamp": "2021-03-12 11:22:50 +0100\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 36}, "waebbl": {"quality": "experimental", "status": "unofficial", "name": "waebbl", "description": {"en": "waebbl's overlay"}, "homepage": "https://github.com/waebbl/waebbl-gentoo", "owner": [{"type": "person", "email": "waebbl@gmail.com", "name": "Bernd Waibel"}], "source": [{"type": "git", "uri": "https://github.com/waebbl/waebbl-gentoo.git"}, {"type": "git", "uri": "git+ssh://git@github.com/waebbl/waebbl-gentoo.git"}], "feed": ["https://github.com/waebbl/waebbl-gentoo/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-14 15:08:05 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 54}, "waffle-builds": {"quality": "experimental", "status": "unofficial", "name": "waffle-builds", "description": {"en": "FlyingWaffle's personal ebuild overlay."}, "homepage": "https://github.com/FlyingWaffleDev/waffle-builds", "owner": [{"type": "person", "email": "flyingwaffle@pm.me", "name": "FlyingWaffle"}], "source": [{"type": "git", "uri": "https://github.com/FlyingWaffleDev/waffle-builds.git"}, {"type": "git", "uri": "git+ssh://git@github.com/FlyingWaffleDev/waffle-builds.git"}], "feed": ["https://github.com/FlyingWaffleDev/waffle-builds/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-03 17:00:29 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 63}, "wayland-desktop": {"quality": "experimental", "status": "unofficial", "name": "wayland-desktop", "description": {"en": "gentoo overlay for wayland related ebuilds"}, "homepage": "https://github.com/bsd-ac/wayland-desktop", "owner": [{"type": "person", "email": "gentoo@aisha.cc", "name": "Aisha Tammy"}], "source": [{"type": "git", "uri": "https://github.com/bsd-ac/wayland-desktop.git"}, {"type": "git", "uri": "git+ssh://git@github.com/bsd-ac/wayland-desktop.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-15 15:38:42 -0400\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 106}, "wbrana": {"quality": "experimental", "status": "unofficial", "name": "wbrana", "description": {"en": "wbrana's overlay"}, "homepage": "https://cgit.gentoo.org/user/wbrana.git/", "owner": [{"type": "person", "email": "wbrana@gmail.com", "name": "William Brana"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/wbrana.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/wbrana.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/wbrana.git"}], "feed": ["https://cgit.gentoo.org/user/wbrana.git/atom/"], "x-state": "GOOD", "x-timestamp": "2015-06-28 16:56:01 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "wdzierzan": {"quality": "experimental", "status": "unofficial", "name": "wdzierzan", "description": {"en": "Stuff I'd rather `emerge' than `stow'"}, "homepage": "https://cgit.gentoo.org/user/wdzierzan.git/", "owner": [{"type": "person", "email": "wojciech.dzierzanowski@gmail.com", "name": "Wojciech Dzier\u017canowski"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/wdzierzan.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/wdzierzan.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/wdzierzan.git"}], "feed": ["https://cgit.gentoo.org/user/wdzierzan.git/atom/"], "x-state": "GOOD", "x-timestamp": "2017-02-28 21:28:13 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "webos": {"quality": "experimental", "status": "unofficial", "name": "webos", "description": {"en": "Ported Open WebOS components and libraries"}, "homepage": "https://github.com/feniksa/webos-overlay", "owner": [{"type": "person", "email": "feniksa@rambler.ru", "name": "Maksym Sditanov"}], "source": [{"type": "git", "uri": "https://github.com/feniksa/webos-overlay.git"}, {"type": "git", "uri": "git://github.com:feniksa/webos-overlay.git"}, {"type": "git", "uri": "git@github.com:feniksa/webos-overlay.git"}], "feed": ["https://github.com/feniksa/webos-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-12-26 00:39:07 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 49}, "weuxel": {"quality": "experimental", "status": "unofficial", "name": "weuxel", "description": {"en": "Weuxels Personal Overlay"}, "homepage": "https://github.com/Weuxel/portage-weuxel", "owner": [{"type": "person", "email": "norman@smash-net.org", "name": "Norman Rie\u00df"}], "source": [{"type": "git", "uri": "https://github.com/Weuxel/portage-weuxel.git"}, {"type": "git", "uri": "git://github.com/Weuxel/portage-weuxel.git"}, {"type": "git", "uri": "git@github.com:Weuxel/portage-weuxel.git"}], "feed": ["https://github.com/Weuxel/portage-weuxel/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-21 15:49:49 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 1}, "what4-java": {"quality": "experimental", "status": "unofficial", "name": "what4-java", "description": {"en": "Incubator for dev-java updates that the Gentoo Java team has no time for"}, "homepage": "https://github.com/kwhat/gentoo-what4-java-overlay", "owner": [{"type": "person", "email": "alex@1stleg.com", "name": "Alex Barker"}], "source": [{"type": "git", "uri": "https://github.com/kwhat/gentoo-what4-java-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2020-07-02 08:48:49 -0700\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 23}, "wichtounet": {"quality": "experimental", "status": "unofficial", "name": "wichtounet", "description": {"en": "Personal overlay of Baptiste Wicht"}, "homepage": "https://github.com/wichtounet/wichtounet-overlay", "owner": [{"type": "person", "email": "baptistewicht@gmail.com", "name": "Baptiste Wicht"}], "source": [{"type": "git", "uri": "https://github.com/wichtounet/wichtounet-overlay.git"}, {"type": "git", "uri": "git://github.com/wichtounet/wichtounet-overlay.git"}, {"type": "git", "uri": "git@github.com:wichtounet/wichtounet-overlay.git"}], "feed": ["https://github.com/wichtounet/wichtounet-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-27 08:41:09 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 26}, "wine": {"quality": "testing", "status": "official", "name": "wine", "description": {"en": "All supported Wine ebuilds from the Gentoo Wine Project"}, "homepage": "https://wiki.gentoo.org/wiki/Project:Wine", "owner": [{"type": "project", "email": "wine@gentoo.org", "name": "Gentoo Wine Project"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/proj/wine.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/repo/proj/wine.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-14 18:26:53 -0400\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 249}, "winny": {"quality": "experimental", "status": "unofficial", "name": "winny", "description": {"en": "Winny's personal overlay"}, "homepage": "https://github.com/winny-/winny-overlay", "owner": [{"type": "person", "email": "winston@ml1.net", "name": "winny"}], "source": [{"type": "git", "uri": "https://github.com/winny-/winny-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/winny-/winny-overlay.git"}], "feed": ["https://github.com/winny-/winny-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-14 15:27:40 -0600\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 66}, "wjn-overlay": {"quality": "experimental", "status": "unofficial", "name": "wjn-overlay", "description": {"en": "wjn's overlay for Gentoo Linux"}, "homepage": "https://bitbucket.org/wjn/wjn-overlay", "owner": [{"type": "person", "email": "wjn@aol.jp", "name": "wjn"}], "source": [{"type": "git", "uri": "https://bitbucket.org/wjn/wjn-overlay.git"}], "x-state": "BAD_CACHE", "x-timestamp": "2021-01-21 02:49:16 +0900\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 23}, "wuodan": {"quality": "experimental", "status": "unofficial", "name": "wuodan", "description": {"en": "An experimental portage overlay"}, "homepage": "https://github.com/Wuodan/gentoo-overlay", "owner": [{"type": "person", "email": "stefan.kuhn.zurich@gmail.com", "name": "Stefan Kuhn"}], "source": [{"type": "git", "uri": "https://github.com/Wuodan/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/Wuodan/gentoo-overlay.git"}], "feed": ["https://github.com/Wuodan/gentoo-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2020-09-01 16:33:01 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo", "pentoo"], "x-ebuild-count": 23}, "x11": {"quality": "experimental", "status": "official", "name": "x11", "description": {"en": "Gentoo X11 team ebuild repository"}, "homepage": "https://cgit.gentoo.org/proj/x11.git", "owner": [{"type": "project", "email": "x11@gentoo.org"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/x11.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/x11"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/x11.git"}], "feed": ["https://cgit.gentoo.org/proj/x11.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-02-15 21:31:57 -0500\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "xdch47": {"quality": "experimental", "status": "unofficial", "name": "xdch47", "description": {"en": "Gentoo portage overlay of xdch47"}, "homepage": "https://github.com/xdch47/gpo-xdch47", "owner": [{"type": "person", "email": "xdch47@posteo.de", "name": "Felix Neum\u00e4rker"}], "source": [{"type": "git", "uri": "https://github.com/xdch47/gpo-xdch47.git"}, {"type": "git", "uri": "git+ssh://git@github.com/xdch47/gpo-xdch47.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-04 07:24:58 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 41}, "xelnor": {"quality": "experimental", "status": "unofficial", "name": "xelnor", "description": {"en": "Rapha\u00ebl Barrois' (Xelnor) Gentoo overlay."}, "homepage": "http://overlay.xelnor.net", "owner": [{"type": "person", "email": "gentoo@xelnor.net"}], "source": [{"type": "git", "uri": "git://overlay.xelnor.net/overlay.git"}], "x-state": "GOOD", "x-timestamp": "2021-02-17 19:37:39 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 54}, "xoreos": {"quality": "experimental", "status": "unofficial", "name": "xoreos", "description": {"en": "Gentoo overlay for the xoreos project, providing a WIP reimplementation of the BioWare Aurora engine and related modding tools."}, "homepage": "https://github.com/xoreos/gentoo-overlay", "owner": [{"type": "person", "email": "drmccoy@drmccoy.de", "name": "Sven \"DrMcCoy\" Hesse"}], "source": [{"type": "git", "uri": "https://github.com/xoreos/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/xoreos/gentoo-overlay.git"}], "feed": ["https://github.com/xoreos/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-08-09 19:51:52 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 12}, "xwing": {"quality": "experimental", "status": "unofficial", "name": "xwing", "description": {"en": "This overlay contains some experimental stuff, such as\n turboprint printers driver (bug #61311), intel-536ep driver for lastest 2.6\n kernels (bug #127464), lastest grisbi version (proxy maintainer) before\n it's portage integration and so on."}, "homepage": "http://gentoo.xwing.info", "owner": [{"type": "person", "email": "casta@xwing.info"}], "source": [{"type": "rsync", "uri": "rsync://gentoo.xwing.info/xwing-overlay"}], "x-state": "GOOD", "x-timestamp": "2021-03-14 10:51:44.000000000 +0000\n", "x-masters": ["gentoo"], "x-ebuild-count": 25}, "yandex": {"quality": "experimental", "status": "unofficial", "name": "yandex", "description": {"en": "Gentoo overlay with packages for software made by Yandex", "ru": "\u041e\u0432\u0435\u0440\u043b\u0435\u0439 \u0441 \u0441\u043e\u0444\u0442\u043e\u043c, \u0432\u044b\u043f\u0443\u0449\u0435\u043d\u043d\u044b\u043c \u042f\u043d\u0434\u0435\u043a\u0441\u043e\u043c"}, "homepage": "https://github.com/yandex-gentoo/overlay", "owner": [{"type": "person", "email": "mva@gentoo.org", "name": "Vadim A. Misbakh-Soloviov"}], "source": [{"type": "git", "uri": "https://github.com/yandex-gentoo/overlay.git"}, {"type": "git", "uri": "git://github.com/yandex-gentoo/overlay.git"}, {"type": "git", "uri": "git@github.com:yandex-gentoo/overlay.git"}], "feed": ["https://github.com/yandex-gentoo/overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-11-14 20:51:19 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "yoreek": {"quality": "experimental", "status": "unofficial", "name": "yoreek", "description": {"en": "Ebuilds related to nginx webserver modules"}, "homepage": "https://cgit.gentoo.org/user/yoreek.git/", "owner": [{"type": "person", "email": "yoreek@yahoo.com", "name": "Yuri U."}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/yoreek.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/yoreek.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/yoreek.git"}], "feed": ["https://cgit.gentoo.org/user/yoreek.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-01-11 17:13:27 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "youbroketheinternet": {"quality": "experimental", "status": "unofficial", "name": "youbroketheinternet", "description": {"en": "This overlay is a collaborative maintained Gentoo developer overlay. Some of us are involved with SecuShare, but we try out all sorts of XKEYSCORE-resistant technology. Some of our unique ebuilds are the full GNUnet suite, and software around the psyced chatserver. Some ebuilds are experimental/testing - refer to the included README for more info and details. If you would like to get involved read https://wiki.gentoo.org/wiki/Overlay:Youbroketheinternet"}, "homepage": "http://youbroketheinternet.org/#overlay", "owner": [{"type": "person", "email": "lynX@youbroketheinternet.pages.de", "name": "lynX"}], "source": [{"type": "git", "uri": "https://gnunet.org/git/youbroketheinternet-overlay.git"}, {"type": "git", "uri": "git://cheettyiapsyciew.onion/youbroketheinternet-overlay"}, {"type": "git", "uri": "git://gnunet.org/youbroketheinternet-overlay.git"}], "x-state": "BAD_CACHE", "x-timestamp": "1984-04-04 00:44:28 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 126}, "yurij-overlay": {"quality": "experimental", "status": "unofficial", "name": "yurij-overlay", "description": {"en": "Yurij's overlay"}, "homepage": "https://github.com/yurijmikhalevich/yurij-overlay", "owner": [{"type": "person", "email": "yurij@mikhalevi.ch", "name": "Yurij Mikhalevich"}], "source": [{"type": "git", "uri": "https://github.com/yurijmikhalevich/yurij-overlay.git"}, {"type": "git", "uri": "git://github.com/yurijmikhalevich/yurij-overlay.git"}, {"type": "git", "uri": "git@github.com:yurijmikhalevich/yurij-overlay.git"}], "feed": ["https://github.com/yurijmikhalevich/yurij-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2017-09-03 21:21:55 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "yuzu-overlay": {"quality": "experimental", "status": "unofficial", "name": "yuzu-overlay", "description": {"en": "Provides the Yuzu Switch Emulator and required dependencies."}, "homepage": "https://github.com/Alex-Aralis/yuzu-overlay", "owner": [{"type": "person", "email": "alex.aralis@gmail.com", "name": "Alex Aralis"}], "source": [{"type": "git", "uri": "https://github.com/Alex-Aralis/yuzu-overlay.git"}, {"type": "git", "uri": "git://github.com/Alex-Aralis/yuzu-overlay.git"}, {"type": "git", "uri": "git@github.com:Alex-Aralis/yuzu-overlay.git"}], "feed": ["https://github.com/Alex-Aralis/yuzu-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2020-08-25 11:16:37 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "zerodaysfordays": {"quality": "experimental", "status": "unofficial", "name": "zerodaysfordays", "description": {"en": "Jakob L. Kreuze's personal overlay."}, "homepage": "https://git.sr.ht/~jakob/zerodaysfordays", "owner": [{"type": "person", "email": "zerodaysfordays@sdf.lonestar.org", "name": "Jakob L. Kreuze"}], "source": [{"type": "git", "uri": "https://git.sr.ht/~jakob/zerodaysfordays"}], "x-state": "GOOD", "x-timestamp": "2020-05-09 19:15:21 -0400\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 11}, "zscheile": {"quality": "experimental", "status": "unofficial", "name": "zscheile", "description": {"en": "Zscheile Overlay"}, "homepage": "https://github.com/zseri/portage-zscheile", "owner": [{"type": "person", "email": "zseri@ytrizja.de", "name": "Erik Zscheile"}], "source": [{"type": "git", "uri": "https://github.com/zseri/portage-zscheile.git"}, {"type": "git", "uri": "git://github.com/zseri/portage-zscheile.git"}, {"type": "git", "uri": "git@github.com:zseri/portage-zscheile.git"}], "feed": ["https://github.com/zseri/portage-zscheile/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-09 08:21:42 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 81}, "zugaina": {"quality": "experimental", "status": "unofficial", "name": "zugaina", "description": {"en": "collection of ebuilds by ycarus"}, "homepage": "http://gpo.zugaina.org/Overlays/zugaina/", "owner": [{"type": "person", "email": "ycarus@zugaina.org"}], "source": [{"type": "rsync", "uri": "rsync://gentoo.zugaina.org/zugaina-portage"}], "x-state": "GOOD", "x-timestamp": "2019-07-24 19:12:13.000000000 +0000\n", "x-masters": ["gentoo"], "x-ebuild-count": 467}, "zx2c4": {"quality": "experimental", "status": "official", "name": "zx2c4", "description": {"en": "zx2c4's repository of additional ebuilds"}, "homepage": "http://git.zx2c4.com/portage/", "owner": [{"type": "person", "email": "zx2c4@gentoo.org", "name": "Jason A. Donenfeld"}], "source": [{"type": "git", "uri": "git://git.zx2c4.com/portage"}, {"type": "git", "uri": "http://git.zx2c4.com/portage"}, {"type": "git", "uri": "ssh://git@git.zx2c4.com/portage"}], "feed": ["http://git.zx2c4.com/portage/atom/?h=master"], "x-state": "GOOD", "x-timestamp": "2020-03-01 15:33:49 +0800\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 9}, "zyrenth": {"quality": "experimental", "status": "unofficial", "name": "zyrenth", "description": {"en": "Personal overlay"}, "homepage": "https://github.com/kabili207/zyrenth-overlay", "owner": [{"type": "person", "email": "kabi-bugz.gentoo@zyrenth.com", "name": "Amy Nagle"}], "source": [{"type": "git", "uri": "https://github.com/kabili207/zyrenth-overlay.git"}, {"type": "git", "uri": "git://github.com/kabili207/zyrenth-overlay.git"}, {"type": "git", "uri": "git@github.com:kabili207/zyrenth-overlay.git"}], "feed": ["https://github.com/kabili207/zyrenth-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-01-27 17:51:35 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 33}}
\ No newline at end of file +{"0bs1d1an": {"quality": "experimental", "status": "unofficial", "name": "0bs1d1an", "description": {"en": "Personal overlay"}, "homepage": "https://gitlab.com/0bs1d1an/0bs1d1an-overlay", "owner": [{"type": "person", "email": "gkroon@maelstrom.ninja", "name": "Guido Kroon"}], "source": [{"type": "git", "uri": "https://gitlab.com/0bs1d1an/0bs1d1an-overlay.git"}, {"type": "git", "uri": "git+ssh://git@gitlab.com/0bs1d1an/0bs1d1an-overlay.git"}], "feed": ["https://gitlab.com/0bs1d1an/0bs1d1an-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2020-07-05 16:07:57 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo", "pentoo", "steam-overlay"], "x-ebuild-count": 79}, "0x4d4c": {"quality": "experimental", "status": "unofficial", "name": "0x4d4c", "description": {"en": "Personal overlay with no special focus"}, "homepage": "https://github.com/0x4d4c/gentoo-overlay", "owner": [{"type": "person", "email": "gentoo@0x4d4c.xyz", "name": "Martin Lambertz"}], "source": [{"type": "git", "uri": "https://github.com/0x4d4c/gentoo-overlay.git"}, {"type": "git", "uri": "git://github.com/0x4d4c/gentoo-overlay.git"}, {"type": "git", "uri": "git@github.com:0x4d4c/gentoo-overlay.git"}], "feed": ["https://github.com/0x4d4c/gentoo-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2017-06-09 22:51:12 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 19}, "2xsaiko": {"quality": "experimental", "status": "unofficial", "name": "2xsaiko", "description": {"en": "Personal overlay with no special focus"}, "homepage": "https://git.sr.ht/~dblsaiko/ebuilds", "owner": [{"type": "person", "email": "gentoo@dblsaiko.net", "name": "2xsaiko"}], "source": [{"type": "git", "uri": "https://git.sr.ht/~dblsaiko/ebuilds"}, {"type": "git", "uri": "git@git.sr.ht:~dblsaiko/ebuilds"}], "feed": ["https://git.sr.ht/~dblsaiko/ebuilds/log/rss.xml"], "x-state": "GOOD", "x-timestamp": "2021-03-08 23:03:42 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 236}, "4nykey": {"quality": "experimental", "status": "unofficial", "name": "4nykey", "description": {"en": "An experimental portage overlay"}, "homepage": "https://github.com/4nykey/4nykey", "owner": [{"type": "person", "email": "4nykey@gmail.com", "name": "Aleksei Kaveshnikov"}], "source": [{"type": "git", "uri": "https://github.com/4nykey/4nykey.git"}, {"type": "git", "uri": "git://github.com/4nykey/4nykey.git"}, {"type": "git", "uri": "git@github.com:4nykey/4nykey.git"}], "feed": ["https://github.com/4nykey/4nykey/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-08 13:19:58 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 458}, "AlexandreFournier": {"quality": "experimental", "status": "unofficial", "name": "AlexandreFournier", "description": {"en": "Alexandre Fournier's personal overlay"}, "homepage": "https://github.com/AlexandreFournier/gentoo-overlay", "owner": [{"type": "person", "email": "gentoo@alexandrefournier.com", "name": "Alexandre Fournier"}], "source": [{"type": "git", "uri": "https://github.com/AlexandreFournier/gentoo-overlay.git"}, {"type": "git", "uri": "git://github.com/AlexandreFournier/gentoo-overlay.git"}, {"type": "git", "uri": "git@github.com:AlexandreFournier/gentoo-overlay.git"}], "feed": ["https://github.com/AlexandreFournier/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-28 17:45:30 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 58}, "ArchFeh": {"quality": "experimental", "status": "unofficial", "name": "ArchFeh", "description": {"en": "ArchFeh's personal overlay"}, "homepage": "https://github.com/ArchFeh/ArchFeh-overlay", "owner": [{"type": "person", "email": "guyu2876@gmail.com", "name": "ArchFeh"}], "source": [{"type": "git", "uri": "https://github.com/ArchFeh/ArchFeh-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/ArchFeh/ArchFeh-overlay.git"}], "feed": ["https://github.com/ArchFeh/ArchFeh-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-04-22 15:59:45 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 22}, "AstroFloyd": {"quality": "experimental", "status": "unofficial", "name": "AstroFloyd", "description": {"en": "AstroFloyd's Gentoo overlay"}, "homepage": "https://cgit.gentoo.org/user/AstroFloyd.git/", "owner": [{"type": "person", "email": "AstroFloyd@gmail.com", "name": "AstroFloyd"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/AstroFloyd.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/AstroFloyd.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/AstroFloyd.git"}], "feed": ["https://cgit.gentoo.org/user/AstroFloyd.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-02-05 17:32:47 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 125}, "AzP": {"quality": "experimental", "status": "unofficial", "name": "AzP", "description": {"en": "Peter's own software playground"}, "homepage": "https://cgit.gentoo.org/user/AzP.git/", "owner": [{"type": "person", "email": "peterasplund@gentoo.se", "name": "Peter Asplund"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/AzP.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/AzP.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/AzP.git"}], "feed": ["https://cgit.gentoo.org/user/AzP.git/atom/"], "x-state": "BAD_CACHE", "x-timestamp": "2021-02-28 21:11:16 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 12}, "Case_Of": {"quality": "experimental", "status": "unofficial", "name": "Case_Of", "description": {"en": "Personal overlay"}, "homepage": "https://framagit.org/Case_Of/gentoo-overlay", "owner": [{"type": "person", "email": "gentoo@retornaz.com", "name": "Quentin Retornaz"}], "source": [{"type": "git", "uri": "https://framagit.org/Case_Of/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@framagit.org/Case_Of/gentoo-overlay.git"}], "feed": ["https://framagit.org/Case_Of/gentoo-overlay/commits/master?format=atom"], "x-state": "GOOD", "x-timestamp": "2021-03-08 19:12:55 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 18}, "Drauthius": {"quality": "experimental", "status": "unofficial", "name": "Drauthius", "description": {"en": "Ebuilds related to game dev"}, "homepage": "https://cgit.gentoo.org/repo/user/Drauthius.git/", "owner": [{"type": "person", "email": "albert@diserholt.com", "name": "Albert Diserholt"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/user/Drauthius.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/repo/user/Drauthius"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/user/Drauthius.git"}], "feed": ["https://cgit.gentoo.org/repo/user/Drauthius.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-09-17 16:30:24 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 12}, "DuPol": {"quality": "experimental", "status": "unofficial", "name": "DuPol", "description": {"en": "DuPol's own and modified portage ebuilds."}, "homepage": "https://cgit.gentoo.org/user/DuPol.git/", "owner": [{"type": "person", "email": "DuPol@gmx.de", "name": "Dustin Polke"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/DuPol.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/DuPol.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/DuPol.git"}], "feed": ["https://cgit.gentoo.org/user/DuPol.git/atom/"], "x-state": "BAD_CACHE", "x-timestamp": "2020-02-18 21:05:32 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 10}, "FireBurn": {"quality": "experimental", "status": "unofficial", "name": "FireBurn", "description": {"en": "32bit ebuilds (libdrm, mesa, libx11, mesa-progs, ..)"}, "homepage": "https://github.com/FireBurn/Overlay", "owner": [{"type": "person", "email": "mike@fireburn.co.uk", "name": "Mike Lothian"}], "source": [{"type": "git", "uri": "git://github.com/FireBurn/Overlay.git"}], "feed": ["https://github.com/FireBurn/Overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-05 08:01:20 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 25}, "HomeAssistantRepository": {"quality": "experimental", "status": "unofficial", "name": "HomeAssistantRepository", "description": {"en": "Home Assistant on Gentoo Linux without virtualenv or docker."}, "homepage": "https://git.edevau.net/onkelbeh/HomeAssistantRepository", "owner": [{"type": "person", "email": "b@edevau.net", "name": "Andreas Billmeier"}], "source": [{"type": "git", "uri": "https://git.edevau.net/onkelbeh/HomeAssistantRepository.git"}, {"type": "git", "uri": "https://github.com/onkelbeh/HomeAssistantRepository.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-15 23:37:42 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 2738}, "JRG": {"quality": "experimental", "status": "unofficial", "name": "JRG", "description": {"en": "John's Collaboration Overlay"}, "homepage": "https://github.com/john-r-graham/jrg-overlay", "owner": [{"type": "person", "email": "john_r_graham@gentoo.org", "name": "John R. Graham"}], "source": [{"type": "git", "uri": "https://github.com/john-r-graham/jrg-overlay.git"}, {"type": "git", "uri": "git://github.com/john-r-graham/jrg-overlay.git"}, {"type": "git", "uri": "git@github.com:john-r-graham/jrg-overlay.git"}], "feed": ["https://github.com/john-r-graham/jrg-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-01-31 14:10:23 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 11}, "KBrown-pub": {"quality": "experimental", "status": "unofficial", "name": "KBrown-pub", "description": {"en": "KBrown's public overlay"}, "homepage": "http://sandino.araico.net/", "owner": [{"type": "person", "email": "sandino@sandino.net", "name": "Sandino Araico Sanchez"}], "source": [{"type": "git", "uri": "https://git.softwarelibre.mx/KBrown/gentoo-overlay.git"}, {"type": "git", "uri": "https://github.com/KenjiBrown/gentoo-overlay.git"}], "feed": ["https://git.softwarelibre.mx/KBrown/gentoo-overlay/-/commits/KBrown-pub?format=atom"], "x-state": "GOOD", "x-timestamp": "2021-03-13 22:29:24 -0600\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 126}, "Krontage": {"quality": "experimental", "status": "unofficial", "name": "Krontage", "description": {"en": "Personal overlay of Kron"}, "homepage": "https://github.com/undying/krontage", "owner": [{"type": "person", "email": "undying-m@yandex.ru", "name": "Kron"}], "source": [{"type": "git", "uri": "https://github.com/undying/krontage.git"}, {"type": "git", "uri": "git://github.com/undying/krontage.git"}, {"type": "git", "uri": "git@github.com:undying/krontage.git"}], "feed": ["https://github.com/undying/krontage/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2020-11-13 03:32:07 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 17}, "ROKO__": {"quality": "experimental", "status": "unofficial", "name": "ROKO__", "description": {"en": "Unofficial ebuilds for gentoo based distributions."}, "homepage": "https://github.com/sandikata/ROKO__", "owner": [{"type": "person", "email": "sandikata@yandex.ru", "name": "Alexandrow Rosen"}], "source": [{"type": "git", "uri": "https://github.com/sandikata/ROKO__.git"}, {"type": "git", "uri": "git://github.com/sandikata/ROKO__.git"}], "feed": ["https://github.com/sandikata/ROKO__/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-26 17:14:23 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 106}, "R_Overlay": {"quality": "experimental", "status": "official", "name": "R_Overlay", "description": {"en": "Gentoo overlay of R packages"}, "homepage": "https://cgit.gentoo.org/proj/R_overlay.git/", "owner": [{"type": "person", "email": "heroxbd@gentoo.org", "name": "Benda Xu"}], "source": [{"type": "rsync", "uri": "rsync://roverlay.dev.gentoo.org/roverlay"}], "x-state": "GOOD", "x-timestamp": "2020-08-14 09:27:44.000000000 +0000\n", "x-masters": ["gentoo"], "x-ebuild-count": 20447}, "SwordArMor": {"quality": "experimental", "status": "unofficial", "name": "SwordArMor", "description": {"en": "Personnal overlay of alarig/SwordArMor"}, "homepage": "https://git.grifon.fr/alarig/SwordArMor-gentoo-overlay", "owner": [{"type": "person", "email": "alarig@swordarmor.fr", "name": "Alarig Le Lay"}], "source": [{"type": "git", "uri": "https://git.grifon.fr/alarig/SwordArMor-gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@git.grifon.fr:alarig/SwordArMor-gentoo-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-15 16:06:57 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 150}, "ace": {"quality": "experimental", "status": "unofficial", "name": "ace", "description": {"en": "Personal overlay with ebuilds that were missing at one point or another"}, "homepage": "https://github.com/ananace/overlay", "owner": [{"type": "person", "email": "ace@haxalot.com", "name": "Alexander Olofsson"}], "source": [{"type": "git", "uri": "https://github.com/ananace/overlay.git"}, {"type": "git", "uri": "git://github.com/ananace/overlay.git"}, {"type": "git", "uri": "git@github.com:ananace/overlay.git"}], "feed": ["https://github.com/ananace/overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-08 21:28:35 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 31}, "activehome": {"quality": "experimental", "status": "unofficial", "name": "activehome", "description": {"en": "Gentoo overlay for ebuilds related to 'hand-made' Active Home construction", "ru": "\u041e\u0432\u0435\u0440\u043b\u0435\u0439 \u0434\u043b\u044f ebuild'\u043e\u0432 \u0441\u0432\u044f\u0437\u0430\u043d\u043d\u044b\u0445 \u0441\u043e\u0437\u0434\u0430\u043d\u0438\u0435\u043c \u0441\u0430\u043c\u043e\u0434\u0435\u043b\u044c\u043d\u043e\u0433\u043e \u0443\u043c\u043d\u043e\u0433\u043e \u0434\u043e\u043c\u0430"}, "homepage": "https://cgit.gentoo.org/user/activehome.git/", "owner": [{"type": "person", "email": "mva@gentoo.org", "name": "Vadim A. Misbakh-Soloviov"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/activehome.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/activehome.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/activehome.git"}], "feed": ["https://cgit.gentoo.org/user/activehome.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-07-21 16:01:39 +0700\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "aeon-gentoo-overlay": {"quality": "experimental", "status": "unofficial", "name": "aeon-gentoo-overlay", "description": {"en": "Gentoo overlay for Aeon Dev packages and dependencies"}, "homepage": "https://github.com/aeon-engine/aeon-gentoo-overlay", "owner": [{"type": "person", "email": "robindegen@gmail.com", "name": "Robin Degen"}], "source": [{"type": "git", "uri": "https://github.com/aeon-engine/aeon-gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/aeon-engine/aeon-gentoo-overlay.git"}], "feed": ["https://github.com/aeon-engine/aeon-gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2019-05-19 12:32:23 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 3}, "ag-ops": {"quality": "experimental", "status": "unofficial", "name": "ag-ops", "description": {"en": "Useful tools for SysAdmins or DevOps"}, "homepage": "https://gitlab.com/ILMostro/ag-ops", "owner": [{"type": "person", "email": "ilmostro7@gmail.com", "name": "John Johnson"}], "source": [{"type": "git", "uri": "https://gitlab.com/ILMostro/ag-ops.git"}, {"type": "git", "uri": "git+ssh://git@gitlab.com/ILMostro/ag-ops.git"}], "feed": ["https://gitlab.com/ILMostro/ag-ops/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-10 03:08:50 -0600\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 83}, "ago": {"quality": "experimental", "status": "official", "name": "ago", "description": {"en": "Developer overlay"}, "homepage": "https://cgit.gentoo.org/dev/ago.git/", "owner": [{"type": "person", "email": "ago@gentoo.org", "name": "Agostino Sarubbo"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/ago.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/ago.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/ago.git"}], "feed": ["https://cgit.gentoo.org/dev/ago.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-02-10 16:28:13 +0100\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 18}, "ahyangyi-overlay": {"quality": "experimental", "status": "unofficial", "name": "ahyangyi-overlay", "description": {"en": "Ahyangyi's overlay"}, "homepage": "https://github.com/ahyangyi/ahyangyi-overlay", "owner": [{"type": "person", "email": "ahyangyi@gmail.com", "name": "Yi Yang"}], "source": [{"type": "git", "uri": "https://github.com/ahyangyi/ahyangyi-overlay.git"}], "feed": ["https://github.com/ahyangyi/ahyangyi-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-14 22:02:51 +0800\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 48}, "alatar-lay": {"quality": "experimental", "status": "unofficial", "name": "alatar-lay", "description": {"en": "Alatar`s personal ebuilds"}, "homepage": "https://github.com/alatarum/alatar-lay", "owner": [{"type": "person", "email": "alatar_@list.ru", "name": "Alatar"}], "source": [{"type": "git", "uri": "https://github.com/alatarum/alatar-lay.git"}, {"type": "git", "uri": "git://github.com/alatarum/alatar-lay.git"}, {"type": "git", "uri": "git@github.com:alatarum/alatar-lay.git"}], "feed": ["https://github.com/alatarum/alatar-lay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2018-05-02 01:46:05 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 6}, "alesharik": {"quality": "experimental", "status": "unofficial", "name": "alesharik", "description": {"en": "Gentoo portage overlay of alesharik"}, "homepage": "https://github.com/alesharik/alesharik-overlay", "owner": [{"type": "person", "email": "alesharik4@gmail.com", "name": "Aleksei Arsenev"}], "source": [{"type": "git", "uri": "https://github.com/alesharik/alesharik-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/alesharik/alesharik-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2021-01-07 14:18:42 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 17}, "alexcepoi": {"quality": "experimental", "status": "unofficial", "name": "alexcepoi", "description": {"en": "Personal User Overlay"}, "homepage": "https://cgit.gentoo.org/user/alexcepoi.git/", "owner": [{"type": "person", "email": "alex.cepoi@gmail.com", "name": "Alexandru Cepoi"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/alexcepoi.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/alexcepoi.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/alexcepoi.git"}], "feed": ["https://cgit.gentoo.org/user/alexcepoi.git/atom/"], "x-state": "GOOD", "x-timestamp": "2018-01-21 15:49:24 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "alexxy": {"quality": "experimental", "status": "official", "name": "alexxy", "description": {"en": "Some random work in progress stuff from alexxy"}, "homepage": "https://cgit.gentoo.org/dev/alexxy.git", "owner": [{"type": "person", "email": "alexxy@gentoo.org", "name": "Alexey Shvetsov"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/alexxy.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/alexxy.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/alexxy.git"}], "feed": ["https://cgit.gentoo.org/dev/alexxy.git/atom/"], "x-state": "BAD_CACHE", "x-timestamp": "2020-02-11 14:50:24 +0300\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "aluco": {"quality": "experimental", "status": "unofficial", "name": "aluco", "description": {"en": "From drm-next to phoronix-test-suite ebuilds"}, "homepage": "https://cgit.gentoo.org/user/aluco.git/", "owner": [{"type": "person", "email": "anthoine.bourgeois@gmail.com", "name": "Anthoine Bourgeois"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/aluco.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/aluco.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/aluco.git"}], "feed": ["https://cgit.gentoo.org/user/aluco.git/atom/"], "x-state": "GOOD", "x-timestamp": "2017-05-22 00:05:14 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 24}, "alxu": {"quality": "experimental", "status": "unofficial", "name": "alxu", "description": {"en": "Alex Xu (Hello71) personal overlay"}, "homepage": "https://cgit.alxu.ca/gentoo-overlay.git/", "owner": [{"type": "person", "email": "alex_y_xu@yahoo.ca", "name": "Alex Xu (Hello71)"}], "source": [{"type": "git", "uri": "https://git.alxu.ca/gentoo-overlay.git"}], "feed": ["https://cgit.alxu.ca/gentoo-overlay.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-03-02 16:56:03 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 51}, "amedeos": {"quality": "experimental", "status": "unofficial", "name": "amedeos", "description": {"en": "amedeos's personal overlay"}, "homepage": "https://github.com/amedeos/amedeos-overlay", "owner": [{"type": "person", "email": "amedeo@linux.com", "name": "Amedeo Salvati"}], "source": [{"type": "git", "uri": "https://github.com/amedeos/amedeos-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/amedeos/amedeos-overlay.git"}], "feed": ["https://github.com/amedeos/amedeos-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-07 10:40:30 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 42}, "anarchy": {"quality": "experimental", "status": "official", "name": "anarchy", "description": {"en": "Testing/Bug fixes, new ebuilds"}, "homepage": "https://cgit.gentoo.org/dev/anarchy.git/", "owner": [{"type": "person", "email": "anarchy@gentoo.org", "name": "Jory Pratt"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/anarchy.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/anarchy"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/anarchy.git"}], "feed": ["https://cgit.gentoo.org/dev/anarchy.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-12-15 16:34:50 -0600\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 9}, "anard": {"quality": "experimental", "status": "unofficial", "name": "anard", "description": {"en": "Anard's personnal repository, with some new ebuilds"}, "homepage": "https://github.com/Anard/anard-overlay", "owner": [{"type": "person", "email": "anard@free.fr", "name": "Anard"}], "source": [{"type": "git", "uri": "https://github.com/Anard/anard-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/Anard/anard-overlay.git"}], "feed": ["https://github.com/Anard/anard-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-08 14:02:45 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 3}, "anaximander": {"quality": "experimental", "status": "unofficial", "name": "anaximander", "description": {"en": "anaximander's user overlay"}, "homepage": "https://cgit.gentoo.org/user/anaximander.git/", "owner": [{"type": "person", "email": "dominik.kriegner+gentoo@gmail.com", "name": "Dominik Kriegner"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/anaximander.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/anaximander.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/anaximander.git"}], "feed": ["https://cgit.gentoo.org/user/anaximander.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-02-23 08:35:21 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 3}, "anders-larsson": {"quality": "experimental", "status": "unofficial", "name": "anders-larsson", "description": {"en": "A few packages that are not hosted elsewhere."}, "homepage": "https://github.com/anders-larsson/gentoo-overlay", "owner": [{"type": "person", "email": "andla@thethundertemplars.com", "name": "Anders Larsson"}], "source": [{"type": "git", "uri": "https://github.com/anders-larsson/gentoo-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-14 21:08:42 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 25}, "andrey_utkin": {"quality": "experimental", "status": "official", "name": "andrey_utkin", "description": {"en": "Developer overlay"}, "homepage": "https://github.com/andrey-utkin/gentoo-overlay.git", "owner": [{"type": "person", "email": "andrey_utkin@gentoo.org", "name": "andrey_utkin"}], "source": [{"type": "git", "uri": "https://github.com/andrey-utkin/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/andrey-utkin/gentoo-overlay.git"}], "feed": ["https://github.com/andrey-utkin/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-09-04 11:23:21 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "anomen": {"quality": "experimental", "status": "unofficial", "name": "anomen", "description": {"en": "anomen's personal Gentoo overlay"}, "homepage": "https://github.com/anomen-s/anomen-overlay", "owner": [{"type": "person", "email": "ludek_h@seznam.cz", "name": "anomen"}], "source": [{"type": "git", "uri": "https://github.com/anomen-s/anomen-overlay.git"}, {"type": "git", "uri": "git://github.com/anomen-s/anomen-overlay.git"}, {"type": "git", "uri": "git@github.com:anomen-s/anomen-overlay.git"}], "feed": ["https://github.com/anomen-s/anomen-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-25 10:18:49 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 58}, "anyc": {"quality": "experimental", "status": "unofficial", "name": "anyc", "description": {"en": "Testing ebuilds for out-of-tree applications"}, "homepage": "https://github.com/anyc/anyc-overlay", "owner": [{"type": "person", "email": "dev@kicherer.org", "name": "Mario Kicherer"}], "source": [{"type": "git", "uri": "https://github.com/anyc/anyc-overlay.git"}, {"type": "git", "uri": "git://github.com/anyc/anyc-overlay.git"}, {"type": "git", "uri": "git@github.com:anyc/anyc-overlay.git"}], "feed": ["https://github.com/anyc/anyc-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-02-22 09:36:20 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 79}, "apriluwu": {"quality": "experimental", "status": "unofficial", "name": "apriluwu", "description": {"en": "apriluwu's personal overlay"}, "homepage": "https://github.com/apriluwu/gentoo-overlay", "owner": [{"type": "person", "email": "aaprilthemonth@gmail.com", "name": "April C."}], "source": [{"type": "git", "uri": "https://github.com/apriluwu/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/apriluwu/gentoo-overlay.git"}], "feed": ["https://github.com/apriluwu/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-06-27 13:41:25 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "archenroot": {"quality": "experimental", "status": "unofficial", "name": "archenroot", "description": {"en": "GPU, Neural Networks, Big Data, HPC, Java"}, "homepage": "https://github.com/archenroot/gentoo-overlay", "owner": [{"type": "person", "email": "archenroot@gmail.com", "name": "Ladislav Jech"}], "source": [{"type": "git", "uri": "https://github.com/archenroot/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/archenroot/gentoo-overlay.git"}], "feed": ["https://github.com/archenroot/gentoo-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2019-05-16 09:43:27 +0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "argent-main": {"quality": "experimental", "status": "unofficial", "name": "argent-main", "description": {"en": "Argent Linux"}, "homepage": "https://gitlab.com/argent/argent-main", "owner": [{"type": "person", "email": "stefan.cristian+gentoo@rogentos.ro", "name": "Stefan Cristian Brindusa"}], "source": [{"type": "git", "uri": "https://gitlab.com/argent/argent-main.git"}], "feed": ["https://gitlab.com/argent/argent-main/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-11-18 00:55:19 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2118}, "arx-libertatis": {"quality": "experimental", "status": "unofficial", "name": "arx-libertatis", "description": {"en": "Arx Libertatis Overlay"}, "homepage": "https://github.com/arx/ArxGentoo", "owner": [{"type": "person", "email": "daniel@constexpr.org", "name": "Daniel Scharrer"}], "source": [{"type": "git", "uri": "https://github.com/arx/ArxGentoo.git"}, {"type": "git", "uri": "git://github.com/arx/ArxGentoo.git"}], "x-state": "GOOD", "x-timestamp": "2020-08-11 21:12:11 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 7}, "audio-overlay": {"quality": "experimental", "status": "unofficial", "name": "audio-overlay", "description": {"en": "Pro audio overlay. Please file bugs or package suggestions at https://github.com/gentoo-audio/audio-overlay/issues/new"}, "homepage": "https://github.com/gentoo-audio/audio-overlay", "owner": [{"type": "project", "email": "audio-overlay@googlegroups.com", "name": "Audio overlay"}], "source": [{"type": "git", "uri": "https://github.com/gentoo-audio/audio-overlay.git"}, {"type": "git", "uri": "git://github.com/gentoo-audio/audio-overlay.git"}, {"type": "git", "uri": "git@github.com:gentoo-audio/audio-overlay.git"}], "feed": ["https://github.com/gentoo-audio/audio-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-28 18:25:06 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 78}, "average": {"quality": "experimental", "status": "unofficial", "name": "average", "description": {"en": "Personal playground for some ebuilds not found elsewhere"}, "homepage": "https://github.com/AnAverageHuman/average", "owner": [{"type": "person", "email": "jeffrey@icurse.nl", "name": "Jeffrey Lin"}], "source": [{"type": "git", "uri": "https://github.com/AnAverageHuman/average.git"}, {"type": "git", "uri": "git+ssh://git@github.com/AnAverageHuman/average.git"}], "feed": ["https://github.com/AnAverageHuman/average/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-21 23:33:21 -0500\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 9}, "awesome": {"quality": "experimental", "status": "unofficial", "name": "awesome", "description": {"en": "Awesome ebuilds"}, "homepage": "https://gitlab.awesome-it.de/overlays/awesome", "owner": [{"type": "person", "email": "info@awesome-it.de", "name": "Daniel Morlock"}], "source": [{"type": "git", "uri": "https://gitlab.awesome-it.de/overlays/awesome.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-02 08:59:35 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 36}, "barnowl": {"quality": "experimental", "status": "unofficial", "name": "barnowl", "description": {"en": "BarnOwl IM client"}, "homepage": "https://github.com/wthrowe/barnowl-overlay", "owner": [{"type": "person", "email": "wtt6@cornell.edu", "name": "William Throwe"}], "source": [{"type": "git", "uri": "https://github.com/wthrowe/barnowl-overlay.git"}, {"type": "git", "uri": "git://github.com/wthrowe/barnowl-overlay.git"}], "feed": ["https://github.com/wthrowe/barnowl-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-05-12 02:13:53 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 9}, "beatussum-overlay": {"quality": "experimental", "status": "unofficial", "name": "beatussum-overlay", "description": {"en": "Beatussum's overlay", "fr": "Overlay de Beatussum"}, "longdescription": {"en": "\n My Gentoo overlay aims to provide some packages that are not (yet) in the main Gentoo tree.\n ", "fr": "\n Mon overlay a pour but de fournir certains paquets qui ne sont pas (encore) disponibles dans l'arbre principal.\n "}, "homepage": "https://github.com/beatussum/beatussum-overlay", "owner": [{"type": "person", "email": "beatussum@protonmail.com", "name": "Matt\u00e9o Rossillol--Laruelle"}], "source": [{"type": "git", "uri": "https://github.com/beatussum/beatussum-overlay.git"}, {"type": "git", "uri": "ssh://git@github.com/beatussum/beatussum-overlay.git"}], "feed": ["https://github.com/beatussum/beatussum-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-01-29 15:47:13 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 27}, "benzene-overlay": {"quality": "experimental", "status": "unofficial", "name": "benzene-overlay", "description": {"en": "Universebenzene's personal Gentoo overlay"}, "homepage": "https://github.com/Universebenzene/benzene-overlay", "owner": [{"type": "person", "email": "universebenzene@sina.com", "name": "Universebenzene"}], "source": [{"type": "git", "uri": "https://github.com/Universebenzene/benzene-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/Universebenzene/benzene-overlay.git"}], "feed": ["https://github.com/Universebenzene/benzene-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-22 18:20:57 +0800\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 85}, "bes": {"quality": "experimental", "status": "unofficial", "name": "bes", "description": {"en": "bes' personal overlay"}, "homepage": "https://github.com/bes-internal/gentoo-overlay-bes", "owner": [{"type": "person", "email": "bes.internal@gmail.com", "name": "Vladimir Varlamov"}], "source": [{"type": "git", "uri": "https://github.com/bes-internal/gentoo-overlay-bes.git"}, {"type": "git", "uri": "git://github.com/bes-internal/gentoo-overlay-bes.git"}, {"type": "git", "uri": "git@github.com:bes-internal/gentoo-overlay-bes.git"}], "feed": ["https://github.com/bes-internal/gentoo-overlay-bes/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-12-14 13:34:07 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 9}, "bezerker": {"quality": "experimental", "status": "unofficial", "name": "bezerker", "description": {"en": "Bezerker's Packages"}, "homepage": "https://github.com/bezerker/gentoo-overlay", "owner": [{"type": "person", "email": "bezerker@bezerker.org", "name": "Bezerker"}], "source": [{"type": "git", "uri": "https://github.com/bezerker/gentoo-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2015-09-04 06:56:43 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 3}, "bibletime": {"quality": "experimental", "status": "unofficial", "name": "bibletime", "description": {"en": "BibleTime overlay"}, "homepage": "https://cgit.gentoo.org/user/bibletime.git/", "owner": [{"type": "person", "email": "jaak@ristioja.ee", "name": "Jaak Ristioja"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/bibletime.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/bibletime.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/bibletime.git"}], "feed": ["https://cgit.gentoo.org/user/bibletime.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-08-02 21:35:41 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 6}, "binaryden": {"quality": "experimental", "status": "unofficial", "name": "binaryden", "description": {"en": "Overlay for Cinnamon and other Gentoo packages"}, "homepage": "https://github.com/tkemmer/binaryden", "owner": [{"type": "person", "email": "thomas@binaryden.de", "name": "Thomas Kemmer"}], "source": [{"type": "git", "uri": "https://github.com/tkemmer/binaryden.git"}, {"type": "git", "uri": "git://github.com/tkemmer/binaryden.git"}, {"type": "git", "uri": "git+ssh://git@github.com/tkemmer/binaryden.git"}], "feed": ["https://github.com/tkemmer/binaryden/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-10 09:28:30 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 28}, "bircoph": {"quality": "experimental", "status": "official", "name": "bircoph", "description": {"en": "Developer overlay"}, "homepage": "https://cgit.gentoo.org/dev/bircoph.git/", "owner": [{"type": "person", "email": "bircoph@gentoo.org", "name": "Andrew Savchenko"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/bircoph.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/bircoph.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/bircoph.git"}], "feed": ["https://cgit.gentoo.org/dev/bircoph.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-02-28 16:44:20 +0300\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 29}, "bitcetera": {"quality": "experimental", "status": "unofficial", "name": "bitcetera", "description": {"en": "Miscellaneous Gentoo ebuilds"}, "homepage": "https://github.com/svoop/bitcetera-overlay", "owner": [{"type": "person", "email": "gentoo@bitcetera.com", "name": "Sven Schwyn"}], "source": [{"type": "git", "uri": "https://github.com/svoop/bitcetera-overlay.git"}, {"type": "git", "uri": "git://github.com/svoop/bitcetera-overlay.git"}, {"type": "git", "uri": "git@github.com:svoop/bitcetera-overlay.git"}], "feed": ["https://github.com/svoop/bitcetera-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-12-29 19:57:28 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 22}, "bitcoin": {"quality": "experimental", "status": "unofficial", "name": "bitcoin", "description": {"en": "Bitcoin and CPU/GPU mining related ebuilds"}, "homepage": "https://gitlab.com/bitcoin/gentoo.git", "owner": [{"type": "person", "email": "flo@geekplace.eu", "name": "Florian Schmaus"}], "source": [{"type": "git", "uri": "https://gitlab.com/bitcoin/gentoo.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-10 07:11:21 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 153}, "bleeding-edge": {"quality": "experimental", "status": "unofficial", "name": "bleeding-edge", "description": {"en": "Gentoo ebuilds for \"bleeding edge\" versions of packages - newest, untested - running on ~amd64."}, "homepage": "https://cgit.gentoo.org/repo/user/bleeding-edge.git/", "owner": [{"type": "person", "email": "jasiupsota@gmail.com", "name": "Jan Psota"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/user/bleeding-edge.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/repo/user/bleeding-edge"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/user/bleeding-edge.git"}], "feed": ["https://cgit.gentoo.org/repo/user/bleeding-edge.git/atom/"], "x-state": "BAD_CACHE", "x-timestamp": "2018-09-26 10:53:10 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 9}, "blender-gentoo-logo": {"quality": "experimental", "status": "official", "name": "blender-gentoo-logo", "description": {"en": "Software needed to render the Blender-based gentoo Logo of 2003"}, "homepage": "https://gitweb.gentoo.org/repo/proj/blender-gentoo-logo.git/", "owner": [{"type": "person", "email": "sping@gentoo.org", "name": "Sebastian Pipping"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/proj/blender-gentoo-logo.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/proj/blender-gentoo-logo.git"}], "feed": ["https://gitweb.gentoo.org/repo/proj/blender-gentoo-logo.git/atom/?h=master"], "x-state": "GOOD", "x-timestamp": "2017-09-09 16:34:22 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 3}, "bloody": {"quality": "experimental", "status": "unofficial", "name": "bloody", "description": {"en": "krita bleeding edge and artists tools/resources"}, "homepage": "https://github.com/bloodywing/bloody", "owner": [{"type": "person", "email": "bloodywing@neocomy.net", "name": "Pierre Geier"}], "source": [{"type": "git", "uri": "https://github.com/bloodywing/bloody.git"}, {"type": "git", "uri": "git://github.com/bloodywing/bloody.git"}, {"type": "git", "uri": "git@github.com:bloodywing/bloody.git"}], "feed": ["https://github.com/bloodywing/bloody/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-30 13:09:33 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 6}, "bobwya": {"quality": "experimental", "status": "unofficial", "name": "bobwya", "description": {"en": "Miscellaneous Gentoo ebuilds"}, "homepage": "https://github.com/bobwya/miscellaneous_ebuilds", "owner": [{"type": "person", "email": "bob.mt.wya@gmail.com", "name": "Bob Wya"}], "source": [{"type": "git", "uri": "https://github.com/bobwya/miscellaneous_ebuilds.git"}, {"type": "git", "uri": "git://github.com/bobwya/miscellaneous_ebuilds.git"}, {"type": "git", "uri": "git@github.com:bobwya/miscellaneous_ebuilds.git"}], "feed": ["https://github.com/bobwya/miscellaneous_ebuilds/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-16 15:20:52 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 459}, "bombo82": {"quality": "experimental", "status": "unofficial", "name": "bombo82", "description": {"en": "Bombo82's own gentoo overlay"}, "homepage": "https://github.com/bombo82/bombo82-overlay", "owner": [{"type": "person", "email": "bombo82@giannibombelli.it", "name": "Gianni Bombelli (bombo82)"}], "source": [{"type": "git", "uri": "https://github.com/bombo82/bombo82-overlay.git"}, {"type": "git", "uri": "git@github.com:bombo82/bombo82-overlay.git"}], "feed": ["https://github.com/bombo82/bombo82-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-07 11:16:15 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 20}, "booboo": {"quality": "experimental", "status": "unofficial", "name": "booboo", "description": {"en": "L29Ah personal overlay"}, "homepage": "https://github.com/l29ah/booboo", "owner": [{"type": "person", "email": "zl29ah@gmail.com", "name": "Sergey Alirzaev"}], "source": [{"type": "git", "uri": "https://github.com/l29ah/booboo.git"}], "feed": ["https://github.com/l29ah/booboo/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-16 03:59:39 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 378}, "brave-overlay": {"quality": "experimental", "status": "unofficial", "name": "brave-overlay", "description": {"en": "Brave Overlay"}, "homepage": "https://gitlab.com/jason.oliveira/brave-overlay", "owner": [{"type": "person", "email": "jason.oliveira@medicalcannab.is", "name": "Jason Oliveira"}], "source": [{"type": "git", "uri": "https://gitlab.com/jason.oliveira/brave-overlay.git"}], "feed": ["https://gitlab.com/jason.oliveira/brave-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-08 16:56:42 -0600\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "bright": {"quality": "experimental", "status": "unofficial", "name": "bright", "description": {"en": "BrightOne's personal overlay"}, "homepage": "https://github.com/filalex77/bright", "owner": [{"type": "person", "email": "brightone@protonmail.com", "name": "Oleksii Filonenko"}], "source": [{"type": "git", "uri": "https://github.com/filalex77/bright.git"}], "feed": ["https://github.com/filalex77/bright/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2019-07-25 22:54:21 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 29}, "brother-overlay": {"quality": "experimental", "status": "unofficial", "name": "brother-overlay", "description": {"en": "Brother printer and scanner software"}, "homepage": "https://github.com/stefan-langenmaier/brother-overlay", "owner": [{"type": "person", "email": "stefan.langenmaier+gentoo@gmail.com", "name": "Stefan Langenmaier"}], "source": [{"type": "git", "uri": "https://github.com/stefan-langenmaier/brother-overlay.git"}, {"type": "git", "uri": "git://github.com/stefan-langenmaier/brother-overlay.git"}, {"type": "git", "uri": "git@github.com:stefan-langenmaier/brother-overlay.git"}], "feed": ["https://github.com/stefan-langenmaier/brother-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-12-03 21:04:52 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 570}, "bubba": {"quality": "experimental", "status": "unofficial", "name": "bubba", "description": {"en": "\"Bubba\" platform support for Excito B2|3"}, "homepage": "https://github.com/gordonb3/bubba-overlay", "owner": [{"type": "person", "email": "gordon@bosvangennip.nl", "name": "Gordon Bos"}], "source": [{"type": "git", "uri": "https://github.com/gordonb3/bubba-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-11 16:36:17 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 49}, "bumblebee": {"quality": "experimental", "status": "unofficial", "name": "bumblebee", "description": {"en": "Packages related to the bumblebee project"}, "homepage": "https://github.com/Bumblebee-Project/bumblebee-gentoo/", "owner": [{"type": "person", "email": "mva@gentoo.org", "name": "Vadim A. Misbakh-Soloviov"}], "source": [{"type": "git", "uri": "git://github.com/Bumblebee-Project/bumblebee-gentoo"}], "feed": ["https://github.com/Bumblebee-Project/bumblebee-gentoo/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-02-17 00:03:28 +0700\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 6}, "buzden": {"quality": "experimental", "status": "unofficial", "name": "buzden", "description": {"en": "Personal overlay of Denis Buzdalov"}, "homepage": "https://github.com/buzden/buzden-overlay", "owner": [{"type": "person", "email": "public@buzden.ru", "name": "Denis Buzdalov"}], "source": [{"type": "git", "uri": "https://github.com/buzden/buzden-overlay.git"}, {"type": "git", "uri": "git://github.com/buzden/buzden-overlay.git"}, {"type": "git", "uri": "git@github.com:buzden/buzden-overlay.git"}], "feed": ["https://github.com/buzden/buzden-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-25 13:40:07 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "calculate": {"quality": "experimental", "status": "unofficial", "name": "calculate", "description": {"en": "Calculate Overlay"}, "homepage": "http://www.calculate-linux.org", "owner": [{"type": "person", "email": "at@calculate.ru"}], "source": [{"type": "git", "uri": "git://git.calculate-linux.org/calculate/calculate-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-16 15:22:00 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 232}, "canutethegreat-overlay": {"quality": "experimental", "status": "unofficial", "name": "canutethegreat-overlay", "description": {"en": "Overlay for personal projects, forks, and customizations"}, "homepage": "http://gentoo.canutethegreat.com/", "owner": [{"type": "person", "email": "canutethegreat@gmail.com", "name": "Ronald Farrer"}], "source": [{"type": "git", "uri": "https://github.com/CanuteTheGreat/canutethegreat-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/CanuteTheGreat/canutethegreat-overlay.git"}], "feed": ["https://github.com/CanuteTheGreat/canutethegreat-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-11 12:32:26 -0800\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 6}, "ceamac": {"quality": "experimental", "status": "unofficial", "name": "ceamac", "description": {"en": "This is a small Gentoo overlay with ebuilds that I could not find elsewhere or that I had to modify for some reason."}, "homepage": "https://github.com/ceamac/overlay", "owner": [{"type": "person", "email": "ceamac.paragon@gmail.com", "name": "Viorel Munteanu"}], "source": [{"type": "git", "uri": "https://github.com/ceamac/overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/ceamac/overlay.git"}], "feed": ["https://github.com/ceamac/overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-13 19:38:00 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 10}, "certbot-dns-plugins": {"quality": "experimental", "status": "unofficial", "name": "certbot-dns-plugins", "description": {"en": "Overlay for the DNS plugins of the ACME client certbot"}, "homepage": "https://github.com/osirisinferi/certbot-dns-plugins-overlay", "owner": [{"type": "person", "email": "gentoo@flut.demon.nl", "name": "Osiris Inferi"}], "source": [{"type": "git", "uri": "https://github.com/osirisinferi/certbot-dns-plugins-overlay.git"}, {"type": "git", "uri": "git@github.com:osirisinferi/certbot-dns-plugins-overlay.git"}], "feed": ["https://github.com/osirisinferi/certbot-dns-plugins-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-06 16:35:20 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 63}, "cg": {"quality": "experimental", "status": "unofficial", "name": "cg", "description": {"en": "Computer graphics ebuilds for gentoo"}, "homepage": "https://github.com/brothermechanic/cg", "owner": [{"type": "person", "email": "brothermechanic@gmail.com"}], "source": [{"type": "git", "uri": "https://github.com/brothermechanic/cg.git"}], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-12 09:26:03 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 142}, "chrisadr": {"quality": "experimental", "status": "unofficial", "name": "chrisadr", "description": {"en": "ChrisADR's personal overlay"}, "homepage": "https://github.com/ChrisADR/chrisadr-overlay", "owner": [{"type": "person", "email": "chrisadr@gentoo.org", "name": "Christopher D\u00edaz Riveros"}], "source": [{"type": "git", "uri": "https://github.com/ChrisADR/chrisadr-overlay.git"}, {"type": "git", "uri": "git@github.com:ChrisADR/chrisadr-overlay.git"}], "feed": ["https://github.com/ChrisADR/chrisadr-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2018-05-17 20:48:42 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 0}, "chrytoo": {"quality": "experimental", "status": "unofficial", "name": "chrytoo", "description": {"en": "Personal overlay for packages that usually aren't in the official repository..."}, "homepage": "https://github.com/chrytoo/gentoo-overlay", "owner": [{"type": "person", "email": "chry7oo@gmail.com", "name": "Milo\u0161 \u0110. Omeragi\u0107"}], "source": [{"type": "git", "uri": "https://github.com/chrytoo/gentoo-overlay.git"}, {"type": "git", "uri": "git://github.com/chrytoo/gentoo-overlay.git"}, {"type": "git", "uri": "git@github.com:chrytoo/gentoo-overlay.git"}], "feed": ["https://github.com/chrytoo/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2019-08-19 00:07:33 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "chymeric": {"quality": "experimental", "status": "unofficial", "name": "chymeric", "description": {"en": "Overlay for scientific software and other utilities"}, "homepage": "https://github.com/TheChymera/overlay", "owner": [{"type": "person", "email": "chr@chymera.eu", "name": "Horea Christian"}], "source": [{"type": "git", "uri": "https://github.com/TheChymera/overlay.git"}, {"type": "git", "uri": "git://github.com/TheChymera/overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/TheChymera/overlay.git"}], "feed": ["https://github.com/TheChymera/overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-16 11:11:32 -0400\n", "x-openpgp-signed": "E", "x-masters": ["gentoo", "science"], "x-ebuild-count": 35}, "cj-overlay": {"quality": "experimental", "status": "official", "name": "cj-overlay", "description": {"en": "Christoph's Overlay"}, "homepage": "https://github.com/junghans/cj-overlay", "owner": [{"type": "person", "email": "junghans@gentoo.org"}], "source": [{"type": "git", "uri": "git://github.com/junghans/cj-overlay"}], "feed": ["https://github.com/junghans/cj-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2017-11-08 11:12:00 -0700\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 7}, "concaveoverlay": {"quality": "experimental", "status": "unofficial", "name": "concaveoverlay", "description": {"en": "concavegit's overlay."}, "homepage": "https://gitlab.com/concavegit/concaveoverlay", "owner": [{"type": "person", "email": "concavemail@gmail.com"}], "source": [{"type": "git", "uri": "https://gitlab.com/concavegit/concaveoverlay.git"}], "feed": ["https://gitlab.com/concavegit/concaveoverlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2019-11-23 19:42:16 +0000\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 23}, "crocket-overlay": {"quality": "experimental", "status": "unofficial", "name": "crocket-overlay", "description": {"en": "crocket's personal overlay"}, "homepage": "https://github.com/crocket/crocket-overlay", "owner": [{"type": "person", "email": "crockabiscuit@gmail.com", "name": "crocket"}], "source": [{"type": "git", "uri": "https://github.com/crocket/crocket-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/crocket/crocket-overlay.git"}], "feed": ["https://github.com/crocket/crocket-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-05 13:39:11 +0900\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 72}, "crossdev": {"quality": "experimental", "status": "unofficial", "name": "crossdev", "description": {"en": "Ebuilds for embedded systems", "ru": "\u041f\u0430\u043a\u0435\u0442\u044b \u0434\u043b\u044f \u0432\u0441\u0442\u0440\u0430\u0438\u0432\u0430\u0435\u043c\u044b\u0445 \u0441\u0438\u0441\u0442\u0435\u043c"}, "homepage": "https://github.com/alphallc/crossdev/", "owner": [{"type": "person", "email": "mva@gentoo.org", "name": "Vadim A. Misbakh-Soloviov"}], "source": [{"type": "git", "uri": "git://github.com/alphallc/crossdev"}], "feed": ["https://github.com/alphallc/crossdev/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2019-06-18 14:39:51 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "dMaggot": {"quality": "experimental", "status": "unofficial", "name": "dMaggot", "description": {"en": "Overlay of David E. Narv\u00e1ez"}, "homepage": "https://cgit.gentoo.org/user/dMaggot.git/", "owner": [{"type": "person", "email": "david.narvaez@computer.org", "name": "David E. Narv\u00e1ez"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/dMaggot.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/dMaggot.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/dMaggot.git"}], "feed": ["https://cgit.gentoo.org/user/dMaggot.git/atom/"], "x-state": "BAD_CACHE", "x-timestamp": "2017-06-01 22:09:38 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 6}, "dargor": {"quality": "experimental", "status": "unofficial", "name": "dargor", "description": {"en": "Personal overlay for packages I care of"}, "homepage": "https://github.com/dargor/dargor_gentoo_overlay", "owner": [{"type": "person", "email": "linder.gabriel@gmail.com", "name": "Gabriel Linder"}], "source": [{"type": "git", "uri": "https://github.com/dargor/dargor_gentoo_overlay.git"}, {"type": "git", "uri": "git@github.com:dargor/dargor_gentoo_overlay.git"}], "feed": ["https://github.com/dargor/dargor_gentoo_overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-14 18:20:20 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 27}, "darkelf": {"quality": "experimental", "status": "unofficial", "name": "darkelf", "description": {"en": "Overlay focusing on improved user experience for working in darkness on Xfce or zsh (including vim)"}, "homepage": "https://cgit.gentoo.org/repo/user/darkelf.git", "owner": [{"type": "person", "email": "sur3@gmx.de", "name": "Simon"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/user/darkelf.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/user/darkelf.git"}], "feed": ["https://cgit.gentoo.org/repo/user/darkelf.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-09-21 18:45:53 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 11}, "darthgandalf-overlay": {"quality": "experimental", "status": "unofficial", "name": "darthgandalf-overlay", "description": {"en": "Personal overlay"}, "homepage": "https://github.com/DarthGandalf/gentoo-overlay", "owner": [{"type": "person", "email": "alexey+gentoo@asokolov.org", "name": "Alexey Sokolov"}], "source": [{"type": "git", "uri": "https://github.com/DarthGandalf/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/DarthGandalf/gentoo-overlay.git"}], "feed": ["https://github.com/DarthGandalf/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-19 12:03:43 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 6}, "deadbeef-overlay": {"quality": "experimental", "status": "unofficial", "name": "deadbeef-overlay", "description": {"en": "DeaDBeeF player overlay for Gentoo Linux"}, "homepage": "https://github.com/damex/deadbeef-overlay", "owner": [{"type": "person", "email": "damex.pp@gmail.com", "name": "Roman Kuzmitsky"}], "source": [{"type": "git", "uri": "https://github.com/damex/deadbeef-overlay.git"}], "feed": ["https://github.com/damex/deadbeef-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2019-06-06 14:06:08 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 53}, "decent-im": {"quality": "experimental", "status": "unofficial", "name": "decent-im", "description": {"en": "XMPP software overlay maintained by decent.im"}, "homepage": "https://github.com/decent-im/gentoo-overlay", "owner": [{"type": "person", "email": "andrey_utkin@gentoo.org", "name": "Andrey Utkin"}], "source": [{"type": "git", "uri": "https://github.com/decent-im/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/decent-im/gentoo-overlay.git"}], "feed": ["https://github.com/decent-im/gentoo-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2019-09-17 18:48:52 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 3}, "deepin": {"quality": "experimental", "status": "unofficial", "name": "deepin", "description": {"en": "Gentoo Overlay for Deepin Desktop Environment"}, "homepage": "https://github.com/zhtengw/deepin-overlay", "owner": [{"type": "person", "email": "atenzd@gmail.com", "name": "Aten Zhang"}], "source": [{"type": "git", "uri": "git://github.com/zhtengw/deepin-overlay.git"}], "feed": ["https://github.com/zhtengw/deepin-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-15 10:18:33 +0800\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 151}, "defiance": {"quality": "experimental", "status": "unofficial", "name": "defiance", "description": {"en": "packages for cloud development"}, "homepage": "https://github.com/d3fy/defiance-overlay.git", "owner": [{"type": "person", "email": "dan@d3fy.net", "name": "Dan Molik"}], "source": [{"type": "git", "uri": "https://github.com/d3fy/defiance-overlay.git"}, {"type": "git", "uri": "git://github.com/d3fy/defiance-overlay.git"}, {"type": "git", "uri": "git@github.com:d3fy/defiance-overlay.git"}], "feed": ["https://github.com/d3fy/defiance-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-02 16:20:01 -0500\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 73}, "delicious-absurdities": {"quality": "experimental", "status": "unofficial", "name": "delicious-absurdities", "description": {"en": "Personal overlay with delicious absurdities"}, "homepage": "https://github.com/paraenggu/delicious-absurdities-overlay", "owner": [{"type": "person", "email": "c.affolter@purplehaze.ch", "name": "Christian Affolter"}], "source": [{"type": "git", "uri": "https://github.com/paraenggu/delicious-absurdities-overlay.git"}, {"type": "git", "uri": "git://github.com/paraenggu/delicious-absurdities-overlay.git"}, {"type": "git", "uri": "git@github.com:paraenggu/delicious-absurdities-overlay.git"}], "feed": ["https://github.com/paraenggu/delicious-absurdities-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2020-05-03 12:55:52 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 12}, "dequbed": {"quality": "experimental", "status": "unofficial", "name": "dequbed", "description": {"en": "Personal overlay containing mostly small utilities and less stable package versions"}, "homepage": "https://github.com/dequbed/overlay.git", "owner": [{"type": "person", "email": "me@dequbed.space"}], "source": [{"type": "git", "uri": "https://github.com/dequbed/overlay.git"}, {"type": "git", "uri": "git://github.com/dequbed/overlay.git"}, {"type": "git", "uri": "git@github.com:dequbed/overlay.git"}], "feed": ["https://github.com/dequbed/overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-02 20:23:07 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "dev1990-overlay": {"quality": "experimental", "status": "unofficial", "name": "dev1990-overlay", "description": {"en": "Personal overlay focused on Qt application development and 3d-printing."}, "homepage": "https://github.com/dev-0x7C6/dev1990-overlay.git", "owner": [{"type": "person", "email": "dev.strikeu@gmail.com", "name": "Bartlomiej Burdukiewicz"}], "source": [{"type": "git", "uri": "https://github.com/dev-0x7C6/dev1990-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-15 11:15:05 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 248}, "devpump-gor": {"quality": "experimental", "status": "unofficial", "name": "devpump-gor", "description": {"en": "DevPump Gentoo Overlay"}, "homepage": "https://github.com/DevPump/gentoo-overlay", "owner": [{"type": "person", "email": "devpump@gmail.com", "name": "Matt Fleming"}], "source": [{"type": "git", "uri": "https://github.com/DevPump/gentoo-overlay.git"}], "x-state": "BAD_CACHE", "x-timestamp": "2016-07-06 07:57:12 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 11}, "didactic-duck": {"quality": "experimental", "status": "unofficial", "name": "didactic-duck", "description": {"en": "Some ebuilds that might work"}, "homepage": "https://github.com/lucianposton/didactic-duck", "owner": [{"type": "person", "email": "lucianposton@pm.me", "name": "Lucian Poston"}], "source": [{"type": "git", "uri": "https://github.com/lucianposton/didactic-duck.git"}], "feed": ["https://github.com/lucianposton/didactic-duck/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2020-03-18 22:02:03 -0500\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 70}, "dilfridge": {"quality": "experimental", "status": "official", "name": "dilfridge", "description": {"en": "Dilfridge overlay: experimental ebuilds and lab software"}, "homepage": "https://cgit.gentoo.org/dev/dilfridge.git/", "owner": [{"type": "person", "email": "dilfridge@gentoo.org", "name": "Andreas K. Huettel (dilfridge)"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/dilfridge.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/dilfridge.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/dilfridge.git"}], "feed": ["https://cgit.gentoo.org/dev/dilfridge.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-02-18 22:09:37 +0100\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 15}, "displacer": {"quality": "experimental", "status": "unofficial", "name": "displacer", "description": {"en": "Fixes and new unstable packages"}, "homepage": "https://cgit.gentoo.org/user/displacer.git/", "owner": [{"type": "person", "email": "disinbox@gmail.com", "name": "Igor Ulyanov"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/displacer.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/displacer.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/displacer.git"}], "feed": ["https://cgit.gentoo.org/user/displacer.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-11-01 16:16:15 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 17}, "distros": {"quality": "experimental", "status": "unofficial", "name": "distros", "description": {"en": "Calculate Linux Profiles"}, "homepage": "http://www.calculate-linux.org", "owner": [{"type": "person", "email": "at@calculate.ru"}], "source": [{"type": "git", "uri": "git://git.calculate-linux.org/calculate/distros-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-11 09:08:24 +0300\n", "x-openpgp-signed": "N", "x-masters": ["calculate", "gentoo"], "x-ebuild-count": 0}, "djc": {"quality": "experimental", "status": "unofficial", "name": "djc", "description": {"en": "Personal overlay; testing and early development"}, "homepage": "https://github.com/djc/djc-overlay", "owner": [{"type": "person", "email": "djc@gentoo.org", "name": "Dirkjan Ochtman"}], "source": [{"type": "git", "uri": "https://github.com/djc/djc-overlay.git"}, {"type": "git", "uri": "git://github.com/djc/djc-overlay.git"}, {"type": "git", "uri": "git@github.com:djc/djc-overlay.git"}], "feed": ["https://github.com/djc/djc-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-25 13:21:27 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 1}, "dlang": {"quality": "experimental", "status": "unofficial", "name": "dlang", "description": {"en": "A collection of ebuilds related to the D programming\n language."}, "homepage": "https://github.com/gentoo/dlang", "owner": [{"type": "person", "email": "Marco.Leise@gmx.de"}], "source": [{"type": "git", "uri": "https://github.com/gentoo/dlang.git"}, {"type": "git", "uri": "git@github.com:gentoo/dlang.git"}, {"type": "git", "uri": "git://github.com/gentoo/dlang.git"}], "feed": ["https://github.com/gentoo/dlang/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-01-25 18:17:03 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 84}, "dm9pZCAq": {"quality": "experimental", "status": "unofficial", "name": "dm9pZCAq", "description": {"en": "personal overlay with different packages, mainly with packages with KISS mindset"}, "homepage": "https://notabug.org/dm9pZCAq/dm9pZCAq-overlay", "owner": [{"type": "person", "email": "v@0x0c.xyz", "name": "dm9pZCAq"}], "source": [{"type": "git", "uri": "https://notabug.org/dm9pZCAq/dm9pZCAq-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-16 13:33:08 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 36}, "dmchurch": {"quality": "experimental", "status": "unofficial", "name": "dmchurch", "description": {"en": "Danielle Church's Portage overlay"}, "homepage": "https://github.com/dmchurch/portage-overlay", "owner": [{"type": "person", "email": "dani.church@gmail.com", "name": "Danielle Church"}], "source": [{"type": "git", "uri": "https://github.com/dmchurch/portage-overlay.git"}, {"type": "git", "uri": "git://github.com/dmchurch/portage-overlay.git"}, {"type": "git", "uri": "git@github.com:dmchurch/portage-overlay.git"}], "feed": ["https://github.com/dmchurch/portage-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-01-25 12:30:43 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 3}, "dotnet": {"quality": "experimental", "status": "official", "name": "dotnet", "description": {"en": "Experimental overlay for .NET packages."}, "homepage": "https://github.com/gentoo/dotnet", "owner": [{"type": "project", "email": "dotnet@gentoo.org", "name": "Dotnet team"}], "source": [{"type": "git", "uri": "https://github.com/gentoo/dotnet.git"}, {"type": "git", "uri": "git@github.com:gentoo/dotnet.git"}], "feed": ["https://github.com/gentoo/dotnet/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-12 12:49:15 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 168}, "drdim": {"quality": "experimental", "status": "unofficial", "name": "drdim", "description": {"en": "Gentoo Layman portage repository for Jetbrains Products"}, "homepage": "https://github.com/drdim/layman", "owner": [{"type": "person", "email": "dr.dim.pro@gmail.com", "name": "Dmitriy Bogatkin"}], "source": [{"type": "git", "uri": "https://github.com/drdim/layman.git"}, {"type": "git", "uri": "git://github.com/drdim/layman.git"}, {"type": "git", "uri": "git@github.com:drdim/layman.git"}], "feed": ["https://github.com/drdim/layman/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2016-04-14 05:51:00 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 44}, "dwfreed": {"quality": "experimental", "status": "unofficial", "name": "dwfreed", "description": {"en": "My random Gentoo packages"}, "homepage": "https://bitbucket.org/dwfreed/dwfreed.gentoo/", "owner": [{"type": "person", "email": "dwfreed@mtu.edu", "name": "Douglas Freed"}], "source": [{"type": "git", "uri": "https://bitbucket.org/dwfreed/dwfreed.gentoo"}], "feed": ["https://bitbucket.org/dwfreed/dwfreed.gentoo/rss"], "x-state": "GOOD", "x-timestamp": "2017-04-09 01:17:09 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "dwosky": {"quality": "experimental", "status": "unofficial", "name": "dwosky", "description": {"en": "Dwosky's personal overlay"}, "homepage": "https://github.com/Dwosky/Dwosky-overlay", "owner": [{"type": "person", "email": "dwosky@pm.me", "name": "Pedro Arizmendi"}], "source": [{"type": "git", "uri": "https://github.com/Dwosky/Dwosky-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/Dwosky/Dwosky-overlay.git"}], "feed": ["https://github.com/Dwosky/Dwosky-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-01 10:31:05 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "earshark": {"quality": "experimental", "status": "unofficial", "name": "earshark", "description": {"en": "personal overlay, mostly games related"}, "homepage": "https://github.com/Chemrat/overlay", "owner": [{"type": "person", "email": "jazzvoid@gmail.com", "name": "Valeriy"}], "source": [{"type": "git", "uri": "https://github.com/Chemrat/overlay.git"}, {"type": "git", "uri": "git://github.com/Chemrat/overlay.git"}], "feed": ["https://github.com/Chemrat/overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-02-10 13:07:00 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 30}, "eclipse": {"quality": "experimental", "status": "official", "name": "eclipse", "description": {"en": "Community effort at packaging Eclipse Java SDK"}, "homepage": "https://github.com/gentoo/eclipse-overlay", "owner": [{"type": "project", "email": "eclipse@gentoo.org", "name": "Eclipse team"}], "source": [{"type": "git", "uri": "https://github.com/gentoo/eclipse-overlay.git"}, {"type": "git", "uri": "git://github.com/gentoo/eclipse-overlay.git"}, {"type": "git", "uri": "git@github.com:gentoo/eclipse-overlay.git"}], "feed": ["https://github.com/gentoo/eclipse-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2017-06-24 14:34:45 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 13}, "edgets": {"quality": "experimental", "status": "unofficial", "name": "edgets", "description": {"en": "Gentoo overlay that brings you the newest versions of modern software."}, "homepage": "https://github.com/BlueManCZ/edgets", "owner": [{"type": "person", "email": "ivo97@centrum.cz", "name": "Ivo \u0160merek"}], "source": [{"type": "git", "uri": "https://github.com/BlueManCZ/edgets.git"}, {"type": "git", "uri": "git+ssh://git@github.com/BlueManCZ/edgets.git"}], "feed": ["https://github.com/BlueManCZ/edgets/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-16 08:06:57 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 83}, "eigenlay": {"quality": "experimental", "status": "unofficial", "name": "eigenlay", "description": {"en": "Eigenlab Gentoo overlay"}, "homepage": "https://gitlab.com/eigennet/eigenlay", "owner": [{"type": "person", "email": "gio@eigenlab.org", "name": "Gioacchino Mazzurco"}], "source": [{"type": "git", "uri": "https://gitlab.com/eigennet/eigenlay.git"}], "x-state": "GOOD", "x-timestamp": "2020-04-01 16:18:39 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 16}, "einflay": {"quality": "experimental", "status": "unofficial", "name": "einflay", "description": {"en": "Personal overlay"}, "homepage": "https://github.com/EinstokFair/einflay", "owner": [{"type": "person", "email": "einfair@zoho.eu", "name": "Einstok Fair"}], "source": [{"type": "git", "uri": "https://github.com/EinstokFair/einflay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/EinstokFair/einflay.git"}], "feed": ["https://github.com/EinstokFair/einflay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-07 19:16:56 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 31}, "ejabberd": {"quality": "experimental", "status": "unofficial", "name": "ejabberd", "description": {"en": "Fresh ejabberd versions and dependencies"}, "homepage": "https://github.com/rion-overlay/ejabberd-overlay", "owner": [{"type": "person", "email": "rion4ik@gmail.com", "name": "Sergey Ilinykh"}], "source": [{"type": "git", "uri": "https://github.com/rion-overlay/ejabberd-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/rion-overlay/ejabberd-overlay.git"}], "feed": ["https://github.com/rion-overlay/ejabberd-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-04-30 13:18:01 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 0}, "electron": {"quality": "experimental", "status": "unofficial", "name": "electron", "description": {"en": "Electron Overlay"}, "homepage": "https://github.com/elprans/electron-overlay", "owner": [{"type": "person", "email": "elvis@magic.io", "name": "Elvis Pranskevichus"}], "source": [{"type": "git", "uri": "https://github.com/elprans/electron-overlay.git"}], "feed": ["https://github.com/elprans/electron-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-08 14:02:03 -0800\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 7}, "elementary": {"quality": "experimental", "status": "unofficial", "name": "elementary", "description": {"en": "The elementary OS experience for Gentoo Linux. "}, "homepage": "https://github.com/pimvullers/elementary", "owner": [{"type": "person", "email": "gentoo.org@vullersmail.nl", "name": "Pim Vullers"}], "source": [{"type": "git", "uri": "https://github.com/pimvullers/elementary.git"}, {"type": "git", "uri": "git://github.com/pimvullers/elementary.git"}], "feed": ["https://github.com/pimvullers/elementary/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2020-12-28 21:04:05 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 118}, "elopez-r-overlay": {"quality": "experimental", "status": "unofficial", "name": "elopez-r-overlay", "description": {"en": "My Gentoo overlay for Ebuilds"}, "homepage": "https://gitlab.com/libre_hackerman/elopez-r-overlay", "owner": [{"type": "person", "email": "gnu_stallman@protonmail.ch", "name": "Esteban L\u00f3pez Rodr\u00edguez"}], "source": [{"type": "git", "uri": "https://gitlab.com/libre_hackerman/elopez-r-overlay.git"}, {"type": "git", "uri": "git+ssh://git@gitlab.com:libre_hackerman/elopez-r-overlay.git"}], "feed": ["https://gitlab.com/libre_hackerman/elopez-r-overlay/-/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-25 18:22:12 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 40}, "emacs": {"quality": "experimental", "status": "official", "name": "emacs", "description": {"en": "Provide Emacs and XEmacs related ebuilds which are\n experimental or work-in-progress. Don't rely on them, but don't\n hesitate to file bugs or write emails."}, "homepage": "https://wiki.gentoo.org/wiki/Project:Emacs/Overlay", "owner": [{"type": "project", "email": "emacs@gentoo.org", "name": "Gentoo Emacs team"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/proj/emacs.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/repo/proj/emacs.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/proj/emacs.git"}], "feed": ["https://cgit.gentoo.org/repo/proj/emacs.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-03-16 13:28:06 +0100\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 33}, "enlightenment-live": {"quality": "experimental", "status": "unofficial", "name": "enlightenment-live", "description": {"en": "Enlightenment WM latest stable version and live ebuilds"}, "homepage": "https://github.com/rafspiny/enlightenment-live", "owner": [{"type": "person", "email": "rafspiny@gmail.com", "name": "Raffaele Spinelli"}], "source": [{"type": "git", "uri": "https://github.com/rafspiny/enlightenment-live.git"}], "feed": ["https://github.com/rafspiny/enlightenment-live/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-13 13:34:34 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 22}, "ennui": {"quality": "experimental", "status": "unofficial", "name": "ennui", "description": {"en": "Facilitate running hardened-desktop hybrid system"}, "homepage": "https://gitweb.gentoo.org/user/ennui.git/", "owner": [{"type": "person", "email": "gentoo@seaofdirac.net", "name": "Nicholas Fish"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/ennui.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/ennui.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/ennui.git"}], "feed": ["https://gitweb.gentoo.org/user/ennui.git/atom/"], "x-state": "BAD_CACHE", "x-timestamp": "2020-04-17 23:15:42 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 35}, "equaeghe": {"quality": "experimental", "status": "unofficial", "name": "equaeghe", "description": {"en": "Erik Quaeghebeur's personal Gentoo overlay"}, "homepage": "https://github.com/equaeghe/gentoo-overlay/", "owner": [{"type": "person", "email": "gentoo@e3q.eu", "name": "Erik Quaeghebeur"}], "source": [{"type": "git", "uri": "https://github.com/equaeghe/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/equaeghe/gentoo-overlay.git"}], "feed": ["https://github.com/equaeghe/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-01-29 13:12:56 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 11}, "erayd": {"quality": "experimental", "status": "unofficial", "name": "erayd", "description": {"en": "Various personal ebuilds"}, "homepage": "https://github.com/erayd/overlay", "owner": [{"type": "person", "email": "steve@erayd.net", "name": "Steve Gilberd"}], "source": [{"type": "git", "uri": "https://github.com/erayd/overlay.git"}, {"type": "git", "uri": "git://github.com/erayd/overlay.git"}, {"type": "git", "uri": "git@github.com:erayd/overlay.git"}], "feed": ["https://github.com/erayd/overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-07-20 17:20:54 +1200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 9}, "escpr2": {"quality": "experimental", "status": "unofficial", "name": "escpr2", "description": {"en": "EPSON ESCPR2 inkjet printer repository"}, "homepage": "https://gitlab.com/at.gentoo.repo/epson-inkjet-printer-escpr2", "owner": [{"type": "person", "email": "andreas.thalhammer@linux.com", "name": "Andreas Thalhammer"}], "source": [{"type": "git", "uri": "https://gitlab.com/at.gentoo.repo/epson-inkjet-printer-escpr2.git"}], "feed": ["https://gitlab.com/at.gentoo.repo/epson-inkjet-printer-escpr2/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-15 07:38:57 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "ethereum": {"quality": "experimental", "status": "unofficial", "name": "ethereum", "description": {"en": "The Ethereum blockchain-based distributed computing platform"}, "homepage": "https://github.com/coolparadox/ethereum-gentoo-overlay", "owner": [{"type": "person", "email": "coolparadox@gmail.com", "name": "Rafael Lorandi"}], "source": [{"type": "git", "uri": "https://github.com/coolparadox/ethereum-gentoo-overlay.git"}, {"type": "git", "uri": "git@github.com:coolparadox/ethereum-gentoo-overlay.git"}], "feed": ["https://github.com/coolparadox/ethereum-gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-11-07 16:42:19 -0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 6}, "eugene-bright": {"quality": "experimental", "status": "unofficial", "name": "eugene-bright", "description": {"en": "The personal overlay of Eugene Bright"}, "homepage": "https://github.com/eugene-bright/eugene-bright-overlay", "owner": [{"type": "person", "email": "eugene@bright.gdn", "name": "Eugene Bright"}], "source": [{"type": "git", "uri": "https://github.com/eugene-bright/eugene-bright-overlay.git"}, {"type": "git", "uri": "git@github.com:eugene-bright/eugene-bright-overlay.git"}], "feed": ["https://github.com/eugene-bright/eugene-bright-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-08-18 15:35:56 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "ext-devlibs": {"quality": "experimental", "status": "unofficial", "name": "ext-devlibs", "description": {"en": "Mostly c/c++ and python libraries"}, "homepage": "https://gitlab.com/extsidvind/ext-devlibs", "owner": [{"type": "person", "email": "ext@sidvind.com", "name": "David Sveningsson"}], "source": [{"type": "git", "uri": "https://gitlab.com/extsidvind/ext-devlibs.git"}, {"type": "git", "uri": "git@gitlab.com:extsidvind/ext-devlibs.git"}], "feed": ["https://gitlab.com/extsidvind/ext-devlibs/-/commits/master?format=atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-02-01 09:41:48 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 22}, "farmboy0": {"quality": "experimental", "status": "unofficial", "name": "farmboy0", "description": {"en": "Personal overlay of Enrico Horn"}, "homepage": "https://github.com/farmboy0/portage-overlay", "owner": [{"type": "person", "email": "farmboy0@googlemail.com", "name": "Enrico Horn"}], "source": [{"type": "git", "uri": "https://github.com/farmboy0/portage-overlay.git"}, {"type": "git", "uri": "git://github.com/farmboy0/portage-overlay.git"}, {"type": "git", "uri": "git@github.com:farmboy0/portage-overlay.git"}], "feed": ["https://github.com/farmboy0/portage-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-07 20:36:17 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 33}, "fem-overlay": {"quality": "experimental", "status": "unofficial", "name": "fem-overlay", "description": {"en": "FeM Gentoo Overlay"}, "homepage": "https://bitbucket.fem.tu-ilmenau.de/projects/GENTOO/repos/fem-overlay/", "owner": [{"type": "person", "email": "frainz@mailbox.org", "name": "Paul Michel"}], "source": [{"type": "git", "uri": "https://bitbucket.fem.tu-ilmenau.de/scm/gentoo/fem-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-15 19:16:20 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 123}, "ferki": {"quality": "experimental", "status": "unofficial", "name": "ferki", "description": {"en": "Ebuilds used and/or proxy maintained by FErki"}, "homepage": "https://github.com/ferki/gentoo-overlay", "owner": [{"type": "person", "email": "erkiferenc@gmail.com", "name": "Ferenc Erki"}], "source": [{"type": "git", "uri": "https://github.com/ferki/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/ferki/gentoo-overlay.git"}], "feed": ["https://github.com/ferki/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-05 23:05:41 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 23}, "fidonet": {"quality": "experimental", "status": "unofficial", "name": "fidonet", "description": {"en": "Overlay of Benny Pedersen"}, "owner": [{"type": "person", "email": "me@junc.org", "name": "Benny Pedersen"}], "source": [{"type": "rsync", "uri": "rsync://fidonet.overlay.junc.org/fidonet/"}], "x-state": "GOOD", "x-timestamp": "2020-11-21 13:15:46.000000000 +0000\n", "x-masters": ["gentoo"], "x-ebuild-count": 26}, "fkmclane": {"quality": "experimental", "status": "unofficial", "name": "fkmclane", "description": {"en": "Personal overlay of fkmclane containing patched ebuilds and new ebuilds"}, "homepage": "https://github.com/fkmclane/overlay", "owner": [{"type": "person", "email": "fkmclane@gmail.com", "name": "Foster McLane"}], "source": [{"type": "git", "uri": "https://github.com/fkmclane/overlay.git"}, {"type": "git", "uri": "git://github.com/fkmclane/overlay.git"}], "feed": ["https://github.com/fkmclane/overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2020-04-28 18:35:22 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 90}, "flammie": {"quality": "experimental", "status": "unofficial", "name": "flammie", "description": {"en": "An overlay for gentoo for things Flammie's worked on: Apertium, HFST, computational linguistics, spell-checking, obscure languages..."}, "homepage": "https://github.com/flammie/flammie-overlay", "owner": [{"type": "person", "email": "flammie@gentoo.org", "name": "Flammie Pirinen"}], "source": [{"type": "git", "uri": "https://github.com/flammie/flammie-overlay.git"}, {"type": "git", "uri": "git://github.com/flammie/flammie-overlay.git"}], "feed": ["https://github.com/flammie/flammie-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-26 14:35:44 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 26}, "flavour": {"quality": "experimental", "status": "unofficial", "name": "flavour", "description": {"en": "Personal overlay of Wim Muskee"}, "homepage": "https://github.com/wimmuskee/flavour", "owner": [{"type": "person", "email": "wimmuskee@gmail.com", "name": "Wim Muskee"}], "source": [{"type": "git", "uri": "https://github.com/wimmuskee/flavour.git"}, {"type": "git", "uri": "git://github.com/wimmuskee/flavour.git"}], "x-state": "GOOD", "x-timestamp": "2021-02-23 05:51:17 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 47}, "flewkey-overlay": {"quality": "experimental", "status": "unofficial", "name": "flewkey-overlay", "description": {"en": "Personal Gentoo overlay for flewkey"}, "homepage": "https://git.sdf.org/flewkey/flewkey-overlay", "owner": [{"type": "person", "email": "flewkey@2a03.party", "name": "Ryan Fox"}], "source": [{"type": "git", "uri": "https://git.sdf.org/flewkey/flewkey-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-15 07:11:45 +0000\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 118}, "flightsim": {"quality": "experimental", "status": "unofficial", "name": "flightsim", "description": {"en": "Overlay with packages for flight simulation, mainly related to X-Plane"}, "homepage": "https://github.com/rafaelmartins/flightsim-overlay", "owner": [{"type": "person", "email": "rafaelmartins@gentoo.org", "name": "Rafael G. Martins"}], "source": [{"type": "git", "uri": "https://github.com/rafaelmartins/flightsim-overlay.git"}, {"type": "git", "uri": "git://github.com/rafaelmartins/flightsim-overlay.git"}, {"type": "git", "uri": "git@github.com:rafaelmartins/flightsim-overlay.git"}], "feed": ["https://github.com/rafaelmartins/flightsim-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2017-05-07 01:00:51 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "floppym": {"quality": "experimental", "status": "unofficial", "name": "floppym", "description": {"en": "floppym's personal overlay"}, "homepage": "https://github.com/floppym/floppym", "owner": [{"type": "person", "email": "floppym@gentoo.org", "name": "Mike Gilbert"}], "source": [{"type": "git", "uri": "https://github.com/floppym/floppym"}], "x-state": "GOOD", "x-timestamp": "2021-01-11 17:41:02 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "flow": {"quality": "experimental", "status": "unofficial", "name": "flow", "description": {"en": "Ebuilds by Florian Schmaus"}, "homepage": "https://gitlab.com/Flow/flow-s-ebuilds", "owner": [{"type": "person", "email": "flo@geekplace.eu", "name": "Florian Schmaus"}], "source": [{"type": "git", "uri": "https://gitlab.com/Flow/flow-s-ebuilds.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-10 15:29:56 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 100}, "flussence": {"quality": "experimental", "status": "unofficial", "name": "flussence", "description": {"en": "Ant P.'s personal overlay"}, "homepage": "https://repo.or.cz/flussence-overlay.git", "owner": [{"type": "person", "email": "ant+gentoo.bugs@flussence.eu", "name": "Anthony Parsons"}], "source": [{"type": "git", "uri": "https://repo.or.cz/flussence-overlay.git"}, {"type": "git", "uri": "git://repo.or.cz/flussence-overlay.git"}, {"type": "git", "uri": "ssh://git@repo.or.cz/flussence-overlay.git"}], "feed": ["https://repo.or.cz/flussence-overlay.git/atom"], "x-state": "GOOD", "x-timestamp": "2021-03-15 22:42:25 +0000\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 50}, "fol4": {"quality": "experimental", "status": "unofficial", "name": "fol4", "description": {"en": "fol4 overlay"}, "homepage": "https://gitlab.com/madsl/fol4", "owner": [{"type": "person", "email": "mads@ab3.no", "name": "Mads"}], "source": [{"type": "git", "uri": "https://gitlab.com/madsl/fol4"}, {"type": "git", "uri": "git+ssh://git@gitlab.com/madsl/fol4.git"}], "feed": ["https://gitlab.com/madsl/fol4/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-16 14:31:36 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 55}, "foo-overlay": {"quality": "experimental", "status": "unofficial", "name": "foo-overlay", "description": {"en": "Piotr's fixes and new packages"}, "homepage": "https://github.com/slashbeast/foo-overlay", "owner": [{"type": "person", "email": "slashbeast@gentoo.org", "name": "Piotr Karbowski"}], "source": [{"type": "git", "uri": "git://github.com/slashbeast/foo-overlay.git"}, {"type": "git", "uri": "https://github.com/slashbeast/foo-overlay.git"}], "feed": ["https://github.com/slashbeast/foo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-01-19 16:39:22 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 12}, "fordfrog": {"quality": "experimental", "status": "official", "name": "fordfrog", "description": {"en": "Developer overlay"}, "homepage": "https://cgit.gentoo.org/dev/fordfrog.git/", "owner": [{"type": "person", "email": "fordfrog@gentoo.org", "name": "Miroslav \u0160ulc"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/fordfrog.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/fordfrog.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/fordfrog.git"}], "feed": ["https://cgit.gentoo.org/dev/fordfrog.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-03-14 09:45:31 +0100\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 286}, "fowlay": {"quality": "experimental", "status": "unofficial", "name": "fowlay", "description": {"en": "Collection of ebuilds"}, "homepage": "https://github.com/fowlay/fowlay-overlay", "owner": [{"type": "person", "email": "rabbe@bahnhof.se", "name": "Rabbe Fogelholm"}], "source": [{"type": "git", "uri": "https://github.com/fowlay/fowlay-overlay.git"}], "feed": ["https://github.com/fowlay/fowlay-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2018-04-07 14:41:09 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 1}, "foxiverlay": {"quality": "experimental", "status": "unofficial", "name": "foxiverlay", "description": {"en": "Personal overlay for unofficial ebuilds"}, "homepage": "https://github.com/Pekkari/foxiverlay", "owner": [{"type": "person", "email": "koalinux@gmail.com", "name": "Jos\u00e9 Pekkarinen"}], "source": [{"type": "git", "uri": "https://github.com/Pekkari/foxiverlay.git"}, {"type": "git", "uri": "git://github.com/Pekkari/foxiverlay.git"}, {"type": "git", "uri": "git@github.com:Pekkari/foxiverlay.git"}], "feed": ["https://github.com/Pekkari/foxiverlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-03 16:19:16 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "fritteli": {"quality": "experimental", "status": "unofficial", "name": "fritteli", "description": {"en": "fritteli's Gentoo Overlay"}, "homepage": "https://github.com/fritteli/gentoo-overlay", "owner": [{"type": "person", "email": "manuel@fritteli.ch", "name": "Manuel Friedli"}], "source": [{"type": "git", "uri": "https://github.com/fritteli/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/fritteli/gentoo-overlay.git"}], "feed": ["https://github.com/fritteli/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-08 15:55:27 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 45}, "frr-gentoo": {"quality": "stable", "status": "official", "name": "frr-gentoo", "description": {"en": "Free Range Routing Gentoo Overlay"}, "homepage": "https://frrouting.org/", "owner": [{"type": "person", "email": "f0o@devilcode.org", "name": "Daniel 'f0o' Preussker"}], "source": [{"type": "git", "uri": "https://github.com/FRRouting/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com:FRRouting/gentoo-overlay.git"}], "feed": ["https://github.com/FRRouting/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-12-01 08:18:20 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 47}, "fusion809": {"quality": "experimental", "status": "unofficial", "name": "fusion809", "description": {"en": "Brenton's Portage overlay"}, "homepage": "https://github.com/fusion809/fusion809-overlay", "owner": [{"type": "person", "email": "brentonhorne77@gmail.com", "name": "Brenton Horne"}], "source": [{"type": "git", "uri": "https://github.com/fusion809/fusion809-overlay.git"}, {"type": "git", "uri": "git://github.com/fusion809/fusion809-overlay.git"}], "feed": ["https://github.com/fusion809/fusion809-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-16 08:50:55 +1000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 9}, "fuverlay": {"quality": "experimental", "status": "unofficial", "name": "fuverlay", "description": {"en": "Funkill's overlay"}, "homepage": "https://github.com/funkill/fuverlay", "owner": [{"type": "person", "email": "funkill2@gmail.com", "name": "Funkill"}], "source": [{"type": "git", "uri": "https://github.com/funkill/fuverlay.git"}], "feed": ["https://github.com/funkill/fuverlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2019-02-03 01:49:12 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 6}, "gamarouns": {"quality": "experimental", "status": "unofficial", "name": "gamarouns", "description": {"en": "Bits and pieces missing in gentoo or layman repos I need"}, "homepage": "https://github.com/Amaroun/gamarouns", "owner": [{"type": "person", "email": "vit.kasal@gmail.com", "name": "amaroun"}], "source": [{"type": "git", "uri": "https://github.com/Amaroun/gamarouns.git"}], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-08 11:12:23 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 52}, "gambas-overlay": {"quality": "experimental", "status": "unofficial", "name": "gambas-overlay", "description": {"en": "Gambas IDE overlay for Gentoo Linux"}, "homepage": "https://github.com/damex/gambas-overlay", "owner": [{"type": "person", "email": "damex.pp@gmail.com", "name": "Roman Kuzmitsky"}], "source": [{"type": "git", "uri": "https://github.com/damex/gambas-overlay.git"}], "feed": ["https://github.com/damex/gambas-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2016-02-10 01:31:50 +0700\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 0}, "gamerlay": {"quality": "experimental", "status": "unofficial", "name": "gamerlay", "description": {"en": "\n Gamers overlay for all various games. Not related with games team.\n "}, "homepage": "https://cgit.gentoo.org/proj/gamerlay.git", "owner": [{"type": "person", "email": "mva@gentoo.org", "name": "Vadim A. Misbakh-Soloviov"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/gamerlay.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/gamerlay.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/gamerlay.git"}], "feed": ["https://cgit.gentoo.org/proj/gamerlay.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-02-24 22:32:19 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 103}, "gcarq": {"quality": "experimental", "status": "unofficial", "name": "gcarq", "description": {"en": "Personal overlay"}, "homepage": "https://github.com/gcarq/gcarq-overlay", "owner": [{"type": "person", "email": "michael.egger@tsn.at", "name": "Michael Egger"}], "source": [{"type": "git", "uri": "https://github.com/gcarq/gcarq-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/gcarq/gcarq-overlay.git"}], "feed": ["https://github.com/gcarq/gcarq-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-28 18:54:56 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 8}, "genthree": {"quality": "experimental", "status": "unofficial", "name": "genthree", "description": {"en": "Gentoo overlay from the genthree project"}, "homepage": "https://genthree.io/overlay", "owner": [{"type": "person", "email": "nyronium@genthree.io", "name": "nyronium"}], "source": [{"type": "git", "uri": "https://gitlab.com/genthree/overlay.git"}], "feed": ["https://gitlab.com/genthree/overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2020-04-18 16:27:50 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 48}, "gentoo": {"quality": "core", "status": "official", "name": "gentoo", "description": {"en": "Official Gentoo ebuild repository"}, "homepage": "https://gentoo.org/", "owner": [{"type": "project", "email": "bug-wranglers@gentoo.org"}], "source": [{"type": "rsync", "uri": "rsync://rsync.gentoo.org/gentoo-portage"}, {"type": "git", "uri": "https://anongit.gentoo.org/git/repo/gentoo.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/repo/gentoo.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/gentoo.git"}], "feed": ["https://cgit.gentoo.org/repo/gentoo.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-03-16 18:35:06 +0100\n", "x-openpgp-signed": "U", "x-masters": [], "x-ebuild-count": 29454}, "gentoo-bootstrap": {"quality": "experimental", "status": "unofficial", "name": "gentoo-bootstrap", "description": {"en": "Overlay providing packages to bootstrap OpenJDK and Rust"}, "homepage": "https://gitlab.com/stikonas/gentoo-bootstrap", "owner": [{"type": "person", "email": "andrius@stikonas.eu", "name": "Andrius \u0160tikonas"}], "source": [{"type": "git", "uri": "https://gitlab.com/stikonas/gentoo-bootstrap.git"}, {"type": "git", "uri": "git+ssh://git@gitlab.com:stikonas/gentoo-bootstrap.git"}], "x-state": "GOOD", "x-timestamp": "2020-11-13 21:17:12 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 48}, "gentoo-clang": {"quality": "experimental", "status": "unofficial", "name": "gentoo-clang", "description": {"en": "Gentoo overlay providing patches to build entire system with clang"}, "homepage": "https://github.com/BilyakA/gentoo-clang", "owner": [{"type": "person", "email": "bilyak.alexander@gmail.com", "name": "Alexander Bilyak"}], "source": [{"type": "git", "uri": "https://github.com/BilyakA/gentoo-clang.git"}, {"type": "git", "uri": "git://github.com/BilyakA/gentoo-clang.git"}, {"type": "git", "uri": "git@github.com:BilyakA/gentoo-clang.git"}], "feed": ["https://github.com/BilyakA/gentoo-clang/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-05-29 09:13:01 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 12}, "gentoo-mate": {"quality": "experimental", "status": "official", "name": "gentoo-mate", "description": {"en": "Gentoo MATE Desktop Project Repo"}, "homepage": "https://wiki.gentoo.org/wiki/Project:MATE", "owner": [{"type": "project", "email": "mate@gentoo.org", "name": "MATE Desktop Project"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/gentoo-mate.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/gentoo-mate.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/gentoo-mate.git"}], "feed": ["https://cgit.gentoo.org/proj/gentoo-mate.git/atom/"], "x-state": "BAD_CACHE", "x-timestamp": "2020-09-07 22:21:22 -0400\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 173}, "gentoo-zh": {"quality": "experimental", "status": "unofficial", "name": "gentoo-zh", "description": {"en": "To provide programs useful to Chinese speaking users (merged\n from gentoo-china and gentoo-taiwan)."}, "homepage": "https://github.com/microcai/gentoo-zh", "owner": [{"type": "person", "email": "microcai@fedoraproject.org"}], "source": [{"type": "git", "uri": "git://github.com/microcai/gentoo-zh.git"}], "feed": ["https://github.com/microcai/gentoo-zh/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-16 19:20:11 +0800\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 290}, "gentoobr": {"quality": "experimental", "status": "unofficial", "name": "gentoobr", "description": {"en": "Overlay containing experimental packages developed\n by the brazilian community, with focus on providing programs useful to\n portuguese speaking users and introducing new people to contribute.", "pt": "Overlay contendo pacotes experimentais desenvolvidos\n pela comunidade brasileira, com foco em oferecer programas \u00fateis \u00e0 falantes\n da l\u00edngua portuguesa e em introduzir novas pessoas a contribuir."}, "homepage": "https://github.com/gentoobr/overlay", "owner": [{"type": "person", "email": "leonardohn@null.net", "name": "Leonardo Henrique Neumann"}], "source": [{"type": "git", "uri": "https://github.com/gentoobr/overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/gentoobr/overlay.git"}], "feed": ["https://github.com/gentoobr/overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-15 10:40:32 -0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 27}, "gerislay": {"quality": "experimental", "status": "unofficial", "name": "gerislay", "description": {"en": "A personal overlay with no specific focus (mainly to\n test ebuilds). Highly experimental. It is meant as a playground for me,\n but others might be interested."}, "homepage": "https://cgit.gentoo.org/repo/user/gerislay.git", "owner": [{"type": "person", "email": "gerion.entrup@flump.de", "name": "gerion"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/user/gerislay.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/user/gerislay.git"}], "feed": ["https://cgit.gentoo.org/repo/user/gerislay.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-02-24 22:52:03 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 34}, "gig": {"quality": "experimental", "status": "unofficial", "name": "gig", "description": {"en": "Gig OS's Overlay"}, "homepage": "https://github.com/Gig-OS/gig", "owner": [{"type": "person", "email": "yangmame@i2pmail.org"}], "source": [{"type": "git", "uri": "https://github.com/Gig-OS/gig.git"}], "feed": ["https://github.com/Gig-OS/gig/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-06 15:11:38 +0800\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 35}, "gitlab": {"quality": "experimental", "status": "unofficial", "name": "gitlab", "description": {"en": "Unofficial ebuilds for Gitlab"}, "homepage": "https://gitlab.awesome-it.de/overlays/gitlab", "owner": [{"type": "person", "email": "prote@fmi.uni-stuttgart.de", "name": "Horst Prote"}], "source": [{"type": "git", "uri": "https://gitlab.awesome-it.de/overlays/gitlab.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-15 10:12:31 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 61}, "glarbs-overlay": {"quality": "experimental", "status": "unofficial", "name": "glarbs-overlay", "description": {"en": "A Gentoo overlay used by GLARBS.", "sv": "Ett Gentoo \u00f6verl\u00e4gg som anv\u00e4nds av GLARBS."}, "homepage": "https://wiki.gentoo.org/wiki/User:Et-8/GLARBS", "owner": [{"type": "person", "email": "et-8@emiliatrollros.se", "name": "Emilia Trollros"}], "source": [{"type": "git", "uri": "https://gitlab.com/et-8/glarbs-overlay.git"}], "feed": ["https://gitlab.com/et-8/glarbs-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-11-22 19:46:06 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 21}, "gnome": {"quality": "experimental", "status": "official", "name": "gnome", "description": {"en": "experimental gnome ebuilds"}, "homepage": "https://cgit.gentoo.org/proj/gnome.git/", "owner": [{"type": "project", "email": "gnome@gentoo.org", "name": "GNOME team"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/gnome.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/gnome.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/gnome.git"}], "feed": ["https://cgit.gentoo.org/proj/gnome.git/atom/"], "x-state": "BAD_CACHE", "x-timestamp": "2021-01-30 22:02:41 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 111}, "gnome-next": {"quality": "experimental", "status": "unofficial", "name": "gnome-next", "description": {"en": "experimental newer gnome ebuilds"}, "homepage": "https://github.com/Heather/gentoo-gnome", "owner": [{"type": "person", "email": "cynede@gentoo.org", "name": "Mikhail Pukhlikov"}], "source": [{"type": "git", "uri": "https://github.com/Heather/gentoo-gnome.git"}, {"type": "git", "uri": "git@github.com:Heather/gentoo-gnome.git"}], "feed": ["https://github.com/Heather/gentoo-gnome/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-02-04 10:43:15 +0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 191}, "gnuradio": {"quality": "experimental", "status": "unofficial", "name": "gnuradio", "description": {"en": "A repository for GNURadio packages/addons"}, "homepage": "https://github.com/hololeap/gentoo-gnuradio", "owner": [{"type": "person", "email": "hololeap@gmail.com"}], "source": [{"type": "git", "uri": "https://github.com/hololeap/gentoo-gnuradio"}], "feed": ["https://github.com/hololeap/gentoo-gnuradio/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-15 20:24:11 -0700\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 128}, "gnustep": {"quality": "experimental", "status": "official", "name": "gnustep", "description": {"en": "Experimental ebuilds for GNUstep packages in Gentoo. Comments and bugreports are welcome!"}, "homepage": "https://cgit.gentoo.org/proj/gnustep.git/", "owner": [{"type": "project", "email": "gnustep@gentoo.org"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/gnustep.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/gnustep.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/gnustep.git"}], "feed": ["https://cgit.gentoo.org/proj/gnustep.git/atom/"], "x-state": "GOOD", "x-timestamp": "2019-01-14 17:11:46 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "gnux32": {"quality": "experimental", "status": "unofficial", "name": "gnux32", "description": {"en": "A personal overlay with ebuilds for the x32 ABI"}, "homepage": "https://github.com/1camper/gnux32", "owner": [{"type": "person", "email": "theonetruecamper@gmx.de", "name": "Matthias R\u00e4ncker"}], "source": [{"type": "git", "uri": "https://github.com/1camper/gnux32.git"}, {"type": "git", "uri": "git://github.com/1camper/gnux32.git"}], "feed": ["https://github.com/1camper/gnux32/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2020-05-24 11:36:38 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 82}, "go-overlay": {"quality": "experimental", "status": "unofficial", "name": "go-overlay", "description": {"en": "Golang related ebuilds"}, "homepage": "https://github.com/Dr-Terrible/go-overlay", "owner": [{"type": "person", "email": "toffanin.mauro@gmail.com", "name": "Mauro Toffanin"}], "source": [{"type": "git", "uri": "https://github.com/Dr-Terrible/go-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2021-01-27 21:38:55 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 241}, "godin": {"quality": "experimental", "status": "unofficial", "name": "godin", "description": {"en": "Godin's Gentoo Overlay"}, "homepage": "https://github.com/Godin/gentoo-overlay", "owner": [{"type": "person", "email": "mandrikov@gmail.com", "name": "Evgeny Mandrikov"}], "source": [{"type": "git", "uri": "https://github.com/Godin/gentoo-overlay.git"}, {"type": "git", "uri": "git://github.com/Godin/gentoo-overlay.git"}], "feed": ["https://github.com/Godin/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-02-20 12:08:54 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 14}, "goduck777": {"quality": "experimental", "status": "unofficial", "name": "goduck777", "description": {"en": "Personal overlay containing some not-so-popular apps"}, "homepage": "https://github.com/goduck777/gentoo-overlay", "owner": [{"type": "person", "email": "goduck777@gmail.com", "name": "Chang Liu"}], "source": [{"type": "git", "uri": "https://github.com/goduck777/gentoo-overlay.git"}, {"type": "git", "uri": "git://github.com/goduck777/gentoo-overlay.git"}, {"type": "git", "uri": "git@github.com:goduck777/gentoo-overlay.git"}], "feed": ["https://github.com/Godin/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-12-16 23:07:27 -0500\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 3}, "goris": {"quality": "experimental", "status": "unofficial", "name": "goris", "description": {"en": "Goris overlay"}, "homepage": "https://cgit.gentoo.org/repo/user/goris.git/", "owner": [{"type": "person", "email": "norayr.am@gmail.com", "name": "Norayr Mirakyan"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/user/goris.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/repo/user/goris.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/user/goris.git"}], "feed": ["https://cgit.gentoo.org/repo/user/goris.git/atom/"], "x-state": "GOOD", "x-timestamp": "2015-10-16 19:37:55 +0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 8}, "graaff": {"quality": "experimental", "status": "official", "name": "graaff", "description": {"en": "Developer overlay of Hans de Graaff with mostly ruby and\n xemacs ebuilds, and a few assorted other goodies."}, "homepage": "http://moving-innovations.com/blog/", "owner": [{"type": "person", "email": "graaff@gentoo.org", "name": "Hans de Graaff"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/graaff.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/graaff.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/graaff.git"}], "feed": ["https://cgit.gentoo.org/dev/graaff.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-03-15 06:58:52 +0100\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 424}, "griffon_overlay": {"quality": "experimental", "status": "unofficial", "name": "griffon_overlay", "description": {"en": "Personal overlay of GriffOn Yi"}, "homepage": "https://github.com/windfail/griffon_overlay", "owner": [{"type": "person", "email": "yily_101@163.com", "name": "GriffOn Yi"}], "source": [{"type": "git", "uri": "https://github.com/windfail/griffon_overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/windfail/griffon_overlay.git"}], "feed": ["https://github.com/windfail/griffon_overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-03 20:29:59 +0800\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "grub2-themes": {"quality": "experimental", "status": "official", "name": "grub2-themes", "description": {"en": "Overlay dedicated to Grub2 themes (of any distribution)"}, "homepage": "https://gitweb.gentoo.org/repo/proj/grub2-themes.git/", "owner": [{"type": "person", "email": "sping@gentoo.org", "name": "Sebastian Pipping"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/proj/grub2-themes.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/proj/grub2-themes.git"}], "feed": ["https://gitweb.gentoo.org/repo/proj/grub2-themes.git/atom/?h=master"], "x-state": "GOOD", "x-timestamp": "2015-07-19 17:38:24 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 24}, "gsview-overlay": {"quality": "experimental", "status": "unofficial", "name": "gsview-overlay", "description": {"en": "Overlay for the gsview and some other plotting/scientific soft"}, "homepage": "https://github.com/uleysky/gsview-overlay", "owner": [{"type": "person", "email": "uleysky@gmail.com", "name": "Michael Uleysky"}], "source": [{"type": "git", "uri": "https://github.com/uleysky/gsview-overlay.git"}, {"type": "git", "uri": "git://github.com/uleysky/gsview-overlay.git"}, {"type": "git", "uri": "git@github.com:uleysky/gsview-overlay.git"}], "feed": ["https://github.com/uleysky/gsview-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-21 12:19:15 +1000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 12}, "guru": {"quality": "experimental", "status": "official", "name": "guru", "description": {"en": "GURU: Ebuild repository entirely maintained by Gentoo users"}, "homepage": "https://wiki.gentoo.org/wiki/Project:GURU", "owner": [{"type": "project", "email": "guru@gentoo.org", "name": "GURU"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/proj/guru.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/proj/guru.git"}], "feed": ["https://cgit.gentoo.org/repo/proj/guru.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-03-16 14:16:30 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 934}, "haarp": {"quality": "experimental", "status": "unofficial", "name": "haarp", "description": {"en": "misc ebuilds that aren't in the main tree"}, "homepage": "https://cgit.gentoo.org/user/haarp.git/", "owner": [{"type": "person", "email": "main.haarp@gmail.com", "name": "haarp"}], "source": [{"type": "git", "uri": "git://anongit.gentoo.org/user/haarp.git"}], "x-state": "GOOD", "x-timestamp": "2021-02-24 22:31:40 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 44}, "hamper-overlay": {"quality": "experimental", "status": "unofficial", "name": "hamper-overlay", "description": {"en": "User overlay"}, "homepage": "https://github.com/hamper/hamper-overlay", "owner": [{"type": "person", "email": "hamper.nhs@gmail.com", "name": "Alexander Pilipenko"}], "source": [{"type": "git", "uri": "https://github.com/Hamper/hamper-overlay.git"}, {"type": "git", "uri": "git://github.com/hamper/hamper-overlay.git"}], "feed": ["https://github.com/hamper/hamper-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-02 05:01:47 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 18}, "han": {"quality": "experimental", "status": "unofficial", "name": "han", "description": {"en": "Han's personal ebuild repository"}, "homepage": "https://github.com/hanmertens/han-overlay", "owner": [{"type": "person", "email": "hanmertens@outlook.com", "name": "Han Mertens"}], "source": [{"type": "git", "uri": "https://github.com/hanmertens/han-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/hanmertens/han-overlay.git"}], "feed": ["https://github.com/hanmertens/han-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-10 08:31:16 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 9}, "hangul-typing": {"quality": "experimental", "status": "unofficial", "name": "hangul-typing", "description": {"en": "It contains hangul-typing tutors."}, "homepage": "https://gitlab.com/espresso.tiger/hangul-typing", "owner": [{"type": "person", "email": "espresso.tiger@gmail.com", "name": "espresso tiger"}], "source": [{"type": "git", "uri": "https://gitlab.com/espresso.tiger/hangul-typing.git"}, {"type": "git", "uri": "git+ssh://git@gitlab.com/espresso.tiger/hangul-typing.git"}], "feed": ["https://gitlab.com/espresso.tiger/hangul-typing/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2018-12-23 22:47:42 +0900\n", "x-openpgp-signed": "N", "x-masters": ["gentoo", "haskell"], "x-ebuild-count": 3}, "haskell": {"quality": "experimental", "status": "official", "name": "haskell", "description": {"en": "The Official Gentoo Haskell overlay."}, "homepage": "https://github.com/gentoo-haskell", "owner": [{"type": "project", "email": "haskell@gentoo.org"}], "source": [{"type": "git", "uri": "https://github.com/gentoo-haskell/gentoo-haskell.git"}, {"type": "git", "uri": "git://github.com/gentoo-haskell/gentoo-haskell.git"}, {"type": "git", "uri": "https://github.com/gentoo-haskell/gentoo-haskell.git"}], "feed": ["https://github.com/gentoo-haskell/gentoo-haskell/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-16 06:56:05 +1100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 2483}, "heindsight": {"quality": "experimental", "status": "unofficial", "name": "heindsight", "description": {"en": "heindsight's personal overlay"}, "homepage": "https://github.com/heindsight/gentoo_overlay", "owner": [{"type": "person", "email": "heindsight@kruger.dev", "name": "Heinrich Kruger"}], "source": [{"type": "git", "uri": "https://github.com/heindsight/gentoo_overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/heindsight/gentoo_overlay.git"}], "feed": ["https://github.com/heindsight/gentoo_overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-11-18 18:40:23 +0000\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 6}, "hering-overlay": {"quality": "experimental", "status": "unofficial", "name": "hering-overlay", "description": {"en": "Richard Hering's gentoo overlay"}, "homepage": "https://github.com/internethering/hering-overlay", "owner": [{"type": "person", "email": "richard@internethering.de", "name": "Richard Hering"}], "source": [{"type": "git", "uri": "https://github.com/internethering/hering-overlay.git"}], "feed": ["https://github.com/internethering/hering-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-02 13:33:06 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 47}, "hexedit-overlay": {"quality": "experimental", "status": "unofficial", "name": "hexedit-overlay", "description": {"en": "Ebuilds for infrastructure-related packages and my own projects"}, "homepage": "http://hexedit.me/gentoo/", "owner": [{"type": "person", "email": "hexedit@ifproject.ru", "name": "Timofey Negrebetsky"}], "source": [{"type": "git", "uri": "https://git.ifproject.ru/hexedit/gentoo-overlay.git"}], "x-timestamp-command": ["git", "log", "--format=%ci", "-1"], "x-openpgp-signature-command": ["git", "show", "-q", "--pretty=format:%G?", "HEAD"], "x-state": "SYNC_FAIL"}, "hibiscus": {"quality": "experimental", "status": "unofficial", "name": "hibiscus", "description": {"en": "Hibiscus homebanking overlay"}, "homepage": "https://cgit.gentoo.org/user/hibiscus.git/", "owner": [{"type": "person", "email": "gentoo@posteo.de", "name": "Fabian K\u00f6ster"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/hibiscus.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/hibiscus.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/hibiscus.git"}], "feed": ["https://cgit.gentoo.org/user/hibiscus.git/atom/"], "x-state": "GOOD", "x-timestamp": "2015-10-28 17:09:06 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 22}, "holgersson-overlay": {"quality": "experimental", "status": "unofficial", "name": "holgersson-overlay", "description": {"en": "Nils \"holgersson\" Freydank's personal overlay"}, "homepage": "https://git.holgersson.xyz", "owner": [{"type": "person", "email": "holgersson@posteo.de", "name": "Nils Freydank"}], "source": [{"type": "git", "uri": "https://git.holgersson.xyz/foss/holgersson-overlay"}], "x-state": "GOOD", "x-timestamp": "2021-03-14 20:23:40 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 36}, "hossie": {"quality": "experimental", "status": "unofficial", "name": "hossie", "description": {"en": "gentoo-overlay from hossie"}, "homepage": "https://git.hossie.de/projects/GEN/repos/gentoo-overlay/browse", "owner": [{"type": "person", "email": "hossie@hossie.de"}], "source": [{"type": "git", "uri": "https://git.hossie.de/scm/gen/gentoo-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2021-02-15 21:21:47 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 75}, "hotstoast": {"quality": "experimental", "status": "unofficial", "name": "hotstoast", "description": {"en": "Tom Hotston's personal overlay"}, "homepage": "https://github.com/TomHotston/hotstoast-overlay", "owner": [{"type": "person", "email": "hotston.tom@gmail.com", "name": "Tom Hotston"}], "source": [{"type": "git", "uri": "https://github.com/TomHotston/hotstoast-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/TomHotston/hotstoast-overlay.git"}], "feed": ["https://github.com/TomHotston/hotstoast-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-13 16:09:09 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 1}, "ikelos": {"quality": "experimental", "status": "unofficial", "name": "ikelos", "description": {"en": "Ikelos's hospice for broken and damaged ebuilds."}, "homepage": "https://cgit.gentoo.org/dev/ikelos.git/", "owner": [{"type": "person", "email": "ikelos@gentoo.org", "name": "Mike Auty"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/ikelos.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/ikelos.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/ikelos.git"}], "feed": ["https://cgit.gentoo.org/dev/ikelos.git/atom/"], "x-state": "BAD_CACHE", "x-timestamp": "2021-02-10 12:50:41 +0000\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 100}, "imaging": {"quality": "experimental", "status": "unofficial", "name": "imaging", "description": {"en": "Gentoo overlay for image processing and visualization"}, "homepage": "https://github.com/gerddie/gentoo-imaging", "owner": [{"type": "person", "email": "gw.fossdev@gmail.com"}], "source": [{"type": "git", "uri": "https://github.com/gerddie/gentoo-imaging.git"}], "x-state": "BAD_CACHE", "x-timestamp": "2020-10-24 10:31:27 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 35}, "interactive-fiction": {"quality": "experimental", "status": "unofficial", "name": "interactive-fiction", "description": {"en": "Packages for players and authors of interactive\n fiction"}, "owner": [{"type": "person", "email": "levertond@googlemail.com"}], "source": [{"type": "git", "uri": "git://repo.or.cz/gentoo-interactive-fiction.git"}], "feed": ["http://repo.or.cz/w/gentoo-interactive-fiction.git?a=rss"], "x-state": "BAD_CACHE", "x-timestamp": "2020-02-22 15:48:44 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 23}, "ixit": {"quality": "experimental", "status": "unofficial", "name": "ixit", "description": {"en": "iXit overlay"}, "homepage": "https://github.com/okias/ixit", "owner": [{"type": "person", "email": "david@ixit.cz", "name": "David Heidelberger"}], "source": [{"type": "git", "uri": "https://github.com/okias/ixit.git"}, {"type": "git", "uri": "git://github.com/okias/ixit.git"}, {"type": "git", "uri": "git@github.com:okias/ixit.git"}], "feed": ["https://github.com/okias/ixit/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-09-11 15:08:56 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 7}, "jacendi-overlay": {"quality": "experimental", "status": "unofficial", "name": "jacendi-overlay", "description": {"en": "id Software games overlay"}, "homepage": "https://bitbucket.org/jacendi/jacendi-overlay", "owner": [{"type": "person", "email": "jacendi@protonmail.com", "name": "Vladimir Gavrilov"}], "source": [{"type": "git", "uri": "https://bitbucket.org/jacendi/jacendi-overlay"}], "feed": ["https://bitbucket.org/jacendi/jacendi-overlay/atom"], "x-state": "GOOD", "x-timestamp": "2021-02-25 06:34:02 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 11}, "jamesbroadhead": {"quality": "experimental", "status": "unofficial", "name": "jamesbroadhead", "description": {"en": "James Broadhead's personal overlay and pre-sunrise testing ground"}, "homepage": "https://cgit.gentoo.org/user/jamesbroadhead.git/", "owner": [{"type": "person", "email": "jamesbroadhead@gmail.com", "name": "James Broadhead"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/jamesbroadhead.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/jamesbroadhead.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/jamesbroadhead.git"}], "feed": ["https://cgit.gentoo.org/user/jamesbroadhead.git/atom/"], "x-state": "GOOD", "x-timestamp": "2017-02-25 09:15:45 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 3}, "java": {"quality": "experimental", "status": "official", "name": "java", "description": {"en": "Java overlay"}, "homepage": "https://cgit.gentoo.org/proj/java.git/", "owner": [{"type": "project", "email": "java@gentoo.org", "name": "Gentoo Java team"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/java.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/java.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/java.git"}], "feed": ["https://cgit.gentoo.org/proj/java.git/atom/"], "x-state": "BAD_CACHE", "x-timestamp": "2021-02-15 09:36:31 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 137}, "jboro-overlay": {"quality": "experimental", "status": "unofficial", "name": "jboro-overlay", "description": {"en": "personal experimental ebuilds"}, "homepage": "https://github.com/JBoro/portage", "owner": [{"type": "person", "email": "justin.borodinsky@gmail.com", "name": "justin borodinsky"}], "source": [{"type": "git", "uri": "https://github.com/JBoro/portage.git"}], "x-state": "GOOD", "x-timestamp": "2015-08-08 11:25:17 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "jkolo": {"quality": "experimental", "status": "unofficial", "name": "jkolo", "description": {"en": "Jerzy Kolosowski's Gentoo overlay"}, "homepage": "https://git.kolosowscy.pl/jurek/gentoo-overlay", "owner": [{"type": "person", "email": "jerzy@kolosowscy.pl", "name": "Jerzy Kolosowski"}], "source": [{"type": "git", "uri": "https://git.kolosowscy.pl/jurek/gentoo-overlay.git"}], "x-state": "BAD_CACHE", "x-timestamp": "2021-02-01 13:22:42 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 25}, "jm-overlay": {"quality": "experimental", "status": "unofficial", "name": "jm-overlay", "description": {"en": "Personal overlay with more or less random ebuilds"}, "homepage": "https://github.com/Jannis234/jm-overlay", "owner": [{"type": "person", "email": "jannis@ctrl-c.xyz", "name": "Jannis234"}], "source": [{"type": "git", "uri": "https://github.com/Jannis234/jm-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-14 21:27:23 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 933}, "jmbsvicetto": {"quality": "experimental", "status": "official", "name": "jmbsvicetto", "description": {"en": "Jorge Manuel B. S. Vicetto developer overlay"}, "homepage": "https://cgit.gentoo.org/dev/jmbsvicetto.git", "owner": [{"type": "person", "email": "jmbsvicetto@gentoo.org", "name": "Jorge Manuel B. S. Vicetto"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/jmbsvicetto.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/jmbsvicetto.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/jmbsvicetto.git"}], "feed": ["https://cgit.gentoo.org/dev/jmbsvicetto.git/atom/"], "x-state": "BAD_CACHE", "x-timestamp": "2021-01-22 09:20:47 -0100\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 75}, "johnmh": {"quality": "experimental", "status": "unofficial", "name": "johnmh", "description": {"en": "Personal overlay of johnmh"}, "homepage": "https://cgit.gentoo.org/repo/user/johnmh.git/", "owner": [{"type": "person", "email": "johnmh@openblox.org", "name": "John Harris"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/user/johnmh.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/repo/user/johnmh"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/user/johnmh.git"}], "feed": ["https://cgit.gentoo.org/repo/user/johnmh.git/atom/"], "x-state": "GOOD", "x-timestamp": "2016-10-15 23:51:35 -0400\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "johu": {"quality": "experimental", "status": "official", "name": "johu", "description": {"en": "Johannes Huber developer overlay"}, "homepage": "https://cgit.gentoo.org/dev/johu.git", "owner": [{"type": "person", "email": "johu@gentoo.org", "name": "Johannes Huber"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/johu.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/johu.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/johu.git"}], "feed": ["https://cgit.gentoo.org/dev/johu.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-04-18 11:42:18 +0200\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "jorgicio": {"quality": "experimental", "status": "unofficial", "name": "jorgicio", "description": {"en": "Gentoo repository made by Jorgicio."}, "homepage": "https://github.com/jorgicio/jorgicio-gentoo", "owner": [{"type": "person", "email": "jpizarrocallejas@gmail.com", "name": "Jorge Pizarro Callejas"}], "source": [{"type": "git", "uri": "https://github.com/jorgicio/jorgicio-gentoo.git"}, {"type": "git", "uri": "git://github.com/jorgicio/jorgicio-gentoo.git"}, {"type": "git", "uri": "git@github.com:jorgicio/jorgicio-gentoo.git"}], "feed": ["https://github.com/jorgicio/jorgicio-gentoo/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-10 12:32:48 -0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 522}, "jsteward": {"quality": "experimental", "status": "unofficial", "name": "jsteward", "description": {"en": "jsteward's personal overlay"}, "homepage": "https://github.com/KireinaHoro/jsteward", "owner": [{"type": "person", "email": "i@jsteward.moe", "name": "KireinaHoro"}], "source": [{"type": "git", "uri": "https://github.com/KireinaHoro/jsteward.git"}, {"type": "git", "uri": "git://github.com/KireinaHoro/jsteward.git"}, {"type": "git", "uri": "git@github.com:KireinaHoro/jsteward.git"}], "feed": ["https://github.com/KireinaHoro/jsteward/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-27 13:11:37 +0800\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 11}, "junkdrawer": {"quality": "experimental", "status": "unofficial", "name": "junkdrawer", "description": {"en": "Various development tools, libraries, and patches not in Gentoo (yet)"}, "homepage": "https://github.com/doctaweeks/junkdrawer-overlay", "owner": [{"type": "person", "email": "dan@danweeks.net", "name": "Daniel M. Weeks"}], "source": [{"type": "git", "uri": "https://github.com/doctaweeks/junkdrawer-overlay.git"}], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-15 12:14:05 -0400\n", "x-openpgp-signed": "N", "x-masters": ["dlang", "gentoo"], "x-ebuild-count": 348}, "kaa": {"quality": "experimental", "status": "unofficial", "name": "kaa", "description": {"en": "Kaa's experimental overlay"}, "homepage": "http://www.kaa.org.ua", "owner": [{"type": "person", "email": "oleg@kaa.org.ua", "name": "Oleg Kravchenko"}], "source": [{"type": "git", "uri": "https://github.com/Oleh-Kravchenko/kaa-layman.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-13 15:22:42 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 20}, "kde": {"quality": "experimental", "status": "official", "name": "kde", "description": {"en": "Official KDE team's testing overlay."}, "homepage": "https://kde.gentoo.org", "owner": [{"type": "project", "email": "kde@gentoo.org", "name": "KDE Team"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/kde.git"}, {"type": "git", "uri": "https://github.com/gentoo/kde.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/kde.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/kde.git"}], "feed": ["https://cgit.gentoo.org/proj/kde.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-03-13 17:36:41 +0100\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 553}, "keepbot-overlay": {"quality": "experimental", "status": "unofficial", "name": "keepbot-overlay", "description": {"en": "keepbot's personal ebuild repository"}, "homepage": "https://github.com/d-k-ivanov/gentoo-overlay.git", "owner": [{"type": "person", "email": "d.k.ivanov@live.com", "name": "Dmitry Ivanov"}], "source": [{"type": "git", "uri": "https://github.com/d-k-ivanov/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/d-k-ivanov/gentoo-overlay.git"}], "feed": ["https://github.com/d-k-ivanov/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-06 01:48:27 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "khoverlay": {"quality": "experimental", "status": "unofficial", "name": "khoverlay", "description": {"en": "Khumba's overlay, mainly Haskell packages"}, "homepage": "https://gitlab.com/khumba/khoverlay", "owner": [{"type": "person", "email": "bog@khumba.net", "name": "Bryan Gardiner"}], "source": [{"type": "git", "uri": "https://gitlab.com/khumba/khoverlay.git"}, {"type": "git", "uri": "git+ssh://git@gitlab.com/khumba/khoverlay.git"}], "feed": ["https://gitlab.com/khumba/khoverlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-03 18:26:47 -0800\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 98}, "klondike": {"quality": "experimental", "status": "unofficial", "name": "klondike", "description": {"en": "Ebuilds made and modified by klondike, mainly sound and virtualization"}, "homepage": "https://cgit.gentoo.org/user/klondike.git/", "owner": [{"type": "person", "email": "klondike@gentoo.org", "name": "Francisco Blas Izquierdo Riera"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/klondike.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/klondike.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/klondike.git"}], "feed": ["https://cgit.gentoo.org/user/klondike.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-03-01 00:06:53 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 16}, "konsolebox": {"quality": "experimental", "status": "unofficial", "name": "konsolebox", "description": {"en": "konsolebox's overlay"}, "homepage": "https://github.com/konsolebox/overlay", "owner": [{"type": "person", "email": "konsolebox@gmail.com", "name": "konsolebox"}], "source": [{"type": "git", "uri": "https://github.com/konsolebox/overlay.git"}], "feed": ["https://github.com/konsolebox/overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-14 05:43:12 +0800\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 39}, "kripton-overlay": {"quality": "experimental", "status": "unofficial", "name": "kripton-overlay", "description": {"en": "Gentoo portage overlay with packages needed or developed by kripton"}, "homepage": "https://github.com/kripton/kripton-overlay", "owner": [{"type": "person", "email": "kripton@kripserver.net", "name": "Jannis Achstetter"}], "source": [{"type": "git", "uri": "https://github.com/kripton/kripton-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/kripton/kripton-overlay.git"}], "feed": ["https://github.com/kripton/kripton-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-12 21:22:03 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 17}, "kske": {"quality": "experimental", "status": "unofficial", "name": "kske", "description": {"en": "Kai S. K. Engelbart's personal overlay"}, "homepage": "https://git.kske.dev/kske/gentoo-overlay", "owner": [{"type": "person", "email": "kai@kske.dev", "name": "Kai S. K. Engelbart"}], "source": [{"type": "git", "uri": "https://git.kske.dev/kske/gentoo-overlay.git"}, {"type": "git", "uri": "ssh://git@git.kske.dev:420/kske/gentoo-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-13 10:07:04 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "lanodanOverlay": {"quality": "experimental", "status": "unofficial", "name": "lanodanOverlay", "description": {"en": "Additionnal goals; experiments, necromancy, portability, diversity, \u2026", "fr": "Buts additionnels; Exp\u00e9rimentations, n\u00e9cromancie, portabilit\u00e9e, diversit\u00e9e, \u2026"}, "homepage": "https://hacktivis.me/git/overlay", "owner": [{"type": "person", "email": "contact@hacktivis.me", "name": "Haelwenn (lanodan) Monnier"}], "source": [{"type": "git", "uri": "https://hacktivis.me/git/overlay.git"}, {"type": "git", "uri": "https://gitlab.com/lanodan/overlay.git"}, {"type": "git", "uri": "git://hacktivis.me/git/overlay.git"}, {"type": "git", "uri": "git://gitlab.com/lanodan/overlay.git"}], "feed": ["https://hacktivis.me/git/overlay/atom.xml"], "x-state": "GOOD", "x-timestamp": "2021-03-16 15:39:12 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 232}, "laurentb": {"quality": "experimental", "status": "unofficial", "name": "laurentb", "description": {"en": "Various packages"}, "homepage": "https://github.com/laurentb/gentoo-overlay", "owner": [{"type": "person", "email": "laurent@bachelier.name", "name": "Laurent Bachelier"}], "source": [{"type": "git", "uri": "git://github.com/laurentb/gentoo-overlay.git"}, {"type": "git", "uri": "https://github.com/laurentb/gentoo-overlay.git"}], "feed": ["https://github.com/feeds/laurentb/commits/gentoo-overlay/master"], "x-state": "BAD_CACHE", "x-timestamp": "2020-03-27 20:38:31 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 49}, "leechcraft": {"quality": "experimental", "status": "unofficial", "name": "leechcraft", "description": {"en": "Overlay with LeechCraft ebuilds"}, "homepage": "https://github.com/0xd34df00d/leechcraft-overlay", "owner": [{"type": "person", "email": "0xd34df00d@gmail.com", "name": "Georg Rudoy"}], "source": [{"type": "git", "uri": "https://github.com/0xd34df00d/leechcraft-overlay.git"}, {"type": "git", "uri": "git://github.com/0xd34df00d/leechcraft-overlay.git"}], "feed": ["https://github.com/0xd34df00d/leechcraft-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-28 12:06:16 -0600\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 89}, "leio": {"quality": "experimental", "status": "official", "name": "leio", "description": {"en": "Mart Raudsepp developer overlay"}, "homepage": "https://cgit.gentoo.org/dev/leio.git", "owner": [{"type": "person", "email": "leio@gentoo.org", "name": "Mart Raudsepp"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/leio.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/leio.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/leio.git"}], "feed": ["https://cgit.gentoo.org/dev/leio.git/atom/"], "x-state": "BAD_CACHE", "x-timestamp": "2021-01-30 22:07:20 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 8}, "levenkov": {"quality": "experimental", "status": "unofficial", "name": "levenkov", "description": {"en": "levenkov personal overlay"}, "homepage": "https://cgit.gentoo.org/user/levenkov.git", "owner": [{"type": "person", "email": "artem@levenkov.org", "name": "Artem Levenkov"}], "source": [{"type": "git", "uri": "git://anongit.gentoo.org/user/levenkov.git"}, {"type": "git", "uri": "http://cgit.gentooexperimental.org/user/levenkov.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/levenkov.git"}], "x-state": "BAD_CACHE", "x-timestamp": "2015-02-20 13:13:52 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "librepilot": {"quality": "experimental", "status": "unofficial", "name": "librepilot", "description": {"en": "Librepilot flight control software overlay"}, "homepage": "https://github.com/paul-jewell/librepilot-overlay", "owner": [{"type": "person", "email": "paul@teulu.org", "name": "Paul Jewell"}], "source": [{"type": "git", "uri": "https://github.com/paul-jewell/librepilot-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/paul-jewell/librepilot-overlay.git"}], "feed": ["https://github.com/paul-jewell/librepilot-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-01-22 17:16:47 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "libressl": {"quality": "experimental", "status": "official", "name": "libressl", "description": {"en": "LibreSSL ebuilds testing repository"}, "homepage": "https://wiki.gentoo.org/wiki/Project:LibreSSL", "owner": [{"type": "project", "email": "libressl@gentoo.org"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/proj/libressl.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/proj/libressl.git"}], "feed": ["https://cgit.gentoo.org/repo/proj/libressl.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-02-03 20:12:55 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 87}, "liftm": {"quality": "experimental", "status": "unofficial", "name": "liftm", "description": {"en": "Personal Overlay"}, "owner": [{"type": "person", "email": "gentoobug@liftm.de", "name": "Julius Michaelis"}], "source": [{"type": "git", "uri": "https://github.com/jcaesar/liftm-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/jcaesar/liftm-overlay.git"}], "feed": ["https://github.com/jcaesar/liftm-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-14 18:38:40 +0900\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 18}, "linux-be": {"quality": "experimental", "status": "unofficial", "name": "linux-be", "description": {"en": "Port of Boot Environments for GNU/Linux"}, "homepage": "https://gitlab.com/linux-be", "owner": [{"type": "person", "email": "vitaut.bayaryn@gmail.com", "name": "Witaut Bajaryn"}, {"type": "person", "email": "a.mistewicz@gmail.com", "name": "Aleksander Mistewicz"}], "source": [{"type": "git", "uri": "https://gitlab.com/linux-be/overlay.git"}, {"type": "git", "uri": "git+ssh://git@gitlab.com/linux-be/overlay.git"}], "feed": ["https://gitlab.com/linux-be/overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-01-12 19:09:26 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 8}, "linuxunderground-overlay": {"quality": "experimental", "status": "unofficial", "name": "linuxunderground-overlay", "description": {"en": "experimental ebuilds from linuxunderground.be"}, "homepage": "https://github.com/linuxunderground/gentoo.overlay", "owner": [{"type": "person", "email": "vincent.hardy.be@gmail.com", "name": "linuxunderground"}], "source": [{"type": "git", "uri": "git://github.com/linuxunderground/gentoo.overlay.git"}, {"type": "git", "uri": "https://github.com/linuxunderground/gentoo.overlay.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-11 21:41:44 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 155}, "linxon": {"quality": "experimental", "status": "unofficial", "name": "linxon", "description": {"en": "linxon personal overlay"}, "homepage": "https://github.com/linxon/gentoo-overlay", "owner": [{"type": "person", "email": "email@linxon.ru", "name": "linxon"}], "source": [{"type": "git", "uri": "https://github.com/linxon/gentoo-overlay.git"}], "feed": ["https://github.com/linxon/gentoo-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2020-09-24 16:43:15 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 198}, "lisp": {"quality": "experimental", "status": "official", "name": "lisp", "description": {"en": "Common Lisp/Scheme development, recruitment and live overlay.\n Support and feedback in `#gentoo-lisp' and via\n `gentoo-lisp@lists.gentoo.org'."}, "homepage": "https://cgit.gentoo.org/proj/lisp.git", "owner": [{"type": "project", "email": "lisp@gentoo.org"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/lisp.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/lisp.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/lisp.git"}], "feed": ["https://cgit.gentoo.org/proj/lisp.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-12-21 13:59:34 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 381}, "lmiphay": {"quality": "experimental", "status": "unofficial", "name": "lmiphay", "description": {"en": "Personal overlay of Paul Healy"}, "homepage": "https://cgit.gentoo.org/user/lmiphay.git/", "owner": [{"type": "person", "email": "lmiphay@gmail.com", "name": "Paul Healy"}], "source": [{"type": "git", "uri": "git://anongit.gentoo.org/user/lmiphay.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-16 16:46:49 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 234}, "lto-overlay": {"quality": "experimental", "status": "unofficial", "name": "lto-overlay", "description": {"en": "A Portage configuration for O3, Graphite, and LTO system-wide"}, "homepage": "https://github.com/InBetweenNames/gentooLTO", "owner": [{"type": "person", "email": "lookatyouhacker@gmail.com", "name": "Shane Peelar"}], "source": [{"type": "git", "uri": "https://github.com/InBetweenNames/gentooLTO.git"}, {"type": "git", "uri": "git+ssh://git@github.com:InBetweenNames/gentooLTO.git"}], "feed": ["https://github.com/InBetweenNames/gentooLTO/commits/master"], "x-state": "GOOD", "x-timestamp": "2021-02-27 16:16:27 -0500\n", "x-openpgp-signed": "E", "x-masters": ["gentoo", "mv"], "x-ebuild-count": 13}, "luke-jr": {"quality": "experimental", "status": "unofficial", "name": "luke-jr", "description": {"en": "Misc ebuilds by Luke-Jr"}, "homepage": "http://luke.dashjr.org", "owner": [{"type": "person", "email": "luke-jr+gentoobugs@utopios.org"}], "source": [{"type": "git", "uri": "https://scm.dashjr.org/scmroot/git/portage-overlays/luke-jr"}], "x-state": "GOOD", "x-timestamp": "2021-03-14 21:00:23 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 167}, "luxifer": {"quality": "experimental", "status": "unofficial", "name": "luxifer", "description": {"en": "Personal Overlay, contains stoken ebuilds"}, "homepage": "https://github.com/luxifr/olgentoo", "owner": [{"type": "person", "email": "dhertel@gmail.com", "name": "Dominik Keil"}], "source": [{"type": "git", "uri": "https://github.com/luxifr/olgentoo.git"}], "feed": ["https://github.com/luxifr/olgentoo/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2016-04-04 07:38:43 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "lxde-gtk3": {"quality": "experimental", "status": "unofficial", "name": "lxde-gtk3", "description": {"en": "lxde-gtk3 overlay"}, "homepage": "https://github.com/rilian-la-te/lxde-gtk3-overlay", "owner": [{"type": "person", "email": "ria.freelander@gmail.com", "name": "Konstantin"}], "source": [{"type": "git", "uri": "https://github.com/rilian-la-te/lxde-gtk3-overlay.git"}, {"type": "git", "uri": "git://github.com/rilian-la-te/lxde-gtk3-overlay.git"}, {"type": "git", "uri": "git@github.com:rilian-la-te/lxde-gtk3-overlay.git"}], "feed": ["https://github.com/rilian-la-te/lxde-gtk3-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2020-02-12 16:03:52 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 18}, "maekke": {"quality": "experimental", "status": "official", "name": "maekke", "description": {"en": "Markus Meier developer overlay"}, "homepage": "https://cgit.gentoo.org/dev/maekke.git", "owner": [{"type": "person", "email": "maekke@gentoo.org", "name": "Markus Meier"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/maekke.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/maekke.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/maekke.git"}], "feed": ["https://cgit.gentoo.org/dev/maekke.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-02-07 06:49:16 +0100\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 20}, "mate-de-gentoo": {"quality": "experimental", "status": "unofficial", "name": "mate-de-gentoo", "description": {"en": "Updated ebuilds for mate-desktop environment"}, "homepage": "https://github.com/oz123/mate-de-gentoo", "owner": [{"type": "person", "email": "oz.tiram@gmail.com", "name": "OzTiram"}], "source": [{"type": "git", "uri": "https://github.com/oz123/mate-de-gentoo.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-15 22:17:12 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 114}, "matrix": {"quality": "experimental", "status": "official", "name": "matrix", "description": {"en": "Overlay containing clients, servers and services for the Matrix protocol", "nl": "Overlay met clients, servers en services voor het Matrix protocol"}, "homepage": "https://github.com/gentoo/matrix", "owner": [{"type": "person", "email": "steils@gentoo.org", "name": "Stefan Strogin"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/proj/matrix.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/proj/matrix.git"}], "feed": ["https://cgit.gentoo.org/repo/proj/matrix.git/atom/"], "x-state": "BAD_CACHE", "x-timestamp": "2020-10-15 18:52:27 +0300\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 17}, "megacoffee": {"quality": "experimental", "status": "unofficial", "name": "megacoffee", "description": {"en": "Mixed ebuilds from various sources: self-written missing ebuilds, more current ebuilds, ebuilds that just needed a slight update from official portage, ebuilds others posted on Gentoo Bugzilla, ebuilds with added patches, old ebuilds that were removed from official portage etc.", "de": "Verschiedene ebuilds aus verschiedenen Quellen: selbsterstellte ebuilds, ebuilds mit geringf\u00fcgigen \u00c4nderungen, gegen\u00fcber dem aktuellen Baum, ebuilds aus Gentoos Bugzilla, ebuilds mit erweiterten patches, alte ebuilds die nicht mehr im offiziellen Baum existieren, etc."}, "homepage": "http://gentoo-overlay.megacoffee.net", "owner": [{"type": "person", "email": "gentoo-overlay@megacoffee.net", "name": "MegaCoffee"}], "source": [{"type": "git", "uri": "https://gitlab.megacoffee.net/gentoo-overlay/megacoffee-overlay.git"}], "feed": ["https://gitlab.megacoffee.net/gentoo-overlay/megacoffee-overlay/-/commits/master?format=atom"], "x-state": "GOOD", "x-timestamp": "2021-02-28 13:36:36 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo", "go-overlay"], "x-ebuild-count": 34}, "menelkir": {"quality": "experimental", "status": "unofficial", "name": "menelkir", "description": {"en": "Various ebuilds from different sources"}, "homepage": "https://gitlab.com/menelkir/gentoo-overlay", "owner": [{"type": "person", "email": "menelkir@itroll.org", "name": "Daniel Menelkir"}], "source": [{"type": "git", "uri": "https://gitlab.com/menelkir/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@gitlab.com/menelkir/gentoo-overlay.git"}], "feed": ["https://gitlab.com/menelkir/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-15 09:58:13 -0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 483}, "metahax": {"quality": "experimental", "status": "unofficial", "name": "metahax", "description": {"en": "Some ebuilds that didn't seem to exist yet."}, "homepage": "https://github.com/metafarion/metahax", "owner": [{"type": "person", "email": "miles@ctrl-shift.net", "name": "Miles V."}], "source": [{"type": "git", "uri": "https://github.com/metafarion/metahax.git"}], "feed": ["https://github.com/metafarion/metahax/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-01-30 12:45:00 -0600\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 18}, "milos-rs": {"quality": "experimental", "status": "unofficial", "name": "milos-rs", "description": {"en": "A pocket repository for few unavailable packages"}, "homepage": "https://github.com/milos-rs/gentoo-overlay", "owner": [{"type": "person", "email": "milos.om.dj@gmail.com", "name": "Milo\u0161 E. \u0110ur\u0111evi\u0107"}], "source": [{"type": "git", "uri": "https://github.com/milos-rs/gentoo-overlay.git"}], "feed": ["https://github.com/milos-rs/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-09-09 04:50:35 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "miramir": {"quality": "experimental", "status": "unofficial", "name": "miramir", "description": {"en": "Miramir repository"}, "homepage": "https://github.com/miramir/miramir-layman", "owner": [{"type": "person", "email": "gmiramir@gmail.com"}], "source": [{"type": "git", "uri": "https://github.com/miramir/miramir-layman.git"}], "feed": ["https://github.com/miramir/miramir-layman/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-01-29 09:00:44 +0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 42}, "mklich": {"quality": "experimental", "status": "unofficial", "name": "mklich", "description": {"en": "For learning purposes."}, "homepage": "https://cgit.gentoo.org/user/mklich.git/", "owner": [{"type": "person", "email": "michal@michalklich.com", "name": "Micha\u0142 Klich"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/mklich.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/mklich.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/mklich.git"}], "feed": ["https://cgit.gentoo.org/user/mklich.git/atom/"], "x-state": "BAD_CACHE", "x-timestamp": "2015-09-24 07:21:41 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 0}, "mkr-overlay": {"quality": "experimental", "status": "unofficial", "name": "mkr-overlay", "description": {"en": "MalakymR's overlay"}, "homepage": "https://github.com/MalakymR/mkr-overlay", "owner": [{"type": "person", "email": "MalakymR@esdf.uk"}], "source": [{"type": "git", "uri": "https://github.com/MalakymR/mkr-overlay.git"}, {"type": "git", "uri": "git://github.com/MalakymR/mkr-overlay.git"}, {"type": "git", "uri": "git@github.com:MalakymR/mkr-overlay.git"}], "feed": ["https://github.com/MalakymR/mkr-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2019-03-12 11:24:30 +0000\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "moaxcp": {"quality": "experimental", "status": "unofficial", "name": "moaxcp", "description": {"en": "gentoo overlay for packages"}, "homepage": "https://github.com/moaxcp/moaxcp-gentoo-overlay", "owner": [{"type": "person", "email": "moaxcp@gmail.com", "name": "John Mercier"}], "source": [{"type": "git", "uri": "https://github.com/moaxcp/moaxcp-gentoo-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2015-08-11 18:15:55 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 1}, "moexiami": {"quality": "testing", "status": "unofficial", "name": "moexiami", "description": {"en": "Contains updated ebuilds (w/ more feature/control)\n for packages in the Gentoo tree, latest version ebuilds and newpackages\n not yet in the tree. Targeting high-quality for production use."}, "homepage": "https://github.com/Xiami2012/moexiami-ovl-dev", "owner": [{"type": "person", "email": "i@f2light.com", "name": "Xiami"}], "source": [{"type": "git", "uri": "https://github.com/Xiami2012/moexiami-ovl-sync.git"}, {"type": "git", "uri": "git+ssh://git@github.com/Xiami2012/moexiami-ovl-sync.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-01 23:22:17 +0800\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 8}, "moltonel": {"quality": "experimental", "status": "unofficial", "name": "moltonel", "description": {"en": "Vincent de Phily's private overlay"}, "homepage": "https://github.com/vincentdephily/moltonel-ebuilds/", "owner": [{"type": "person", "email": "moltonel@gmail.com", "name": "Vincent de Phily"}], "source": [{"type": "git", "uri": "git://github.com/vincentdephily/moltonel-ebuilds.git"}], "x-state": "GOOD", "x-timestamp": "2020-12-26 18:30:33 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 11}, "monero": {"quality": "experimental", "status": "unofficial", "name": "monero", "description": {"en": "Ebuilds for the Monero cryptocurrency and\n related software."}, "homepage": "https://github.com/gentoo-monero/gentoo-monero", "owner": [{"type": "person", "email": "matt@offtopica.uk", "name": "Matt Smith"}], "source": [{"type": "git", "uri": "https://github.com/gentoo-monero/gentoo-monero.git"}, {"type": "git", "uri": "git+ssh://git@github.com/gentoo-monero/gentoo-monero.git"}], "feed": ["https://github.com/gentoo-monero/gentoo-monero/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-12-19 22:24:23 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 20}, "mozilla": {"quality": "experimental", "status": "official", "name": "mozilla", "description": {"en": "New mozilla development that is not yet in tree"}, "homepage": "https://cgit.gentoo.org/proj/mozilla.git", "owner": [{"type": "project", "email": "mozilla@gentoo.org"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/mozilla.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/mozilla.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/mozilla.git"}], "feed": ["https://cgit.gentoo.org/proj/mozilla.git/atom/"], "x-state": "BAD_CACHE", "x-timestamp": "2020-05-03 19:48:39 +0200\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 6}, "mrhappyhof-gentoo": {"quality": "experimental", "status": "unofficial", "name": "mrhappyhof-gentoo", "description": {"en": "mr_happy_hof's personal Overlay"}, "homepage": "https://github.com/mrhappyhof/mrhappyhof-gentoo", "owner": [{"type": "person", "email": "mrhappyhof@gmail.com", "name": "mr_happy_hof"}], "source": [{"type": "git", "uri": "https://github.com/mrhappyhof/mrhappyhof-gentoo.git"}, {"type": "git", "uri": "git+ssh://git@github.com/mrhappyhof/mrhappyhof-gentoo.git"}], "feed": ["https://github.com/mrhappyhof/mrhappyhof-gentoo/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2020-11-03 10:26:57 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 1}, "mschiff": {"quality": "experimental", "status": "official", "name": "mschiff", "description": {"en": "Developer overlay"}, "homepage": "https://cgit.gentoo.org/dev/mschiff.git/", "owner": [{"type": "person", "email": "mschiff@gentoo.org", "name": "Marc Schiffbauer"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/mschiff.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/mschiff.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/mschiff.git"}], "feed": ["https://cgit.gentoo.org/dev/mschiff.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-09-08 01:02:40 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 9}, "multilib-portage": {"quality": "experimental", "status": "official", "name": "multilib-portage", "description": {"en": "multilib-overlay: emul-linux-x86 must die ;)"}, "homepage": "https://cgit.gentoo.org/proj/multilib-portage.git/", "owner": [{"type": "person", "email": "tommy@gentoo.org", "name": "Thomas Sachau"}], "source": [{"type": "git", "uri": "git://anongit.gentoo.org/proj/multilib-portage.git"}], "x-state": "GOOD", "x-timestamp": "2021-02-14 17:48:50 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 21}, "musl": {"quality": "experimental", "status": "official", "name": "musl", "description": {"en": "musl development overlay"}, "homepage": "https://cgit.gentoo.org/proj/musl.git/", "owner": [{"type": "project", "email": "musl@gentoo.org", "name": "Gentoo musl team"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/musl.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/musl.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/musl.git"}], "feed": ["https://cgit.gentoo.org/proj/musl.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-03-13 21:34:25 +0000\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 131}, "musl-clang": {"quality": "experimental", "status": "unofficial", "name": "musl-clang", "description": {"en": "musl clang/libc++ overlay"}, "homepage": "https://github.com/karlguy/musl-clang/", "owner": [{"type": "person", "email": "bjornpagen@gmail.com", "name": "Bjorn Pagen"}], "source": [{"type": "git", "uri": "https://github.com/karlguy/musl-clang"}, {"type": "git", "uri": "git://github.com/karlguy/musl-clang"}], "feed": ["https://github.com/karlguy/musl-clang/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2018-03-01 16:56:29 -0500\n", "x-openpgp-signed": "E", "x-masters": ["musl", "gentoo"], "x-ebuild-count": 1}, "mv": {"quality": "experimental", "status": "unofficial", "name": "mv", "description": {"en": "Ebuilds for packages not in the Gentoo tree\n (lack of maintainer or too experimental) and live ebuilds\n or extensions/bugfixes for packages in the tree"}, "homepage": "https://cgit.gentoo.org/user/mv.git", "owner": [{"type": "person", "email": "martin@mvath.de", "name": "Martin V\u00e4th"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/mv.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/mv.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/mv.git"}], "feed": ["https://cgit.gentoo.org/user/mv.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-03-10 19:18:55 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 158}, "mva": {"quality": "experimental", "status": "unofficial", "name": "mva", "description": {"en": "mva's sandbox overlay"}, "homepage": "https://github.com/msva/mva-overlay/", "owner": [{"type": "person", "email": "mva@gentoo.org", "name": "Vadim A. Misbakh-Soloviov"}], "source": [{"type": "git", "uri": "https://github.com/msva/mva-overlay"}, {"type": "git", "uri": "git://github.com/msva/mva-overlay"}], "feed": ["https://github.com/msva/mva-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-16 11:19:25 +0700\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 549}, "myrvolay": {"quality": "experimental", "status": "unofficial", "name": "myrvolay", "description": {"en": "myrvogna's personal Gentoo overlay"}, "homepage": "https://github.com/myrvogna/myrvolay", "owner": [{"type": "person", "email": "octiabrina@myrvogna.net", "name": "Octiabrina Terrien-Puig"}], "source": [{"type": "git", "uri": "https://github.com/myrvogna/myrvolay.git"}, {"type": "git", "uri": "git://github.com/myrvogna/myrvolay.git"}, {"type": "git", "uri": "git@github.com:myrvogna/myrvolay.git"}], "feed": ["https://github.com/myrvogna/myrvolay/commits/main.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-08 18:04:22 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 27}, "mysql": {"quality": "experimental", "status": "official", "name": "mysql", "description": {"en": "Gentoo MySQL overlay"}, "homepage": "https://cgit.gentoo.org/proj/mysql.git/", "owner": [{"type": "project", "email": "mysql-bugs@gentoo.org", "name": "MySQL Team"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/mysql.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/mysql.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/mysql.git"}], "feed": ["https://cgit.gentoo.org/proj/mysql.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-02-12 01:11:50 +0100\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 0}, "natinst": {"quality": "experimental", "status": "unofficial", "name": "natinst", "description": {"en": "VISA and National Instruments drivers"}, "homepage": "https://github.com/AndrewAmmerlaan/natinst", "owner": [{"type": "person", "email": "andrewammerlaan@riseup.net", "name": "Andrew Ammerlaan"}], "source": [{"type": "git", "uri": "https://github.com/AndrewAmmerlaan/natinst.git"}, {"type": "git", "uri": "git+ssh://git@github.com/AndrewAmmerlaan/natinst.git"}], "feed": ["https://github.com/AndrewAmmerlaan/natinst/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-18 19:41:13 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 1644}, "nelson-graca": {"quality": "experimental", "status": "unofficial", "name": "nelson-graca", "description": {"en": "Nelson Gra\u00e7a personal Overlay"}, "homepage": "https://github.com/nelsongraca/gentoo-overlay", "owner": [{"type": "person", "email": "graca.nelson@gmail.com", "name": "Nelson Gra\u00e7a"}], "source": [{"type": "git", "uri": "https://github.com/nelsongraca/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/nelsongraca/gentoo-overlay.git"}], "feed": ["https://github.com/nelsongraca/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-25 11:46:45 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 38}, "nest": {"quality": "experimental", "status": "unofficial", "name": "nest", "description": {"en": "Personal Gentoo overlay"}, "homepage": "https://github.com/SpiderX/portage-overlay", "owner": [{"type": "person", "email": "spiderx@spiderx.dp.ua", "name": "Vladimir Pavljuchenkov"}], "source": [{"type": "git", "uri": "https://github.com/SpiderX/portage-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/SpiderX/portage-overlay.git"}], "feed": ["https://github.com/SpiderX/portage-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-14 22:32:19 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 998}, "nico": {"quality": "experimental", "status": "unofficial", "name": "nico", "description": {"en": "various ebuilds"}, "homepage": "https://cgit.gentoo.org/user/nico.git/", "owner": [{"type": "person", "email": "nico@overninethousand.de", "name": "Nico Suhl"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/nico.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/nico.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/nico.git"}], "feed": ["https://cgit.gentoo.org/user/nico.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-02-25 19:06:03 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 0}, "nitratesky": {"quality": "experimental", "status": "unofficial", "name": "nitratesky", "description": {"en": "Personal overlay of Vladimir Timofeenko"}, "homepage": "https://github.com/VTimofeenko/nitratesky", "owner": [{"type": "person", "email": "overlay.maintain@vtimofeenko.com", "name": "Vladimir Timofeenko"}], "source": [{"type": "git", "uri": "https://github.com/VTimofeenko/nitratesky.git"}, {"type": "git", "uri": "git+ssh://git@github.com/VTimofeenko/nitratesky.git"}], "feed": ["https://github.com/VTimofeenko/nitratesky/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-14 21:20:25 -0700\n", "x-openpgp-signed": "E", "x-masters": ["gentoo", "nest"], "x-ebuild-count": 43}, "nix-guix": {"quality": "experimental", "status": "official", "name": "nix-guix", "description": {"en": "Overlay for nix anf guix functional package managers"}, "homepage": "https://github.com/trofi/nix-guix-gentoo", "owner": [{"type": "person", "email": "slyfox@gentoo.org", "name": "Sergei Trofimovich"}], "source": [{"type": "git", "uri": "https://github.com/trofi/nix-guix-gentoo.git"}], "feed": ["https://github.com/trofi/nix-guix-gentoo/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-06 09:14:39 +0000\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 7}, "np-hardass-overlay": {"quality": "experimental", "status": "unofficial", "name": "np-hardass-overlay", "description": {"en": "NP-Hardass's Personal Overlay"}, "homepage": "https://github.com/np-hardass/np-hardass-overlay", "owner": [{"type": "person", "email": "NP-Hardass@gentoo.org", "name": "NP-Hardass"}], "source": [{"type": "git", "uri": "https://github.com/np-hardass/np-hardass-overlay.git"}], "x-state": "BAD_CACHE", "x-timestamp": "2020-12-21 15:12:55 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 34}, "nx": {"quality": "experimental", "status": "official", "name": "nx", "description": {"en": "Overlay for the NX/FreeNX packages for Gentoo."}, "homepage": "https://cgit.gentoo.org/proj/nx.git/", "owner": [{"type": "project", "email": "nx@gentoo.org"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/nx.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/nx.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/nx.git"}], "feed": ["https://cgit.gentoo.org/proj/nx.git/atom/"], "x-state": "GOOD", "x-timestamp": "2018-08-08 21:48:58 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "octopus": {"quality": "experimental", "status": "unofficial", "name": "octopus", "description": {"en": "Own and claimed ebuilds"}, "homepage": "https://github.com/Bfgeshka/octopus", "owner": [{"type": "person", "email": "bfg@derpy.ru", "name": "Bfgeshka"}], "source": [{"type": "git", "uri": "https://github.com/Bfgeshka/octopus.git"}], "feed": ["https://github.com/Bfgeshka/octopus/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-01 03:32:31 +0900\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 16}, "oddlama": {"quality": "experimental", "status": "unofficial", "name": "oddlama", "description": {"en": "oddlama's gentoo overlay"}, "homepage": "https://github.com/oddlama/overlay", "owner": [{"type": "person", "email": "overlay@oddlama.org", "name": "oddlama"}], "source": [{"type": "git", "uri": "https://github.com/oddlama/overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/oddlama/overlay.git"}], "feed": ["https://github.com/oddlama/overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-24 17:02:26 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 6}, "olifre": {"quality": "experimental", "status": "unofficial", "name": "olifre", "description": {"en": "Personal overlay of Oliver Freyermuth."}, "homepage": "https://github.com/olifre/olifre-portage", "owner": [{"type": "person", "email": "o.freyermuth@googlemail.com", "name": "Oliver Freyermuth"}], "source": [{"type": "git", "uri": "https://github.com/olifre/olifre-portage.git"}, {"type": "git", "uri": "git://github.com/olifre/olifre-portage.git"}, {"type": "git", "uri": "git@github.com:olifre/olifre-portage.git"}], "feed": ["https://github.com/olifre/olifre-portage/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-14 21:21:59 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 13}, "openclonk": {"quality": "experimental", "status": "unofficial", "name": "openclonk", "description": {"en": "Overlay for the game OpenClonk"}, "homepage": "http://www.openclonk.org/", "owner": [{"type": "person", "email": "gentoobug@liftm.de", "name": "Julius Michaelis"}], "source": [{"type": "git", "uri": "https://github.com/jcaesar/openclonk-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/jcaesar/openclonk-overlay.git"}], "feed": ["https://github.com/jcaesar/openclonk-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-07-30 23:29:47 +0900\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "openwrt": {"quality": "experimental", "status": "unofficial", "name": "openwrt", "description": {"en": "Overlay for network configuration packages found in OpenWRT"}, "homepage": "https://github.com/pavlix/gentoo-openwrt", "owner": [{"type": "person", "email": "pavlix@pavlix.net", "name": "Pavel \u0160imerda"}], "source": [{"type": "git", "uri": "https://github.com/pavlix/gentoo-openwrt"}], "x-state": "GOOD", "x-timestamp": "2016-09-14 11:46:36 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 8}, "oubliette": {"quality": "experimental", "status": "unofficial", "name": "oubliette", "description": {"en": "personal overlay of forgotten ebuilds"}, "homepage": "https://github.com/nabbi/oubliette-overlay", "owner": [{"type": "person", "email": "nic@boet.cc", "name": "nic"}], "source": [{"type": "git", "uri": "https://github.com/nabbi/oubliette-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/nabbi/oubliette-overlay.git"}], "feed": ["https://github.com/nabbi/oubliette-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-01 11:22:07 -0600\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 56}, "overseerr-overlay": {"quality": "experimental", "status": "unofficial", "name": "overseerr-overlay", "description": {"en": "third party overlay to install overseerr"}, "homepage": "https://github.com/chriscpritchard/overseerr-overlay", "owner": [{"type": "person", "email": "chris@christopherpritchard.co.uk", "name": "Chris Pritchard"}], "source": [{"type": "git", "uri": "https://github.com/chriscpritchard/overseerr-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com:chriscpritchard/overseerr-overlay.git"}], "feed": ["https://github.com/chriscpritchard/overseerr-overlay/commits/main.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-06 12:23:03 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 8}, "palemoon": {"quality": "experimental", "status": "unofficial", "name": "palemoon", "description": {"en": "Unofficial Gentoo overlay for the Pale Moon (http://www.palemoon.org/) web browser."}, "homepage": "https://github.com/deu/palemoon-overlay", "owner": [{"type": "person", "email": "de@uio.re", "name": "deu"}], "source": [{"type": "git", "uri": "https://github.com/deu/palemoon-overlay.git"}, {"type": "git", "uri": "git://github.com/deu/palemoon-overlay.git"}, {"type": "git", "uri": "git@github.com:deu/palemoon-overlay.git"}], "feed": ["https://github.com/deu/palemoon-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-15 19:17:25 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 13}, "panther": {"quality": "experimental", "status": "unofficial", "name": "panther", "description": {"en": "Fun useful packages not found elsewhere"}, "homepage": "https://github.com/orangeturtle739/panther", "owner": [{"type": "person", "email": "swimgiraffe435@gmail.com", "name": "Jacob Glueck"}], "source": [{"type": "git", "uri": "https://github.com/orangeturtle739/panther.git"}, {"type": "git", "uri": "git+ssh://git@github.com/orangeturtle739/panther.git"}], "feed": ["https://github.com/orangeturtle739/panther/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-24 16:53:39 -0500\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 26}, "pdilung": {"quality": "experimental", "status": "unofficial", "name": "pdilung", "description": {"en": "Personal Gentoo overlay of Pavol Dilung"}, "homepage": "https://github.com/pdilung/gentoo-overlay/", "owner": [{"type": "person", "email": "pavol.dilung@gmail.com", "name": "Pavol Dilung"}], "source": [{"type": "git", "uri": "https://github.com/pdilung/gentoo-overlay.git"}, {"type": "git", "uri": "git://github.com/pdilung/gentoo-overlay.git"}, {"type": "git", "uri": "git@github.com:pdilung/gentoo-overlay.git"}], "feed": ["https://github.com/pdilung/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2016-09-25 19:28:59 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 1}, "pentoo": {"quality": "experimental", "status": "official", "name": "pentoo", "description": {"en": "The overlay contains new or updated security tools."}, "homepage": "http://www.pentoo.ch", "owner": [{"type": "person", "email": "zerochaos@gentoo.org"}], "source": [{"type": "git", "uri": "https://github.com/pentoo/pentoo-overlay.git"}, {"type": "git", "uri": "git://github.com/pentoo/pentoo-overlay.git"}, {"type": "git", "uri": "git@github.com:pentoo/pentoo-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-14 22:51:08 +0800\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 1305}, "perl-experimental": {"quality": "experimental", "status": "official", "name": "perl-experimental", "description": {"en": "Experimental ebuilds for Perl packages in Gentoo. Comments and\n bugreports are welcome!"}, "homepage": "https://cgit.gentoo.org/proj/perl-overlay.git/", "owner": [{"type": "project", "email": "perl@gentoo.org", "name": "Perl Team"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/perl-overlay.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/perl-overlay.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/perl-overlay.git"}], "feed": ["https://cgit.gentoo.org/proj/perl-overlay.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-08-26 10:49:03 +1200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 761}, "perl-experimental-snapshots": {"quality": "experimental", "status": "unofficial", "name": "perl-experimental-snapshots", "description": {"en": "Unofficial mirror of overlay \"perl-experimental\" with metadata cache"}, "homepage": "https://github.com/gentoo-perl/perl-experimental-snapshots", "owner": [{"type": "person", "email": "kentnl@gentoo.org", "name": "Kent Fredric"}], "source": [{"type": "git", "uri": "https://github.com/gentoo-perl/perl-experimental-snapshots.git"}, {"type": "git", "uri": "git://github.com/gentoo-perl/perl-experimental-snapshots.git"}], "feed": ["https://github.com/gentoo-perl/perl-experimental-snapshots/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-08-26 11:01:24 +1200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 761}, "petkovich": {"quality": "experimental", "status": "unofficial", "name": "petkovich", "description": {"en": "Personal overlay of Jean-Christophe Petkovich"}, "homepage": "https://github.com/jcpetkovich/overlay-petkovich", "owner": [{"type": "person", "email": "jcpetkovich@gmail.com", "name": "Jean-Christophe Petkovich"}], "source": [{"type": "git", "uri": "https://github.com/jcpetkovich/overlay-petkovich.git"}, {"type": "git", "uri": "git://github.com/jcpetkovich/overlay-petkovich.git"}, {"type": "git", "uri": "git@github.com:jcpetkovich/overlay-petkovich.git"}], "feed": ["https://github.com/jcpetkovich/overlay-petkovich/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-02-13 14:57:26 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 47}, "pf4public": {"quality": "experimental", "status": "unofficial", "name": "pf4public", "description": {"en": "Personal overlay"}, "homepage": "https://github.com/PF4Public/gentoo-overlay", "owner": [{"type": "person", "email": "PF4Public@mail.ru", "name": "PF4Public"}], "source": [{"type": "git", "uri": "https://github.com/PF4Public/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/PF4Public/gentoo-overlay.git"}], "feed": ["https://github.com/PF4Public/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-16 20:42:14 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 78}, "pg_overlay": {"quality": "experimental", "status": "unofficial", "name": "pg_overlay", "description": {"en": "User overlay"}, "homepage": "https://gitlab.com/Perfect_Gentleman/PG_Overlay", "owner": [{"type": "person", "email": "perfect007gentleman@gmail.com", "name": "Perfect Gentleman"}], "source": [{"type": "git", "uri": "https://gitlab.com/Perfect_Gentleman/PG_Overlay.git"}], "feed": ["https://gitlab.com/Perfect_Gentleman/PG_Overlay/-/commits/master?format=atom"], "x-state": "GOOD", "x-timestamp": "2021-03-14 21:42:17 +0700\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 247}, "phackerlay": {"quality": "experimental", "status": "unofficial", "name": "phackerlay", "description": {"en": "Overlay for phackers"}, "homepage": "https://gitlab.phys-el.ru/ustinov/phackerlay", "owner": [{"type": "person", "email": "ustinov@phys-el.ru", "name": "Alexander B. Ustinov"}], "source": [{"type": "git", "uri": "https://gitlab.phys-el.ru/ustinov/phackerlay.git"}], "feed": ["https://gitlab.phys-el.ru/ustinov/phackerlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-13 22:13:15 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 43}, "phoenix591": {"quality": "experimental", "status": "unofficial", "name": "phoenix591", "description": {"en": "My personal overlay with a few random packages"}, "homepage": "https://github.com/Phoenix591/gentoo-overlay", "owner": [{"type": "person", "email": "kcelbert@gmail.com", "name": "Kyle Elbert"}], "source": [{"type": "git", "uri": "https://github.com/Phoenix591/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/Phoenix591/gentoo-overlay.git"}], "feed": ["https://github.com/Phoenix591/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-14 01:12:00 -0600\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 52}, "pholthaus-overlay": {"quality": "experimental", "status": "unofficial", "name": "pholthaus-overlay", "description": {"en": "pholthaus' personal overlay"}, "homepage": "https://github.com/pholthau/pholthaus-overlay", "owner": [{"type": "person", "email": "patrick.holthaus@googlemail.com", "name": "Patrick Holthaus"}], "source": [{"type": "git", "uri": "https://github.com/pholthau/pholthaus-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/pholthau/pholthaus-overlay.git"}], "feed": ["https://github.com//pholthau/pholthaus-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-01-29 14:09:45 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "pica-pica": {"quality": "experimental", "status": "unofficial", "name": "pica-pica", "description": {"en": "Pica Pica ebuilds"}, "homepage": "https://github.com/antonsviridenko/pica-pica-gentoo-overlay", "owner": [{"type": "person", "email": "anton@picapica.im", "name": "Anton Sviridenko"}], "source": [{"type": "git", "uri": "https://github.com/antonsviridenko/pica-pica-gentoo-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2020-02-12 19:28:26 +0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "picarica-overlay": {"quality": "experimental", "status": "unofficial", "name": "picarica-overlay", "description": {"en": "Gentoo overlay for apps that dont exist or are unmaintaned"}, "homepage": "https://gitlab.com/picarica/picarica-overlay", "owner": [{"type": "person", "email": "dohaje@azet.sk", "name": "George Bucek"}], "source": [{"type": "git", "uri": "https://gitlab.com/picarica/picarica-overlay.git"}, {"type": "git", "uri": "git+ssh://git@gitlab.com/picarica/picarica-overlay.git"}], "x-state": "BAD_CACHE", "x-timestamp": "2020-03-21 15:52:44 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 12}, "pigfoot": {"quality": "experimental", "status": "unofficial", "name": "pigfoot", "description": {"en": "Ebuilds for experimental packages and chinese patches"}, "homepage": "https://cgit.gentoo.org/user/pigfoot.git/", "owner": [{"type": "person", "email": "pigfoot@gmail.com", "name": "pigfoot"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/pigfoot.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/pigfoot.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/pigfoot.git"}], "feed": ["https://cgit.gentoo.org/user/pigfoot.git/atom/"], "x-state": "BAD_CACHE", "x-timestamp": "2021-02-25 00:16:12 +0800\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 65}, "piniverlay": {"quality": "experimental", "status": "unofficial", "name": "piniverlay", "description": {"en": "Various packages and patches for developers"}, "homepage": "https://github.com/pinicarus/gentoo-overlay", "owner": [{"type": "person", "email": "pini@tuxfamily.org", "name": "Pierre-Nicolas Clauss"}], "source": [{"type": "git", "uri": "https://github.com/pinicarus/gentoo-overlay.git"}, {"type": "git", "uri": "git://github.com/pinicarus/gentoo-overlay.git"}, {"type": "git", "uri": "git@github.com:pinicarus/gentoo-overlay.git"}], "feed": ["https://github.com/pinicarus/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-12-14 18:44:03 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 3}, "pinkbyte": {"quality": "experimental", "status": "official", "name": "pinkbyte", "description": {"en": "Pinkbyte's developer overlay"}, "homepage": "https://github.com/Pinkbyte/pinkbyte-overlay", "owner": [{"type": "person", "email": "pinkbyte@gentoo.org", "name": "Sergey Popov"}], "source": [{"type": "git", "uri": "https://github.com/Pinkbyte/pinkbyte-overlay.git"}, {"type": "git", "uri": "git://github.com/Pinkbyte/pinkbyte-overlay.git"}], "feed": ["https://github.com/Pinkbyte/pinkbyte-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-01-12 15:50:52 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 27}, "pixlra": {"quality": "experimental", "status": "unofficial", "name": "pixlra", "description": {"en": "Pixlra collaborative overlay"}, "homepage": "https://cgit.gentoo.org/user/carreira.git/", "owner": [{"type": "person", "email": "jfmcarreira@gmail.com", "name": "Joao Carreira"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/carreira.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/carreira.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/carreira.git"}, {"type": "git", "uri": "https://github.com/pixlra/pixlra-gentoo-overlay.git"}], "feed": ["https://cgit.gentoo.org/user/carreira.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-02-25 13:29:50 +0000\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 20}, "pkalin": {"quality": "experimental", "status": "unofficial", "name": "pkalin", "description": {"en": "My Gentoo overlay, somewhat regularly maintained"}, "homepage": "https://github.com/thinrope/pkalin", "owner": [{"type": "person", "email": "kalin@ThinRope.net", "name": "Kalin KOZHUHAROV"}], "source": [{"type": "git", "uri": "https://github.com/thinrope/pkalin.git"}, {"type": "git", "uri": "git+ssh://git@github.com/thinrope/pkalin.git"}], "feed": ["https://github.com/thinrope/pkalin/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-25 00:08:43 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 93}, "plex-overlay": {"quality": "experimental", "status": "unofficial", "name": "plex-overlay", "description": {"en": "Personal overlay of comio containing Plex related ebuilds"}, "homepage": "https://github.com/comio/plex-overlay", "owner": [{"type": "person", "email": "luigi.mantellini@gmail.com", "name": "Luigi Mantellini"}], "source": [{"type": "git", "uri": "https://github.com/comio/plex-overlay.git"}], "feed": ["https://github.com/comio/plex-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-11 07:25:32 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 18}, "poly-c": {"quality": "experimental", "status": "official", "name": "poly-c", "description": {"en": "Polynomial-C's overlay"}, "homepage": "http://www.gentoofan.org/gentoo/", "owner": [{"type": "person", "email": "polynomial-c@gentoo.org", "name": "Lars Wendler"}], "source": [{"type": "rsync", "uri": "rsync://rsync.gentoofan.org/poly-c"}], "x-state": "GOOD", "x-timestamp": "2021-03-08 20:24:05.000000000 +0000\n", "x-masters": ["gentoo"], "x-ebuild-count": 292}, "powerman": {"quality": "experimental", "status": "unofficial", "name": "powerman", "description": {"en": "Overlay of Alex Efros"}, "homepage": "https://github.com/powerman/powerman-overlay", "owner": [{"type": "person", "email": "powerman-asdf@yandex.ru", "name": "Alex Efros"}], "source": [{"type": "git", "uri": "https://github.com/powerman/powerman-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2021-02-18 17:46:00 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 134}, "ppfeufer-gentoo-overlay": {"quality": "experimental", "status": "unofficial", "name": "ppfeufer-gentoo-overlay", "description": {"en": "ppfeufer's personal overlay."}, "homepage": "https://github.com/ppfeufer/gentoo-overlay", "owner": [{"type": "person", "email": "info@ppfeufer.de", "name": "Peter Pfeufer"}], "source": [{"type": "git", "uri": "https://github.com/ppfeufer/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/ppfeufer/gentoo-overlay.git"}], "feed": ["https://github.com/ppfeufer/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-12 15:38:59 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 38}, "pross": {"quality": "experimental", "status": "unofficial", "name": "pross", "description": {"en": "Up to date ck-sources"}, "homepage": "https://github.com/Pross/pross-overlay", "owner": [{"type": "person", "email": "pross@pross.org.uk", "name": "Simon Prosser"}], "source": [{"type": "git", "uri": "https://github.com/Pross/pross-overlay.git"}], "feed": ["https://github.com/Pross/pross-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-05 01:00:12 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "pyfa": {"quality": "experimental", "status": "unofficial", "name": "pyfa", "description": {"en": "Newest versions of Pyfa (Python fitting assistant for EVE Online)"}, "homepage": "https://github.com/ZeroPointEnergy/gentoo-pyfa-overlay", "owner": [{"type": "person", "email": "a.zuber@gmx.ch", "name": "Andreas Zuber"}], "source": [{"type": "git", "uri": "https://github.com/ZeroPointEnergy/gentoo-pyfa-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/ZeroPointEnergy/gentoo-pyfa-overlay.git"}], "feed": ["https://github.com/ZeroPointEnergy/gentoo-pyfa-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-01 08:45:53 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "python": {"quality": "experimental", "status": "official", "name": "python", "description": {"en": "Python project repository"}, "homepage": "https://cgit.gentoo.org/proj/python.git/", "owner": [{"type": "project", "email": "python@gentoo.org", "name": "Gentoo Python project"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/python.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/python.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/python.git"}], "feed": ["https://cgit.gentoo.org/proj/python.git/atom/"], "x-state": "GOOD", "x-timestamp": "2019-12-29 12:56:32 +0100\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "qemu-init": {"quality": "experimental", "status": "official", "name": "qemu-init", "description": {"en": "qemu init script and tools"}, "homepage": "https://cgit.gentoo.org/dev/qiaomuf.git/", "owner": [{"type": "person", "email": "dolsen@gentoo.org", "name": "Brian Dolbec"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/kvm-tools.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/kvm-tools.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/kvm-tools.git"}], "feed": ["https://cgit.gentoo.org/proj/kvm-tools.git/atom/"], "x-state": "GOOD", "x-timestamp": "2016-03-23 10:53:56 -0700\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 1}, "qgp": {"quality": "experimental", "status": "unofficial", "name": "qgp", "description": {"en": "qgp overlay (mostly computing and HEP)"}, "homepage": "https://github.com/qgp/gentoo-qgp", "owner": [{"type": "person", "email": "qgp1024@gmail.com", "name": "Jochen Klein"}], "source": [{"type": "git", "uri": "https://github.com/qgp/gentoo-qgp.git"}, {"type": "git", "uri": "git://github.com/qgp/gentoo-qgp.git"}, {"type": "git", "uri": "git+ssh://git@github.com:qgp/gentoo-qgp.git"}], "feed": ["https://github.com/qgp/gentoo-qgp/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-07 11:14:15 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 10}, "qownnotes-overlay": {"quality": "experimental", "status": "unofficial", "name": "qownnotes-overlay", "description": {"en": "QOwnNotes overlay"}, "homepage": "http://www.qownnotes.org", "owner": [{"type": "person", "email": "patrizio@bekerle.com", "name": "Patrizio Bekerle"}], "source": [{"type": "git", "uri": "https://github.com/qownnotes/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/qownnotes/gentoo-overlay.git"}], "feed": ["https://github.com/qownnotes/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-12 12:20:13 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 556}, "qsx": {"quality": "experimental", "status": "unofficial", "name": "qsx", "description": {"en": "qsx\u2019 ebuilds"}, "homepage": "https://github.com/qsuscs/gentoo-overlay", "owner": [{"type": "person", "email": "qsx@chaotikum.eu", "name": "Thomas Schneider"}], "source": [{"type": "git", "uri": "https://github.com/qsuscs/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/qsuscs/gentoo-overlay.git"}], "feed": ["https://github.com/qsuscs/gentoo-overlay/commits/main.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-01 11:02:27 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 24}, "qt": {"quality": "experimental", "status": "official", "name": "qt", "description": {"en": "Official testing overlay for Qt and related packages, provided\n by Gentoo's Qt team. Contains ebuilds for Qt4 and Qt5 prereleases and live ebuilds,\n plus various (non-KDE) applications and utilities that use Qt."}, "homepage": "https://github.com/gentoo/qt", "owner": [{"type": "project", "email": "qt@gentoo.org", "name": "Qt Team"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/qt.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/qt.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/qt.git"}], "feed": ["https://cgit.gentoo.org/proj/qt.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-03-14 16:35:16 +0100\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 86}, "quarks": {"quality": "experimental", "status": "unofficial", "name": "quarks", "description": {"en": "Quarks's overlay; needful things around Security, Penetration Testing and gaming"}, "homepage": "https://git.zero-downtime.net/quark", "owner": [{"type": "person", "email": "it@startux.de", "name": "Stefan Reimer"}], "source": [{"type": "git", "uri": "https://git.zero-downtime.net/quark/quarks.git"}], "x-state": "GOOD", "x-timestamp": "2021-02-19 15:35:17 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 35}, "qwin-overlay": {"quality": "experimental", "status": "unofficial", "name": "qwin-overlay", "description": {"en": "Gentoo overlay with some patched packages."}, "homepage": "https://github.com/Flex1911/", "owner": [{"type": "person", "email": "dedsa2002@gmail.com"}], "source": [{"type": "git", "uri": "git://github.com/Flex1911/qwin-overlay.git"}], "x-state": "BAD_CACHE", "x-timestamp": "2017-10-21 16:11:32 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "rafaelmartins": {"quality": "experimental", "status": "official", "name": "rafaelmartins", "description": {"en": "Rafael Martins' Gentoo overlay"}, "homepage": "https://github.com/rafaelmartins/gentoo-overlay", "owner": [{"type": "person", "email": "rafaelmartins@gentoo.org", "name": "Rafael G. Martins"}], "source": [{"type": "git", "uri": "https://github.com/rafaelmartins/gentoo-overlay.git"}, {"type": "git", "uri": "git://github.com/rafaelmartins/gentoo-overlay.git"}], "feed": ["https://github.com/rafaelmartins/gentoo-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2015-10-19 20:09:06 -0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 25}, "rage": {"quality": "experimental", "status": "unofficial", "name": "rage", "description": {"en": "rage's personal overlay"}, "homepage": "https://gitlab.com/oxr463/overlay", "owner": [{"type": "person", "email": "ramage.lucas@protonmail.com", "name": "Lucas Ramage"}], "source": [{"type": "git", "uri": "https://gitlab.com/oxr463/overlay.git"}, {"type": "git", "uri": "git+ssh://git@gitlab.com/oxr463/overlay.git"}], "feed": ["https://gitlab.com/oxr463/overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-06-24 07:51:33 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 48}, "raiagent": {"quality": "experimental", "status": "unofficial", "name": "raiagent", "description": {"en": "Well-documented ebuilds en-route to a bandersnatch near you"}, "homepage": "https://github.com/leycec/raiagent", "owner": [{"type": "person", "email": "leycec@gmail.com", "name": "Cecil Curry"}], "source": [{"type": "git", "uri": "https://github.com/leycec/raiagent"}, {"type": "git", "uri": "git://github.com/leycec/raiagent.git"}], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-15 23:14:14 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 105}, "rasdark": {"quality": "experimental", "status": "unofficial", "name": "rasdark", "description": {"en": "rasdark personal overlay"}, "homepage": "https://github.com/rasdark/overlay", "owner": [{"type": "person", "email": "andrew.senik@gmail.com", "name": "Andrey Senik"}], "source": [{"type": "git", "uri": "https://github.com/rasdark/overlay"}, {"type": "git", "uri": "git://github.com/rasdark/overlay.git"}], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-09 20:04:45 +0300\n", "x-openpgp-signed": "N", "x-masters": ["calculate", "gentoo"], "x-ebuild-count": 50}, "raw": {"quality": "experimental", "status": "unofficial", "name": "raw", "description": {"en": "some raw stuff"}, "homepage": "https://github.com/mahatma-kaganovich/raw", "owner": [{"type": "person", "email": "mahatma@eu.by", "name": "Denis Kaganovich (aka Dzianis Kahanovich)"}], "source": [{"type": "git", "uri": "https://github.com/mahatma-kaganovich/raw.git"}], "feed": ["https://github.com/mahatma-kaganovich/raw/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-15 18:42:29 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 56}, "rdnetto-overlay": {"quality": "experimental", "status": "unofficial", "name": "rdnetto-overlay", "description": {"en": "Personal Overlay"}, "homepage": "https://github.com/rdnetto/rdnetto-overlay", "owner": [{"type": "person", "email": "rdnetto@gmail.com", "name": "Reuben D'Netto"}], "source": [{"type": "git", "uri": "https://github.com/rdnetto/rdnetto-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com:rdnetto/rdnetto-overlay.git"}], "feed": ["https://github.com/rdnetto/rdnetto-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-01-04 12:01:09 +1100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 95}, "reagentoo": {"quality": "experimental", "status": "unofficial", "name": "reagentoo", "description": {"en": "reagentoo's overlay"}, "homepage": "https://gitlab.com/reagentoo/gentoo-overlay", "owner": [{"type": "person", "email": "reagentoo@gmail.com"}], "source": [{"type": "git", "uri": "https://gitlab.com/reagentoo/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@gitlab.com/reagentoo/gentoo-overlay.git"}], "feed": ["https://gitlab.com/reagentoo/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-12 01:12:11 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 83}, "ricerlay": {"quality": "experimental", "status": "unofficial", "name": "ricerlay", "description": {"en": "Overlay for ricing enthusiasts"}, "homepage": "https://github.com/azahi/ricerlay", "owner": [{"type": "person", "email": "azahi@teknik.io", "name": "azahi"}], "source": [{"type": "git", "uri": "https://github.com/azahi/ricerlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/azahi/ricerlay.git"}], "feed": ["https://github.com/azahi/ricerlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-15 12:18:24 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 93}, "rich0": {"quality": "experimental", "status": "official", "name": "rich0", "description": {"en": "Rich0's developer overlay"}, "homepage": "https://github.com/rich0/rich0-overlay", "owner": [{"type": "person", "email": "rich0@gentoo.org", "name": "Richard Freeman"}], "source": [{"type": "git", "uri": "git://github.com/rich0/rich0-overlay.git"}], "feed": ["https://github.com/rich0/rich0-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-24 21:06:51 -0500\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 48}, "ring-overlay": {"quality": "experimental", "status": "unofficial", "name": "ring-overlay", "description": {"en": "Ring is free software for universal communication which respects freedoms and privacy of its users."}, "homepage": "https://github.com/stefan-langenmaier/ring-overlay", "owner": [{"type": "person", "email": "stefan.langenmaier+gentoo@gmail.com", "name": "Stefan Langenmaier"}], "source": [{"type": "git", "uri": "https://github.com/stefan-langenmaier/ring-overlay.git"}, {"type": "git", "uri": "git://github.com/stefan-langenmaier/ring-overlay.git"}, {"type": "git", "uri": "git@github.com:stefan-langenmaier/ring-overlay.git"}], "feed": ["https://github.com/stefan-langenmaier/ring-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2020-04-17 10:23:59 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 49}, "rion": {"quality": "experimental", "status": "unofficial", "name": "rion", "description": {"en": "Russian overlay with a some patched and specific\n software"}, "homepage": "https://github.com/rion-overlay", "owner": [{"type": "person", "email": "rion4ik@gmail.com", "name": "Sergey Ilinykh"}], "source": [{"type": "git", "uri": "https://github.com/rion-overlay/rion-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/rion-overlay/rion-overlay.git"}], "feed": ["https://github.com/rion-overlay/rion-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-02-20 14:18:19 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 102}, "riru": {"quality": "experimental", "status": "unofficial", "name": "riru", "description": {"en": "Home overlay for development, patches and live ebuilds", "ru": "\u0414\u043e\u043c\u0430\u0448\u043d\u0438\u0439 \u043e\u0432\u0435\u0440\u043b\u0435\u0439 \u0434\u043b\u044f \u0440\u0430\u0437\u0440\u0430\u0431\u043e\u0442\u043a\u0438, \u043f\u0430\u0442\u0447\u0435\u0439 \u0438 \u043b\u0430\u0439\u0432 \u0435\u0431\u0438\u043b\u0434\u043e\u0432"}, "homepage": "https://github.com/pkulev/riru", "owner": [{"type": "person", "email": "kulyov.pavel@gmail.com", "name": "Pavel Kulyov"}], "source": [{"type": "git", "uri": "https://github.com/pkulev/riru.git"}, {"type": "git", "uri": "git://github.com/pkulev/riru.git"}, {"type": "git", "uri": "git@github.com:pkulev/riru.git"}], "feed": ["https://github.com/pkulev/riru/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-01-11 00:54:42 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 22}, "robert7k": {"quality": "experimental", "status": "unofficial", "name": "robert7k", "description": {"en": "personal overlay of robert7k"}, "homepage": "https://github.com/robert7k/gentoo-overlay", "owner": [{"type": "person", "email": "gentoo.2019@r123.de"}], "source": [{"type": "git", "uri": "https://github.com/robert7k/gentoo-overlay.git"}], "feed": ["https://github.com/robert7k/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-15 22:29:42 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 38}, "robertgzr": {"quality": "experimental", "status": "unofficial", "name": "robertgzr", "description": {"en": "robertgzr's personal overlay."}, "homepage": "https://git.sr.ht/~robertgzr/portage", "owner": [{"type": "person", "email": "robert@gnzler.io", "name": "Robert G\u00fcnzler"}], "source": [{"type": "git", "uri": "https://git.sr.ht/~robertgzr/portage"}, {"type": "git", "uri": "ssh://git@git.sr.ht:~robertgzr/portage"}], "feed": ["https://git.sr.ht/~robertgzr/portage/log/rss.xml"], "x-state": "GOOD", "x-timestamp": "2021-03-12 12:51:42 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 65}, "roslin": {"quality": "experimental", "status": "unofficial", "name": "roslin", "description": {"en": "This is roslin, my small overlay. Enjoy! (:"}, "homepage": "https://gitlab.com/roslin-uberlay/roslin", "owner": [{"type": "person", "email": "szarpaj@grubelek.pl", "name": "Piotr Szymaniak"}, {"type": "person", "email": "mziab@o2.pl", "name": "Micha\u0142 Zi\u0105bkowski"}], "source": [{"type": "git", "uri": "https://gitlab.com/roslin-uberlay/roslin.git"}], "x-state": "GOOD", "x-timestamp": "2021-02-05 09:20:02 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 186}, "rpm": {"quality": "experimental", "status": "unofficial", "name": "rpm", "description": {"en": "Overlay for RPM packagers targeting Fedora, EPEL, CentOS and similar distros"}, "homepage": "https://github.com/pavlix/gentoo-rpm", "owner": [{"type": "person", "email": "pavlix@pavlix.net", "name": "Pavel \u0160imerda"}], "source": [{"type": "git", "uri": "https://github.com/pavlix/gentoo-rpm.git"}], "x-state": "BAD_CACHE", "x-timestamp": "2017-02-16 11:49:24 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 3}, "ruby": {"quality": "experimental", "status": "official", "name": "ruby", "description": {"en": "Experimental ebuilds from the Ruby edge."}, "homepage": "https://cgit.gentoo.org/proj/ruby", "owner": [{"type": "project", "email": "ruby@gentoo.org", "name": "Ruby Team"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/ruby-overlay.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/ruby-overlay.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/ruby-overlay.git"}], "feed": ["https://cgit.gentoo.org/proj/ruby-overlay.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-09-15 09:39:31 +0200\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 7}, "rukruk": {"quality": "experimental", "status": "unofficial", "name": "rukruk", "description": {"en": "some packages not found in other overlays, for issues create ticket in github"}, "homepage": "https://github.com/Atoms/rukruk", "owner": [{"type": "person", "email": "atoms@tups.lv", "name": "Aivars Sterns"}], "source": [{"type": "git", "uri": "https://github.com/Atoms/rukruk.git"}, {"type": "git", "uri": "git://github.com/Atoms/rukruk.git"}, {"type": "git", "uri": "git@github.com:Atoms/rukruk.git"}], "feed": ["https://github.com/Atoms/rukruk/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2019-04-05 10:07:56 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 20}, "rust": {"quality": "experimental", "status": "unofficial", "name": "rust", "description": {"en": "rust modules and tools"}, "homepage": "https://github.com/gentoo/gentoo-rust", "owner": [{"type": "project", "email": "rust@gentoo.org", "name": "Rust Team"}], "source": [{"type": "git", "uri": "https://github.com/gentoo/gentoo-rust.git"}, {"type": "git", "uri": "git://github.com/gentoo/gentoo-rust.git"}, {"type": "git", "uri": "git@github.com:gentoo/gentoo-rust.git"}], "feed": ["https://github.com/gentoo/gentoo-rust/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-09 15:21:38 +0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 55}, "ryans": {"quality": "experimental", "status": "unofficial", "name": "ryans", "description": {"en": "Personal ebuild repository."}, "homepage": "https://github.com/bekcpear/ryans-repos", "owner": [{"type": "person", "email": "i@bitbili.net", "name": "Ryan Qian"}], "source": [{"type": "git", "uri": "https://github.com/bekcpear/ryans-repos.git"}, {"type": "git", "uri": "git@github.com:bekcpear/ryans-repos.git"}], "feed": ["https://github.com/bekcpear/ryans-repos/commits/main.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-08 02:20:09 +0800\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "sabayon": {"quality": "experimental", "status": "unofficial", "name": "sabayon", "description": {"en": "Sabayon ebuilds that could be upstreamed to\n Gentoo (or just being useful for Gentoo users as well):\n hot fixes, ebuild updates, etc.\n For Sabayon-only ebuilds, please use the sabayon-distro overlay.\n Bugs to http://bugs.sabayon.org"}, "homepage": "http://sabayon.org", "owner": [{"type": "person", "email": "joost.ruis@sabayonlinux.org"}], "source": [{"type": "git", "uri": "git://github.com/Sabayon/for-gentoo.git"}], "feed": ["https://github.com/feeds/Sabayon/commits/for-gentoo/master"], "x-state": "BAD_CACHE", "x-timestamp": "2021-02-19 23:00:39 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 150}, "sabayon-distro": {"quality": "experimental", "status": "unofficial", "name": "sabayon-distro", "description": {"en": "Sabayon related ebuilds such as artwork, kernel binaries,\n split packages, etc.\n Bugs to http://bugs.sabayon.org"}, "homepage": "http://sabayon.org", "owner": [{"type": "person", "email": "joost.ruis@sabayonlinux.org"}], "source": [{"type": "git", "uri": "git://github.com/Sabayon/sabayon-distro.git"}], "feed": ["https://github.com/feeds/Sabayon/commits/sabayon-distro/master"], "x-state": "BAD_CACHE", "x-timestamp": "2021-02-20 18:36:17 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 535}, "sage-on-gentoo": {"quality": "experimental", "status": "unofficial", "name": "sage-on-gentoo", "description": {"en": "Split ebuilds for the Sage computer algebra system"}, "homepage": "https://github.com/cschwan/sage-on-gentoo", "owner": [{"type": "person", "email": "frp.bissey@gmail.com", "name": "Francois Bissey"}], "source": [{"type": "git", "uri": "git://github.com/cschwan/sage-on-gentoo.git"}, {"type": "git", "uri": "https://github.com/cschwan/sage-on-gentoo.git"}], "feed": ["https://github.com/feeds/cschwan/commits/sage-on-gentoo/master"], "x-state": "GOOD", "x-timestamp": "2021-03-15 13:24:23 +1300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 258}, "salfter": {"quality": "experimental", "status": "unofficial", "name": "salfter", "description": {"en": "Scott Alfter's ebuilds"}, "homepage": "https://gitlab.com/salfter/portage", "owner": [{"type": "person", "email": "scott@alfter.us", "name": "Scott Alfter"}], "source": [{"type": "git", "uri": "https://gitlab.com/salfter/portage.git"}], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-15 17:10:34 -0700\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 154}, "sam_c": {"quality": "experimental", "status": "unofficial", "name": "sam_c", "description": {"en": "sam_c's personal overlay"}, "homepage": "https://github.com/thesamesam/overlay", "owner": [{"type": "person", "email": "sam@cmpct.info", "name": "Sam James"}], "source": [{"type": "git", "uri": "https://github.com/thesamesam/overlay"}, {"type": "git", "uri": "git+ssh://git@github.com/thesamesam/overlay.git"}], "feed": ["https://github.com/thesamesam/overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-27 15:32:48 +0000\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 8}, "sarnex-overlay": {"quality": "experimental", "status": "unofficial", "name": "sarnex-overlay", "description": {"en": "Sarnex's personal overlay"}, "homepage": "https://github.com/sarnex/sarnex-overlay.git", "owner": [{"type": "person", "email": "commendsarnex@gmail.com", "name": "Nick Sarnie"}], "source": [{"type": "git", "uri": "https://github.com/sarnex/sarnex-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/sarnex/sarnex-overlay.git"}], "feed": ["https://github.com/sarnex/sarnex-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2017-10-01 00:04:35 -0400\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "sattvik": {"quality": "experimental", "status": "unofficial", "name": "sattvik", "description": {"en": "sattvik's overlay with personalized bug fixes and tweaks"}, "homepage": "https://cgit.gentoo.org/user/sattvik.git/", "owner": [{"type": "person", "email": "gentoo@sattvik.com", "name": "Daniel Solano Gomez"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/sattvik.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/sattvik.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/sattvik.git"}], "feed": ["https://cgit.gentoo.org/user/sattvik.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-03-04 18:47:35 -0600\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 32}, "science": {"quality": "experimental", "status": "official", "name": "science", "description": {"en": "The Gentoo Science Overlay is intended as a place to work\n outside of the main portage tree on experimental ebuilds. Our aim is to\n increase the rate of development of scientific packages for Gentoo, but\n ebuilds in this repository are by their very nature more experimental. If\n you wish to use them you should be willing to help test and report\n bugs. For contribution read https://wiki.gentoo.org/wiki/Project:Science/Contributing\n "}, "homepage": "https://wiki.gentoo.org/wiki/Project:Science", "owner": [{"type": "project", "email": "sci@gentoo.org", "name": "sci"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/sci.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/sci.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/sci.git"}, {"type": "git", "uri": "https://github.com/gentoo-science/sci.git"}, {"type": "git", "uri": "git://github.com/gentoo-science/sci.git"}, {"type": "git", "uri": "git@github.com:gentoo-science/sci.git"}], "feed": ["https://cgit.gentoo.org/proj/sci.git/atom/", "https://github.com/gentoo-science/sci/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-16 17:46:36 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 727}, "scrill": {"quality": "experimental", "status": "unofficial", "name": "scrill", "description": {"en": "Some admin tools"}, "homepage": "https://github.com/scrill/scrill-overlay", "owner": [{"type": "person", "email": "sergey.zhuga@gmail.com", "name": "Sergey Zhuga"}], "source": [{"type": "git", "uri": "git://github.com/scrill/scrill-overlay.git"}], "feed": ["https://github.com/scrill/scrill-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-06-26 15:18:11 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 25}, "seadep": {"quality": "experimental", "status": "unofficial", "name": "seadep", "description": {"en": "just a few ebuilds, I couldn't find elsewhere"}, "homepage": "https://github.com/Keepco/gentoo-overlay-seadep", "owner": [{"type": "person", "email": "Rasmus.thomsen@live.de", "name": "Rasmus Thomsen"}], "source": [{"type": "git", "uri": "https://github.com/Keepco/gentoo-overlay-seadep.git"}, {"type": "git", "uri": "git://github.com/Keepco/gentoo-overlay-seadep.git"}, {"type": "git", "uri": "git@github.com:Keepco/gentoo-overlay-seadep.git"}], "feed": ["https://github.com/Keepco/gentoo-overlay-seadep/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2017-11-25 19:15:52 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "seden": {"quality": "experimental", "status": "unofficial", "name": "seden", "description": {"en": "Experimental ebuilds that are still unmaintained"}, "homepage": "https://cgit.gentoo.org/user/seden.git/", "owner": [{"type": "person", "email": "yamakuzure@gmx.net", "name": "Sven Eden"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/seden.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/seden.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/seden.git"}], "feed": ["https://cgit.gentoo.org/user/seden.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-03-12 08:22:49 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 29}, "setkeh": {"quality": "experimental", "status": "unofficial", "name": "setkeh", "description": {"en": "setkeh maintained ebuilds"}, "homepage": "https://github.com/setkeh/Portage-Overlay", "owner": [{"type": "person", "email": "setkeh@gmail.com", "name": "James (setkeh) Griffis"}], "source": [{"type": "git", "uri": "https://github.com/setkeh/Portage-Overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com:setkeh/Portage-Overlay.git"}], "feed": ["https://github.com/setkeh/Portage-Overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-05-19 14:57:04 +1000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "sevcsik": {"quality": "experimental", "status": "unofficial", "name": "sevcsik", "description": {"en": "Mainly cryptocurrency/blockchain related ebuilds"}, "homepage": "https://github.com/sevcsik/overlay", "owner": [{"type": "person", "email": "sevcsik@sevdev.hu", "name": "Andras Sevcsik"}], "source": [{"type": "git", "uri": "https://github.com/sevcsik/overlay.git"}, {"type": "git", "uri": "git://github.com/sevcsik/overlay.git"}, {"type": "git", "uri": "git@github.com:sevcsik/overlay.git"}], "feed": ["https://github.com/sevcsik/overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2017-08-29 00:43:36 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 8}, "sft": {"quality": "experimental", "status": "unofficial", "name": "sft", "description": {"en": "SFT Technologies gentoo overlay"}, "homepage": "https://github.com/SFTtech/gentoo-overlay", "owner": [{"type": "person", "email": "jj@stusta.net", "name": "Jonas Jelten"}], "source": [{"type": "git", "uri": "https://github.com/SFTtech/gentoo-overlay.git"}], "feed": ["https://github.com/SFTtech/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-15 23:33:30 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 24}, "sgs": {"quality": "experimental", "status": "unofficial", "name": "sgs", "description": {"en": "Simeon Simeonov's personal Gentoo overlay"}, "homepage": "https://github.com/blackm0re/sgs-overlay", "owner": [{"type": "person", "email": "sgs@pichove.org", "name": "Simeon Simeonov"}], "source": [{"type": "git", "uri": "https://github.com/blackm0re/sgs-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com:blackm0re/sgs-overlay.git"}], "feed": ["https://github.com/blackm0re/sgs-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-12-29 13:56:15 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "shnurise": {"quality": "experimental", "status": "unofficial", "name": "shnurise", "description": {"en": "packages for mono environment and other", "ru": "\u043f\u0430\u043a\u0435\u0442\u044b \u0434\u043b\u044f \u043c\u043e\u043d\u043e \u0438 \u0440\u0430\u0437\u043d\u043e\u0435 \u043f\u0440\u043e\u0447\u0435\u0435"}, "homepage": "https://github.com/ArsenShnurkov/shnurise", "owner": [{"type": "person", "email": "Arsen.Shnurkov@gmail.com", "name": "Arsen Shnurkov"}], "source": [{"type": "git", "uri": "https://github.com/ArsenShnurkov/shnurise.git"}, {"type": "git", "uri": "git://github.com/ArsenShnurkov/shnurise.git"}, {"type": "git", "uri": "git@github.com:ArsenShnurkov/shnurise.git"}], "feed": ["https://github.com/ArsenShnurkov/shnurise/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-02-07 13:09:42 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 40}, "sihnon": {"quality": "experimental", "status": "unofficial", "name": "sihnon", "description": {"en": "optiz0r's sihnon overlay"}, "homepage": "https://github.com/optiz0r/gentoo-overlay", "owner": [{"type": "person", "email": "optiz0r@gmail.com", "name": "optiz0r"}], "source": [{"type": "git", "uri": "https://github.com/optiz0r/gentoo-overlay.git"}, {"type": "git", "uri": "git://github.com/optiz0r/gentoo-overlay.git"}, {"type": "git", "uri": "git@github.com:optiz0r/gentoo-overlay.git"}], "feed": ["https://github.com/optiz0r/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-01-19 17:55:04 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 11}, "simonvanderveldt": {"quality": "experimental", "status": "unofficial", "name": "simonvanderveldt", "description": {"en": "Personal Gentoo overlay focused on music production and engineering applications"}, "homepage": "https://github.com/simonvanderveldt/simonvanderveldt-overlay", "owner": [{"type": "person", "email": "simon.vanderveldt@gmail.com", "name": "Simon van der Veldt"}], "source": [{"type": "git", "uri": "https://github.com/simonvanderveldt/simonvanderveldt-overlay.git"}, {"type": "git", "uri": "git://github.com/simonvanderveldt/simonvanderveldt-overlay.git"}, {"type": "git", "uri": "git@github.com:simonvanderveldt/simonvanderveldt-overlay.git"}], "feed": ["https://github.com/simonvanderveldt/simonvanderveldt-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-13 15:36:27 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 8}, "sinustrom": {"quality": "experimental", "status": "unofficial", "name": "sinustrom", "description": {"en": "Sinustrom Gentoo Overlay"}, "homepage": "https://github.com/zpuskas/sinustrom-gentoo-overlay", "owner": [{"type": "person", "email": "zoltan@sinustrom.info", "name": "Zoltan Puskas"}], "source": [{"type": "git", "uri": "https://github.com/zpuskas/sinustrom-gentoo-overlay.git"}, {"type": "git", "uri": "git://github.com/zpuskas/sinustrom-gentoo-overlay.git"}, {"type": "git", "uri": "git@github.com:zpuskas/sinustrom-gentoo-overlay.git"}], "feed": ["https://github.com/zpuskas/sinustrom-gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-13 13:14:52 -0800\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 21}, "sk-overlay": {"quality": "experimental", "status": "unofficial", "name": "sk-overlay", "description": {"en": "The Scriptkitties overlay for additional ebuilds"}, "homepage": "https://github.com/scriptkitties/overlay", "owner": [{"type": "person", "email": "p.spek@tyil.work", "name": "Patrick Spek"}], "source": [{"type": "git", "uri": "https://github.com/scriptkitties/overlay.git"}, {"type": "git", "uri": "git://github.com/scriptkitties/overlay.git"}, {"type": "git", "uri": "git@github.com:scriptkitties/overlay.git"}], "feed": ["https://github.com/scriptkitties/overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-07 20:27:46 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 53}, "slonko": {"quality": "experimental", "status": "unofficial", "name": "slonko", "description": {"en": "Personal portage overlay"}, "homepage": "https://slonko.net/portage", "owner": [{"type": "person", "email": "marcin.deranek@slonko.net", "name": "Marcin Deranek"}], "source": [{"type": "git", "uri": "https://slonko.net/git/portage"}], "feed": ["https://slonko.net/git/portage/atom/"], "x-state": "GOOD", "x-timestamp": "2021-03-12 16:42:03 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 21}, "slyfox": {"quality": "experimental", "status": "official", "name": "slyfox", "description": {"en": "slyfox's ebuild den"}, "homepage": "https://github.com/trofi/slyfox-gentoo", "owner": [{"type": "person", "email": "slyfox@gentoo.org", "name": "Sergei Trofimovich"}], "source": [{"type": "git", "uri": "https://github.com/trofi/slyfox-gentoo"}], "feed": ["https://github.com/trofi/slyfox-gentoo/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-11 10:10:56 +0000\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 18}, "smaeul": {"quality": "experimental", "status": "unofficial", "name": "smaeul", "description": {"en": "Personal overlay, mainly packages patched for musl compatibility"}, "homepage": "https://github.com/smaeul/portage-overlay", "owner": [{"type": "person", "email": "samuel@sholland.org", "name": "Samuel Holland"}], "source": [{"type": "git", "uri": "https://github.com/smaeul/portage-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/smaeul/portage-overlay.git"}], "feed": ["https://github.com/smaeul/portage-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-19 21:29:49 -0600\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 19}, "snapd": {"quality": "experimental", "status": "unofficial", "name": "snapd", "description": {"en": "ebuilds for canaonicals snapd"}, "homepage": "https://github.com/zigford/snapd", "owner": [{"type": "person", "email": "zigford@gmail.com", "name": "Jesse Harris"}], "source": [{"type": "git", "uri": "https://github.com/zigford/snapd.git"}], "feed": ["https://github.com/zigford/snapd/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-31 14:42:39 +1000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "sogo-connector": {"quality": "experimental", "status": "unofficial", "name": "sogo-connector", "description": {"en": "SOGO connector overlay"}, "homepage": "https://cgit.gentoo.org/repo/user/sogo-connector.git/", "owner": [{"type": "person", "email": "gentoo@posteo.de", "name": "Fabian K\u00f6ster"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/user/sogo-connector.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/repo/user/sogo-connector.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/user/sogo-connector.git"}], "feed": ["https://cgit.gentoo.org/repo/user/sogo-connector.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-04-02 11:14:25 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 1}, "soltys": {"quality": "experimental", "status": "unofficial", "name": "soltys", "description": {"en": "tools usefull on CTFs and things that aren't in the portage tristelune"}, "homepage": "https://github.com/soltysek/soltys-overlay", "owner": [{"type": "person", "email": "bgo@soltys.info", "name": "Krzysztof Koro\u015bcik"}], "source": [{"type": "git", "uri": "https://github.com/soltysek/soltys-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/soltysek/soltys-overlay.git"}], "feed": ["https://github.com/soltysek/soltys-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-01-27 19:09:18 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 30}, "sorinp": {"quality": "experimental", "status": "unofficial", "name": "sorinp", "description": {"en": "A collection of ebuilds that are missing or outdated or incomplete on the Gentoo portage official repository.."}, "homepage": "https://github.com/psihozefir/sorinp-gentoo-overlay", "owner": [{"type": "person", "email": "sorin.panca@gmail.com", "name": "Sorin Panca"}], "source": [{"type": "git", "uri": "https://github.com/psihozefir/sorinp-gentoo-overlay"}], "x-state": "GOOD", "x-timestamp": "2016-11-20 14:11:02 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "sorrow": {"quality": "experimental", "status": "unofficial", "name": "sorrow", "description": {"en": "Ebuilds for some wayland-related software and some other stuff"}, "homepage": "https://gitlab.com/eternal-sorrow/gentoo-local", "owner": [{"type": "person", "email": "sergamena@inbox.ru", "name": "sorrow"}], "source": [{"type": "git", "uri": "https://gitlab.com/eternal-sorrow/gentoo-local.git"}, {"type": "git", "uri": "git+ssh://git@gitlab.com:eternal-sorrow/gentoo-local.git"}], "feed": ["https://gitlab.com/eternal-sorrow/gentoo-local/commits/master?format=atom"], "x-state": "GOOD", "x-timestamp": "2021-03-03 15:58:12 +1000\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 16}, "spikyatlinux": {"quality": "experimental", "status": "unofficial", "name": "spikyatlinux", "description": {"en": "Here are some of my own or modified ebuilds. Also some of them I've found in the web."}, "homepage": "https://github.com/spikyatlinux/ebuilds_for_gentoo", "owner": [{"type": "person", "email": "spikyatlinux@gmail.com", "name": "SpikyAtLinux"}], "source": [{"type": "git", "uri": "https://github.com/spikyatlinux/ebuilds_for_gentoo.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-07 12:03:09 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 17}, "sping": {"quality": "experimental", "status": "official", "name": "sping", "description": {"en": "Overlay of Gentoo developer Sebastian Pipping; for issues, please open tickets at GitHub"}, "homepage": "https://github.com/hartwork/gentoo-overlay-sping", "owner": [{"type": "person", "email": "sping@gentoo.org", "name": "Sebastian Pipping"}], "source": [{"type": "git", "uri": "https://github.com/hartwork/gentoo-overlay-sping.git"}, {"type": "git", "uri": "git://github.com/hartwork/gentoo-overlay-sping.git"}, {"type": "git", "uri": "git@github.com:hartwork/gentoo-overlay-sping.git"}], "feed": ["https://github.com/hartwork/gentoo-overlay-sping/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-01-04 19:49:25 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "squeezebox": {"quality": "experimental", "status": "unofficial", "name": "squeezebox", "description": {"en": "Packages for the Squeezebox network audio player from Logitech"}, "homepage": "https://cgit.gentoo.org/user/squeezebox.git/", "owner": [{"type": "person", "email": "stuart@hickinbottom.com", "name": "Stuart Hickinbottom"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/squeezebox.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/squeezebox.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/squeezebox.git"}], "feed": ["https://cgit.gentoo.org/user/squeezebox.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-02-27 10:50:29 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 14}, "src_prepare-overlay": {"quality": "experimental", "status": "unofficial", "name": "src_prepare-overlay", "description": {"en": "src_prepare group's Gentoo overlay"}, "homepage": "https://gitlab.com/src_prepare/src_prepare-overlay.git", "owner": [{"type": "person", "name": "XGQT", "email": "xgqt@protonmail.com"}], "source": [{"type": "git", "uri": "https://gitlab.com/src_prepare/src_prepare-overlay.git"}, {"type": "git", "uri": "git+ssh://git@gitlab.com/src_prepare/src_prepare-overlay.git"}], "feed": ["https://gitlab.com/src_prepare/src_prepare-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-15 15:52:36 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 223}, "ssnb": {"quality": "experimental", "status": "unofficial", "name": "ssnb", "description": {"en": "Gentoo repository made by ssnb"}, "homepage": "https://cgit.gentoo.org/repo/user/ssnb.git/", "owner": [{"type": "person", "email": "samuelbernardo.mail@gmail.com", "name": "Samuel Bernardo"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/user/ssnb.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/repo/user/ssnb"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/user/ssnb.git"}], "feed": ["https://cgit.gentoo.org/repo/user/ssnb.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-03-08 00:31:07 +0000\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 330}, "sspreitz": {"quality": "experimental", "status": "unofficial", "name": "sspreitz", "description": {"en": "My Gentoo repository and ebuilds"}, "homepage": "https://github.com/sspreitzer/gentoo-repo", "owner": [{"type": "person", "email": "sspreitz@redhat.com", "name": "Sascha Spreitzer"}], "source": [{"type": "git", "uri": "https://github.com/sspreitzer/gentoo-repo.git"}, {"type": "git", "uri": "git+ssh://git@github.com/sspreitzer/gentoo-repo.git"}, {"type": "git", "uri": "git@github.com:sspreitzer/gentoo-repo.git"}], "feed": ["https://github.com/sspreitzer/gentoo-repo/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-09-24 10:35:30 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 24}, "steam-overlay": {"quality": "experimental", "status": "unofficial", "name": "steam-overlay", "description": {"en": "Gentoo overlay for Valve's Steam client and Steam-based games"}, "homepage": "https://github.com/anyc/steam-overlay", "owner": [{"type": "person", "email": "dev@kicherer.org", "name": "Mario Kicherer"}], "source": [{"type": "git", "uri": "https://github.com/anyc/steam-overlay.git"}, {"type": "git", "uri": "git://github.com/anyc/steam-overlay.git"}, {"type": "git", "uri": "git@github.com:anyc/steam-overlay.git"}], "feed": ["https://github.com/anyc/steam-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-13 23:10:18 +0000\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 14}, "stefantalpalaru": {"quality": "experimental", "status": "unofficial", "name": "stefantalpalaru", "description": {"en": "Gentoo overlay with ebuilds by Stefan Talpalaru that are not in the tree"}, "homepage": "https://github.com/stefantalpalaru/gentoo-overlay", "owner": [{"type": "person", "email": "stefantalpalaru@yahoo.com", "name": "Stefan Talpalaru"}], "source": [{"type": "git", "uri": "https://github.com/stefantalpalaru/gentoo-overlay.git"}, {"type": "git", "uri": "git://github.com/stefantalpalaru/gentoo-overlay.git"}, {"type": "git", "uri": "git@github.com:stefantalpalaru/gentoo-overlay.git"}], "feed": ["https://github.com/stefantalpalaru/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-13 22:12:35 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 969}, "stha09": {"quality": "experimental", "status": "unofficial", "name": "stha09", "description": {"en": "stha09's personal overlay"}, "homepage": "https://github.com/stha09/gpo-stha09", "owner": [{"type": "person", "email": "sultan@gentoo.org", "name": "Stephan Hartmann"}], "source": [{"type": "git", "uri": "https://github.com/stha09/gpo-stha09.git"}, {"type": "git", "uri": "git://github.com:stha09/gpo-stha09.git"}, {"type": "git", "uri": "git@github.com:stha09/gpo-stha09.git"}], "feed": ["https://github.com/stha09/gpo-stha09/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-08 13:33:47 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 12}, "stowe-verlay": {"quality": "experimental", "status": "unofficial", "name": "stowe-verlay", "description": {"en": "Few things that have either broken elsewhere or fallen unmaintained, such as winexe, a source-based version of logitech media server, a patched version of dansguardian"}, "homepage": "https://github.com/mwstowe/stowe-verlay", "owner": [{"type": "person", "email": "mstowe@chicago.us.mensa.org", "name": "Michael Stowe"}], "source": [{"type": "git", "uri": "https://github.com/mwstowe/stowe-verlay.git"}], "feed": ["https://github.com/mwstowe/stowe-verlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-04 08:39:13 -0600\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 33}, "strohel": {"quality": "experimental", "status": "unofficial", "name": "strohel", "description": {"en": "strohel's overlay"}, "homepage": "https://github.com/strohel/strohel-overlay", "owner": [{"type": "person", "email": "matej@laitl.cz", "name": "Mat\u011bj Laitl"}], "source": [{"type": "git", "uri": "https://strohel@github.com/strohel/strohel-overlay.git"}, {"type": "git", "uri": "git://github.com/strohel/strohel-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com:strohel/strohel-overlay.git"}], "feed": ["https://github.com/strohel/strohel-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-02-15 11:27:29 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "stuff": {"quality": "experimental", "status": "unofficial", "name": "stuff", "description": {"en": "stuff"}, "homepage": "https://github.com/istitov/stuff", "owner": [{"type": "person", "email": "iohann.s.titov@gmail.com"}], "source": [{"type": "git", "uri": "https://github.com/istitov/stuff.git"}], "feed": ["https://github.com/istitov/stuff/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-01 17:05:28 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 285}, "sublime-text": {"quality": "experimental", "status": "unofficial", "name": "sublime-text", "description": {"en": "Collection of ebuilds to install Sublime Text 2 or Sublime Text 3"}, "homepage": "https://github.com/DamnWidget/sublime-text", "owner": [{"type": "person", "email": "oscar.campos@member.fsf.org", "name": "Oscar Campos"}], "source": [{"type": "git", "uri": "https://github.com/DamnWidget/sublime-text.git"}, {"type": "git", "uri": "git://github.com/DamnWidget/sublime-text.git"}, {"type": "git", "uri": "git@github.com:DamnWidget/sublime-text.git"}], "feed": ["https://github.com/DamnWidget/sublime-text/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2019-04-08 13:16:10 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 13}, "superposition": {"quality": "experimental", "status": "unofficial", "name": "superposition", "description": {"en": "Phil's overlay"}, "homepage": "https://cgit.gentoo.org/repo/user/superposition.git/", "owner": [{"type": "person", "email": "Phil_miess@yahoo.com", "name": "Philip Miess"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/user/superposition.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/repo/user/superposition.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/user/superposition.git"}], "feed": ["https://cgit.gentoo.org/repo/user/superposition.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-03-10 17:58:16 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 57}, "swegener": {"quality": "experimental", "status": "official", "name": "swegener", "description": {"en": "This overlay contains some experimental stuff, but mostly\n stuff I quickly wrote an ebuild for or grabed it from bugzilla and did not\n have the time to commit it to the official tree or do not consider it ready\n for it."}, "homepage": "https://dev.gentoo.org/~swegener/", "owner": [{"type": "person", "email": "swegener@gentoo.org"}], "source": [{"type": "rsync", "uri": "rsync://rsync.gentoo.stealer.net/swegener-overlay/"}], "x-state": "GOOD", "x-timestamp": "2020-10-24 13:35:01.000000000 +0000\n", "x-masters": ["gentoo"], "x-ebuild-count": 33}, "tabinol": {"quality": "experimental", "status": "unofficial", "name": "tabinol", "description": {"en": "Tabinol personal overlay with no special focus"}, "homepage": "https://github.com/Tabinol/tabinol-overlay", "owner": [{"type": "person", "email": "mblanchet@fastmail.com", "name": "Michel Blanchet"}], "source": [{"type": "git", "uri": "https://github.com/Tabinol/tabinol-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/Tabinol/tabinol-overlay.git"}], "feed": ["https://github.com/Tabinol/tabinol-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2019-02-25 22:30:56 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "tamiko": {"quality": "experimental", "status": "unofficial", "name": "tamiko", "description": {"en": "Developer overlay"}, "homepage": "https://cgit.gentoo.org/repo/dev/tamiko.git/", "owner": [{"type": "person", "email": "tamiko@gentoo.org", "name": "Matthias Maier"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/dev/tamiko.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/repo/dev/tamiko.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/dev/tamiko.git"}], "feed": ["https://cgit.gentoo.org/repo/dev/tamiko.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-02-27 22:25:41 -0600\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 10}, "tante": {"quality": "experimental", "status": "unofficial", "name": "tante", "description": {"en": "Overlay of tante"}, "homepage": "https://github.com/tante/overlay", "owner": [{"type": "person", "email": "tante@tante.cc"}], "source": [{"type": "git", "uri": "https://github.com/tante/overlay.git"}], "x-state": "GOOD", "x-timestamp": "2017-02-26 14:13:35 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "tarantool": {"quality": "experimental", "status": "unofficial", "name": "tarantool", "description": {"en": "Tarantool Gentoo Overlay"}, "homepage": "https://github.com/tarantool/gentoo-overlay", "owner": [{"type": "person", "email": "totktonada.ru@gmail.com", "name": "Alexander Turenko"}], "source": [{"type": "git", "uri": "https://github.com/tarantool/gentoo-overlay.git"}, {"type": "git", "uri": "git://github.com/tarantool/gentoo-overlay.git"}, {"type": "git", "uri": "git@github.com:tarantool/gentoo-overlay.git"}], "feed": ["https://github.com/tarantool/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-04 03:36:05 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 56}, "tastytea": {"quality": "experimental", "status": "unofficial", "name": "tastytea", "description": {"en": "Overlay of tastytea"}, "homepage": "https://schlomp.space/tastytea/overlay", "owner": [{"type": "person", "email": "gentoo@tastytea.de", "name": "tastytea"}], "source": [{"type": "git", "uri": "https://schlomp.space/tastytea/overlay.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-13 10:18:41 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 39}, "tatsh-overlay": {"quality": "experimental", "status": "unofficial", "name": "tatsh-overlay", "description": {"en": "Overlay from Tatsh - emulators/fonts/game/misc"}, "homepage": "https://github.com/Tatsh/tatsh-overlay", "owner": [{"type": "person", "email": "audvare+overlay@gmail.com", "name": "Andrew Udvare"}], "source": [{"type": "git", "uri": "https://github.com/Tatsh/tatsh-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/Tatsh/tatsh-overlay.git"}], "feed": ["https://github.com/Tatsh/tatsh-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-16 02:03:24 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 84}, "telans": {"quality": "experimental", "status": "unofficial", "name": "telans", "description": {"en": "Overlay from telans - gaming/misc"}, "homepage": "https://github.com/telans/EBUILDS", "owner": [{"type": "person", "email": "telans@posteo.de", "name": "telans"}], "source": [{"type": "git", "uri": "https://github.com/telans/EBUILDS.git"}], "feed": ["https://github.com/telans/EBUILDS/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-01-27 18:17:53 +1300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 9}, "tengine-overlay": {"quality": "experimental", "status": "unofficial", "name": "tengine-overlay", "description": {"en": "Tengine overlay for Gentoo Linux"}, "homepage": "https://github.com/damex/tengine-overlay", "owner": [{"type": "person", "email": "damex.pp@gmail.com", "name": "Roman Kuzmitsky"}], "source": [{"type": "git", "uri": "https://github.com/damex/tengine-overlay.git"}], "feed": ["https://github.com/damex/tengine-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2017-11-29 08:54:54 -0800\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 6}, "tf201": {"quality": "experimental", "status": "unofficial", "name": "tf201", "description": {"en": "TF201 (Asus Transformer Prime) overlay for Gentoo"}, "homepage": "https://github.com/Tux1c/tf201-overlay", "owner": [{"type": "person", "email": "tux1cc@gmail.com", "name": "Yan A."}], "source": [{"type": "git", "uri": "https://github.com/Tux1c/tf201-overlay"}], "x-state": "GOOD", "x-timestamp": "2015-04-11 16:03:12 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "tgbugs-overlay": {"quality": "experimental", "status": "unofficial", "name": "tgbugs-overlay", "description": {"en": "tgbugs portage overlay for custom ebuilds"}, "homepage": "https://github.com/tgbugs/tgbugs-overlay", "owner": [{"type": "person", "email": "tgbugs@gmail.com", "name": "Tom Gillespie"}], "source": [{"type": "git", "uri": "https://github.com/tgbugs/tgbugs-overlay.git"}, {"type": "git", "uri": "git://github.com/tgbugs/tgbugs-overlay.git"}, {"type": "git", "uri": "git@github.com:tgbugs/tgbugs-overlay.git"}], "feed": ["https://github.com/tgbugs/tgbugs-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-14 21:43:21 -0700\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 352}, "thabairne": {"quality": "experimental", "status": "unofficial", "name": "thabairne", "description": {"en": "ntnn's Overlay"}, "homepage": "https://github.com/ntnn/gentoo-thabairne", "owner": [{"type": "person", "email": "nelo@wallus.de", "name": "Nelo-Thara Wallus"}], "source": [{"type": "git", "uri": "https://github.com/ntnn/gentoo-thabairne.git"}], "feed": ["https://github.com/ntnn/gentoo-thabairne/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-22 20:38:59 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 15}, "thegreatmcpain": {"quality": "experimental", "status": "unofficial", "name": "thegreatmcpain", "description": {"en": "TheGreatMcPain's personal ebuild overlay"}, "homepage": "https://gitlab.com/TheGreatMcPain/thegreatmcpain-overlay", "owner": [{"type": "person", "email": "sixsupersonic@gmail.com", "name": "James McClain"}], "source": [{"type": "git", "uri": "https://gitlab.com/TheGreatMcPain/thegreatmcpain-overlay.git"}, {"type": "git", "uri": "git@gitlab.com:TheGreatMcPain/thegreatmcpain-overlay.git"}], "feed": ["https://gitlab.com/TheGreatMcPain/thegreatmcpain-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-14 20:13:26 -0500\n", "x-openpgp-signed": "E", "x-masters": ["gentoo", "bobwya"], "x-ebuild-count": 133}, "tmacedo": {"quality": "experimental", "status": "unofficial", "name": "tmacedo", "description": {"en": "User Overlay"}, "homepage": "https://github.com/tmacedo/portage", "owner": [{"type": "person", "email": "tftfmacedo@gmail.com", "name": "Tiago Macedo"}], "source": [{"type": "git", "uri": "git://github.com/tmacedo/portage.git"}], "feed": ["https://github.com/tmacedo/portage/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-02 17:26:30 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 25}, "tocaro": {"quality": "experimental", "status": "unofficial", "name": "tocaro", "description": {"en": "tocaro personnal o.g.o"}, "homepage": "https://cgit.gentoo.org/user/tocaro.git/", "owner": [{"type": "person", "email": "tocaro@thocar.org", "name": "Thomas Carri\u00e9"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/tocaro.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/tocaro.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/tocaro.git"}], "feed": ["https://cgit.gentoo.org/user/tocaro.git/atom/"], "x-state": "GOOD", "x-timestamp": "2015-03-28 19:02:11 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 7}, "toniz4-overlay": {"quality": "experimental", "status": "unofficial", "name": "toniz4-overlay", "description": {"en": "Useful packages for your person use"}, "homepage": "https://github.com/toniz4/toniz4-overlay.git/", "owner": [{"type": "person", "email": "cassioavila@yandex.com", "name": "C\u00e1ssio Ribeiro Alves de \u00c1vila"}], "source": [{"type": "git", "uri": "https://github.com/toniz4/toniz4-overlay.git"}, {"type": "git", "uri": "git://github.com/toniz4/toniz4-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com:toniz4/toniz4-overlay.git"}], "feed": ["https://github.com/toniz4/toniz4-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-12-16 23:28:35 -0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 8}, "toolchain": {"quality": "experimental", "status": "official", "name": "toolchain", "description": {"en": "Toolchain ebuilds that are unsuitable for the tree. Snapshots,\n unstable versions, etc..."}, "homepage": "https://cgit.gentoo.org/proj/toolchain.git/", "owner": [{"type": "project", "email": "toolchain@gentoo.org"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/toolchain.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/toolchain.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/toolchain.git"}], "feed": ["https://cgit.gentoo.org/proj/toolchain.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-02-22 09:39:04 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 0}, "torbrowser": {"quality": "experimental", "status": "unofficial", "name": "torbrowser", "description": {"en": "Tor Browser related ebuilds"}, "homepage": "https://github.com/MeisterP/torbrowser-overlay", "owner": [{"type": "person", "email": "poncho@spahan.ch", "name": "MeisterP"}], "source": [{"type": "git", "uri": "https://github.com/MeisterP/torbrowser-overlay.git"}, {"type": "git", "uri": "git://github.com/MeisterP/torbrowser-overlay.git"}, {"type": "git", "uri": "git@github.com:MeisterP/torbrowser-overlay.git"}], "feed": ["https://github.com/MeisterP/torbrowser-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-12 18:23:21 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 12}, "trolltoo": {"quality": "experimental", "status": "unofficial", "name": "trolltoo", "description": {"en": "An ebuild overlay for Gentoo."}, "homepage": "https://github.com/dallenwilson/trolltoo", "owner": [{"type": "person", "email": "dallen.wilson@gmail.com", "name": "Dallen Wilson"}], "source": [{"type": "git", "uri": "https://github.com/dallenwilson/trolltoo.git"}, {"type": "git", "uri": "git+ssh://git@github.com/dallenwilson/trolltoo.git"}], "feed": ["https://github.com/dallenwilson/trolltoo/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-22 14:29:50 -0700\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 20}, "tryton": {"quality": "experimental", "status": "unofficial", "name": "tryton", "description": {"en": "Tryton"}, "homepage": "http://www.tryton.org/", "owner": [{"type": "person", "email": "cedk@gentoo.org"}], "source": [{"type": "mercurial", "uri": "https://hg.tryton.org/tryton-overlay"}], "x-state": "GOOD", "x-timestamp": "2021-03-03 22:57:07 +0100", "x-masters": ["gentoo"], "x-ebuild-count": 492}, "twister": {"quality": "experimental", "status": "unofficial", "name": "twister", "description": {"en": "Unoffical gentoo overlay for twister"}, "homepage": "https://github.com/ddorian1/gentoo-twister-overlay", "owner": [{"type": "person", "email": "mail@jschwab.org", "name": "Johannes Schwab"}], "source": [{"type": "git", "uri": "https://github.com/ddorian1/gentoo-twister-overlay.git"}, {"type": "git", "uri": "git://github.com/ddorian1/gentoo-twister-overlay.git"}, {"type": "git", "uri": "git@github.com:ddorian1/gentoo-twister-overlay.git"}], "feed": ["https://github.com/ddorian1/gentoo-twister-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2018-01-06 12:40:31 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "ulm": {"quality": "experimental", "status": "official", "name": "ulm", "description": {"en": "Developer overlay"}, "homepage": "https://cgit.gentoo.org/repo/dev/ulm.git/", "owner": [{"type": "person", "email": "ulm@gentoo.org", "name": "Ulrich M\u00fcller"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/dev/ulm.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/repo/dev/ulm.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/dev/ulm.git"}], "feed": ["https://cgit.gentoo.org/repo/dev/ulm.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-02-21 22:16:56 +0100\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 10}, "ultrabug": {"quality": "experimental", "status": "official", "name": "ultrabug", "description": {"en": "Developer Overlay"}, "homepage": "https://cgit.gentoo.org/dev/ultrabug.git/", "owner": [{"type": "person", "email": "ultrabug@gentoo.org", "name": "Alexys Jacob"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/ultrabug.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/ultrabug.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/ultrabug.git"}], "feed": ["https://cgit.gentoo.org/dev/ultrabug.git/atom/"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-10 17:43:11 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 22}, "unc3nsored": {"quality": "experimental", "status": "unofficial", "name": "unc3nsored", "description": {"en": "Overlay for software I didn't find in the main tree"}, "homepage": "https://github.com/xxc3nsoredxx/unc3nsored", "owner": [{"type": "person", "email": "xxc3ncoredxx@gmail.com", "name": "Oskari Pirhonen"}], "source": [{"type": "git", "uri": "https://github.com/xxc3nsoredxx/unc3nsored.git"}], "feed": ["https://github.com/xxc3nsoredxx/unc3nsored/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-27 21:39:14 -0600\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 3}, "unity-gentoo": {"quality": "experimental", "status": "unofficial", "name": "unity-gentoo", "description": {"en": "Overlay to install the Unity desktop"}, "homepage": "https://github.com/shiznix/unity-gentoo", "owner": [{"type": "person", "email": "rickfharris@yahoo.com.au", "name": "Rick Harris"}], "source": [{"type": "git", "uri": "https://github.com/shiznix/unity-gentoo"}, {"type": "git", "uri": "git://github.com/shiznix/unity-gentoo.git"}], "feed": ["https://github.com/feeds/shiznix/commits/unity-gentoo/master"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-02 21:59:41 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 185}, "usenet-overlay": {"quality": "experimental", "status": "unofficial", "name": "usenet-overlay", "description": {"en": "Personal Overlay for Lidarr, Radarr and Sonarr "}, "homepage": "https://github.com/xartin/gentoo-overlay", "owner": [{"type": "person", "email": "mcrawford@eliteitminds.com", "name": "Michael Crawford"}], "source": [{"type": "git", "uri": "https://github.com/xartin/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/xartin/gentoo-overlay.git"}], "feed": ["https://github.com/xartin/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-11 20:20:57 -0600\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 16}, "vampire": {"quality": "experimental", "status": "unofficial", "name": "vampire", "description": {"en": "A personal repository. So much bleeding edge, you would bet a vampire was involved."}, "homepage": "https://github.com/TheCrueltySage/vampire-overlay", "owner": [{"type": "person", "email": "miltenfiremage@gmail.com", "name": "TheCrueltySage"}], "source": [{"type": "git", "uri": "https://github.com/TheCrueltySage/vampire-overlay.git"}, {"type": "git", "uri": "git://github.com/TheCrueltySage/vampire-overlay.git"}], "feed": ["https://github.com/TheCrueltySage/vampire-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-02-17 20:46:19 +0700\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 20}, "vapoursynth": {"quality": "experimental", "status": "unofficial", "name": "vapoursynth", "description": {"en": "Unofficial repository with all vapoursynth related ebuilds"}, "homepage": "https://github.com/4re/vapoursynth-portage", "owner": [{"type": "person", "email": "surukko@gmail.com"}], "source": [{"type": "git", "uri": "https://github.com/4re/vapoursynth-portage.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-13 15:52:20 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 302}, "vayerx": {"quality": "experimental", "status": "unofficial", "name": "vayerx", "description": {"en": "Personal overlay of Vasiliy Yeremeyev"}, "homepage": "https://github.com/vayerx/vayerx-gentoo/", "owner": [{"type": "person", "email": "vayerx@gmail.com", "name": "Vasiliy Yeremeyev"}], "source": [{"type": "git", "uri": "https://github.com/vayerx/vayerx-gentoo.git"}, {"type": "git", "uri": "git://github.com/vayerx/vayerx-gentoo.git"}, {"type": "git", "uri": "git@github.com:vayerx/vayerx-gentoo.git"}], "feed": ["https://github.com/vayerx/vayerx-gentoo/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-16 15:38:48 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 68}, "vdr-devel": {"quality": "experimental", "status": "official", "name": "vdr-devel", "description": {"en": "Overlay for VDR, that contains ebuilds for development version\n of VDR, and specific plugins for that version."}, "homepage": "https://cgit.gentoo.org/proj/vdr/devel.git/", "owner": [{"type": "project", "email": "vdr@gentoo.org"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/vdr/devel.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/vdr/devel.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/vdr/devel.git"}], "feed": ["https://cgit.gentoo.org/proj/vdr/devel.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-08-27 20:54:04 +0200\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 37}, "vifino-overlay": {"quality": "experimental", "status": "unofficial", "name": "vifino-overlay", "description": {"en": "vifino's personal overlay"}, "homepage": "https://github.com/vifino/vifino-overlay", "owner": [{"type": "person", "email": "vifino@tty.sh", "name": "Adrian \"vifino\" Pistol"}], "source": [{"type": "git", "uri": "https://github.com/vifino/vifino-overlay.git"}, {"type": "git", "uri": "git://github.com/vifino/vifino-overlay.git"}, {"type": "git", "uri": "git@github.com:vifino/vifino-overlay.git"}], "feed": ["https://github.com/vifino/vifino-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-16 14:33:28 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 46}, "vklimovs": {"quality": "experimental", "status": "unofficial", "name": "vklimovs", "description": {"en": "vklimovs' personal portage overlay"}, "homepage": "https://github.com/vklimovs/portage-overlay", "owner": [{"type": "person", "email": "vklimovs@gmail.com", "name": "Vjaceslavs Klimovs"}], "source": [{"type": "git", "uri": "https://github.com/vklimovs/portage-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/vklimovs/portage-overlay.git"}], "feed": ["https://github.com/vklimovs/portage-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-14 10:14:16 -0800\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 24}, "vmacs": {"quality": "experimental", "status": "unofficial", "name": "vmacs", "description": {"en": "VMACS Personal Gentoo Overlay"}, "homepage": "https://cgit.gentoo.org/user/vmacs.git/", "owner": [{"type": "person", "email": "vance.m.allen@gmail.com", "name": "Vance M. Allen"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/vmacs.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/vmacs.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/vmacs.git"}], "feed": ["https://cgit.gentoo.org/user/vmacs.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-10-30 20:09:52 -0600\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 7}, "vortex": {"quality": "experimental", "status": "unofficial", "name": "vortex", "description": {"en": "Personal overlay"}, "homepage": "https://github.com/nE0sIghT/vortex-overlay", "owner": [{"type": "person", "email": "ykonotopov@gnome.org", "name": "Yuri 'nE0sIghT' Konotopov"}], "source": [{"type": "git", "uri": "https://github.com/nE0sIghT/vortex-overlay.git"}, {"type": "git", "uri": "git://github.com/nE0sIghT/vortex-overlay.git"}], "feed": ["https://github.com/nE0sIghT/vortex-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-01-24 10:27:38 +0400\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 77}, "vowstar": {"quality": "experimental", "status": "unofficial", "name": "vowstar", "description": {"en": "Ebuilds from vowstar's git"}, "homepage": "https://github.com/vowstar/vowstar-overlay", "owner": [{"type": "person", "email": "vowstar@gmail.com"}], "source": [{"type": "git", "uri": "https://github.com/vowstar/vowstar-overlay.git"}, {"type": "git", "uri": "git://github.com/vowstar/vowstar-overlay.git"}, {"type": "git", "uri": "git@github.com:vowstar/vowstar-overlay.git"}], "feed": ["https://github.com/vowstar/vowstar-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-10 11:48:58 +0800\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 74}, "voyageur": {"quality": "experimental", "status": "official", "name": "voyageur", "description": {"en": "Voyageur's random ebuilds stuff"}, "homepage": "https://cafarelli.fr/cgi-bin/cgit.cgi/voyageur-overlay/", "owner": [{"type": "person", "email": "voyageur@gentoo.org"}], "source": [{"type": "git", "uri": "https://cafarelli.fr/git/voyageur-overlay/"}], "feed": ["https://cafarelli.fr/cgi-bin/cgit.cgi/voyageur-overlay/atom"], "x-state": "GOOD", "x-timestamp": "2021-03-12 11:22:50 +0100\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 36}, "waebbl": {"quality": "experimental", "status": "unofficial", "name": "waebbl", "description": {"en": "waebbl's overlay"}, "homepage": "https://github.com/waebbl/waebbl-gentoo", "owner": [{"type": "person", "email": "waebbl@gmail.com", "name": "Bernd Waibel"}], "source": [{"type": "git", "uri": "https://github.com/waebbl/waebbl-gentoo.git"}, {"type": "git", "uri": "git+ssh://git@github.com/waebbl/waebbl-gentoo.git"}], "feed": ["https://github.com/waebbl/waebbl-gentoo/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-14 15:08:05 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 54}, "waffle-builds": {"quality": "experimental", "status": "unofficial", "name": "waffle-builds", "description": {"en": "FlyingWaffle's personal ebuild overlay."}, "homepage": "https://github.com/FlyingWaffleDev/waffle-builds", "owner": [{"type": "person", "email": "flyingwaffle@pm.me", "name": "FlyingWaffle"}], "source": [{"type": "git", "uri": "https://github.com/FlyingWaffleDev/waffle-builds.git"}, {"type": "git", "uri": "git+ssh://git@github.com/FlyingWaffleDev/waffle-builds.git"}], "feed": ["https://github.com/FlyingWaffleDev/waffle-builds/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-03 17:00:29 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 63}, "wayland-desktop": {"quality": "experimental", "status": "unofficial", "name": "wayland-desktop", "description": {"en": "gentoo overlay for wayland related ebuilds"}, "homepage": "https://github.com/bsd-ac/wayland-desktop", "owner": [{"type": "person", "email": "gentoo@aisha.cc", "name": "Aisha Tammy"}], "source": [{"type": "git", "uri": "https://github.com/bsd-ac/wayland-desktop.git"}, {"type": "git", "uri": "git+ssh://git@github.com/bsd-ac/wayland-desktop.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-15 15:38:42 -0400\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 106}, "wbrana": {"quality": "experimental", "status": "unofficial", "name": "wbrana", "description": {"en": "wbrana's overlay"}, "homepage": "https://cgit.gentoo.org/user/wbrana.git/", "owner": [{"type": "person", "email": "wbrana@gmail.com", "name": "William Brana"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/wbrana.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/wbrana.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/wbrana.git"}], "feed": ["https://cgit.gentoo.org/user/wbrana.git/atom/"], "x-state": "GOOD", "x-timestamp": "2015-06-28 16:56:01 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "wdzierzan": {"quality": "experimental", "status": "unofficial", "name": "wdzierzan", "description": {"en": "Stuff I'd rather `emerge' than `stow'"}, "homepage": "https://cgit.gentoo.org/user/wdzierzan.git/", "owner": [{"type": "person", "email": "wojciech.dzierzanowski@gmail.com", "name": "Wojciech Dzier\u017canowski"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/wdzierzan.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/wdzierzan.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/wdzierzan.git"}], "feed": ["https://cgit.gentoo.org/user/wdzierzan.git/atom/"], "x-state": "GOOD", "x-timestamp": "2017-02-28 21:28:13 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "webos": {"quality": "experimental", "status": "unofficial", "name": "webos", "description": {"en": "Ported Open WebOS components and libraries"}, "homepage": "https://github.com/feniksa/webos-overlay", "owner": [{"type": "person", "email": "feniksa@rambler.ru", "name": "Maksym Sditanov"}], "source": [{"type": "git", "uri": "https://github.com/feniksa/webos-overlay.git"}, {"type": "git", "uri": "git://github.com:feniksa/webos-overlay.git"}, {"type": "git", "uri": "git@github.com:feniksa/webos-overlay.git"}], "feed": ["https://github.com/feniksa/webos-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-12-26 00:39:07 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 49}, "weuxel": {"quality": "experimental", "status": "unofficial", "name": "weuxel", "description": {"en": "Weuxels Personal Overlay"}, "homepage": "https://github.com/Weuxel/portage-weuxel", "owner": [{"type": "person", "email": "norman@smash-net.org", "name": "Norman Rie\u00df"}], "source": [{"type": "git", "uri": "https://github.com/Weuxel/portage-weuxel.git"}, {"type": "git", "uri": "git://github.com/Weuxel/portage-weuxel.git"}, {"type": "git", "uri": "git@github.com:Weuxel/portage-weuxel.git"}], "feed": ["https://github.com/Weuxel/portage-weuxel/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-21 15:49:49 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 1}, "what4-java": {"quality": "experimental", "status": "unofficial", "name": "what4-java", "description": {"en": "Incubator for dev-java updates that the Gentoo Java team has no time for"}, "homepage": "https://github.com/kwhat/gentoo-what4-java-overlay", "owner": [{"type": "person", "email": "alex@1stleg.com", "name": "Alex Barker"}], "source": [{"type": "git", "uri": "https://github.com/kwhat/gentoo-what4-java-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2020-07-02 08:48:49 -0700\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 23}, "wichtounet": {"quality": "experimental", "status": "unofficial", "name": "wichtounet", "description": {"en": "Personal overlay of Baptiste Wicht"}, "homepage": "https://github.com/wichtounet/wichtounet-overlay", "owner": [{"type": "person", "email": "baptistewicht@gmail.com", "name": "Baptiste Wicht"}], "source": [{"type": "git", "uri": "https://github.com/wichtounet/wichtounet-overlay.git"}, {"type": "git", "uri": "git://github.com/wichtounet/wichtounet-overlay.git"}, {"type": "git", "uri": "git@github.com:wichtounet/wichtounet-overlay.git"}], "feed": ["https://github.com/wichtounet/wichtounet-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-27 08:41:09 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 26}, "wine": {"quality": "testing", "status": "official", "name": "wine", "description": {"en": "All supported Wine ebuilds from the Gentoo Wine Project"}, "homepage": "https://wiki.gentoo.org/wiki/Project:Wine", "owner": [{"type": "project", "email": "wine@gentoo.org", "name": "Gentoo Wine Project"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/proj/wine.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/repo/proj/wine.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-14 18:26:53 -0400\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 249}, "winny": {"quality": "experimental", "status": "unofficial", "name": "winny", "description": {"en": "Winny's personal overlay"}, "homepage": "https://github.com/winny-/winny-overlay", "owner": [{"type": "person", "email": "winston@ml1.net", "name": "winny"}], "source": [{"type": "git", "uri": "https://github.com/winny-/winny-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/winny-/winny-overlay.git"}], "feed": ["https://github.com/winny-/winny-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-14 15:27:40 -0600\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 66}, "wjn-overlay": {"quality": "experimental", "status": "unofficial", "name": "wjn-overlay", "description": {"en": "wjn's overlay for Gentoo Linux"}, "homepage": "https://bitbucket.org/wjn/wjn-overlay", "owner": [{"type": "person", "email": "wjn@aol.jp", "name": "wjn"}], "source": [{"type": "git", "uri": "https://bitbucket.org/wjn/wjn-overlay.git"}], "x-state": "BAD_CACHE", "x-timestamp": "2021-01-21 02:49:16 +0900\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 23}, "wuodan": {"quality": "experimental", "status": "unofficial", "name": "wuodan", "description": {"en": "An experimental portage overlay"}, "homepage": "https://github.com/Wuodan/gentoo-overlay", "owner": [{"type": "person", "email": "stefan.kuhn.zurich@gmail.com", "name": "Stefan Kuhn"}], "source": [{"type": "git", "uri": "https://github.com/Wuodan/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/Wuodan/gentoo-overlay.git"}], "feed": ["https://github.com/Wuodan/gentoo-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2020-09-01 16:33:01 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo", "pentoo"], "x-ebuild-count": 23}, "x11": {"quality": "experimental", "status": "official", "name": "x11", "description": {"en": "Gentoo X11 team ebuild repository"}, "homepage": "https://cgit.gentoo.org/proj/x11.git", "owner": [{"type": "project", "email": "x11@gentoo.org"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/x11.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/x11"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/x11.git"}], "feed": ["https://cgit.gentoo.org/proj/x11.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-02-15 21:31:57 -0500\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "xdch47": {"quality": "experimental", "status": "unofficial", "name": "xdch47", "description": {"en": "Gentoo portage overlay of xdch47"}, "homepage": "https://github.com/xdch47/gpo-xdch47", "owner": [{"type": "person", "email": "xdch47@posteo.de", "name": "Felix Neum\u00e4rker"}], "source": [{"type": "git", "uri": "https://github.com/xdch47/gpo-xdch47.git"}, {"type": "git", "uri": "git+ssh://git@github.com/xdch47/gpo-xdch47.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-04 07:24:58 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 41}, "xelnor": {"quality": "experimental", "status": "unofficial", "name": "xelnor", "description": {"en": "Rapha\u00ebl Barrois' (Xelnor) Gentoo overlay."}, "homepage": "http://overlay.xelnor.net", "owner": [{"type": "person", "email": "gentoo@xelnor.net"}], "source": [{"type": "git", "uri": "git://overlay.xelnor.net/overlay.git"}], "x-state": "GOOD", "x-timestamp": "2021-02-17 19:37:39 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 54}, "xoreos": {"quality": "experimental", "status": "unofficial", "name": "xoreos", "description": {"en": "Gentoo overlay for the xoreos project, providing a WIP reimplementation of the BioWare Aurora engine and related modding tools."}, "homepage": "https://github.com/xoreos/gentoo-overlay", "owner": [{"type": "person", "email": "drmccoy@drmccoy.de", "name": "Sven \"DrMcCoy\" Hesse"}], "source": [{"type": "git", "uri": "https://github.com/xoreos/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/xoreos/gentoo-overlay.git"}], "feed": ["https://github.com/xoreos/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-08-09 19:51:52 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 12}, "xwing": {"quality": "experimental", "status": "unofficial", "name": "xwing", "description": {"en": "This overlay contains some experimental stuff, such as\n turboprint printers driver (bug #61311), intel-536ep driver for lastest 2.6\n kernels (bug #127464), lastest grisbi version (proxy maintainer) before\n it's portage integration and so on."}, "homepage": "http://gentoo.xwing.info", "owner": [{"type": "person", "email": "casta@xwing.info"}], "source": [{"type": "rsync", "uri": "rsync://gentoo.xwing.info/xwing-overlay"}], "x-state": "GOOD", "x-timestamp": "2021-03-14 10:51:44.000000000 +0000\n", "x-masters": ["gentoo"], "x-ebuild-count": 25}, "yandex": {"quality": "experimental", "status": "unofficial", "name": "yandex", "description": {"en": "Gentoo overlay with packages for software made by Yandex", "ru": "\u041e\u0432\u0435\u0440\u043b\u0435\u0439 \u0441 \u0441\u043e\u0444\u0442\u043e\u043c, \u0432\u044b\u043f\u0443\u0449\u0435\u043d\u043d\u044b\u043c \u042f\u043d\u0434\u0435\u043a\u0441\u043e\u043c"}, "homepage": "https://github.com/yandex-gentoo/overlay", "owner": [{"type": "person", "email": "mva@gentoo.org", "name": "Vadim A. Misbakh-Soloviov"}], "source": [{"type": "git", "uri": "https://github.com/yandex-gentoo/overlay.git"}, {"type": "git", "uri": "git://github.com/yandex-gentoo/overlay.git"}, {"type": "git", "uri": "git@github.com:yandex-gentoo/overlay.git"}], "feed": ["https://github.com/yandex-gentoo/overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-11-14 20:51:19 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "yoreek": {"quality": "experimental", "status": "unofficial", "name": "yoreek", "description": {"en": "Ebuilds related to nginx webserver modules"}, "homepage": "https://cgit.gentoo.org/user/yoreek.git/", "owner": [{"type": "person", "email": "yoreek@yahoo.com", "name": "Yuri U."}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/yoreek.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/yoreek.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/yoreek.git"}], "feed": ["https://cgit.gentoo.org/user/yoreek.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-01-11 17:13:27 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "youbroketheinternet": {"quality": "experimental", "status": "unofficial", "name": "youbroketheinternet", "description": {"en": "This overlay is a collaborative maintained Gentoo developer overlay. Some of us are involved with SecuShare, but we try out all sorts of XKEYSCORE-resistant technology. Some of our unique ebuilds are the full GNUnet suite, and software around the psyced chatserver. Some ebuilds are experimental/testing - refer to the included README for more info and details. If you would like to get involved read https://wiki.gentoo.org/wiki/Overlay:Youbroketheinternet"}, "homepage": "http://youbroketheinternet.org/#overlay", "owner": [{"type": "person", "email": "lynX@youbroketheinternet.pages.de", "name": "lynX"}], "source": [{"type": "git", "uri": "https://gnunet.org/git/youbroketheinternet-overlay.git"}, {"type": "git", "uri": "git://cheettyiapsyciew.onion/youbroketheinternet-overlay"}, {"type": "git", "uri": "git://gnunet.org/youbroketheinternet-overlay.git"}], "x-state": "BAD_CACHE", "x-timestamp": "1984-04-04 00:44:28 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 126}, "yurij-overlay": {"quality": "experimental", "status": "unofficial", "name": "yurij-overlay", "description": {"en": "Yurij's overlay"}, "homepage": "https://github.com/yurijmikhalevich/yurij-overlay", "owner": [{"type": "person", "email": "yurij@mikhalevi.ch", "name": "Yurij Mikhalevich"}], "source": [{"type": "git", "uri": "https://github.com/yurijmikhalevich/yurij-overlay.git"}, {"type": "git", "uri": "git://github.com/yurijmikhalevich/yurij-overlay.git"}, {"type": "git", "uri": "git@github.com:yurijmikhalevich/yurij-overlay.git"}], "feed": ["https://github.com/yurijmikhalevich/yurij-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2017-09-03 21:21:55 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "yuzu-overlay": {"quality": "experimental", "status": "unofficial", "name": "yuzu-overlay", "description": {"en": "Provides the Yuzu Switch Emulator and required dependencies."}, "homepage": "https://github.com/Alex-Aralis/yuzu-overlay", "owner": [{"type": "person", "email": "alex.aralis@gmail.com", "name": "Alex Aralis"}], "source": [{"type": "git", "uri": "https://github.com/Alex-Aralis/yuzu-overlay.git"}, {"type": "git", "uri": "git://github.com/Alex-Aralis/yuzu-overlay.git"}, {"type": "git", "uri": "git@github.com:Alex-Aralis/yuzu-overlay.git"}], "feed": ["https://github.com/Alex-Aralis/yuzu-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2020-08-25 11:16:37 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "zerodaysfordays": {"quality": "experimental", "status": "unofficial", "name": "zerodaysfordays", "description": {"en": "Jakob L. Kreuze's personal overlay."}, "homepage": "https://git.sr.ht/~jakob/zerodaysfordays", "owner": [{"type": "person", "email": "zerodaysfordays@sdf.lonestar.org", "name": "Jakob L. Kreuze"}], "source": [{"type": "git", "uri": "https://git.sr.ht/~jakob/zerodaysfordays"}], "x-state": "GOOD", "x-timestamp": "2020-05-09 19:15:21 -0400\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 11}, "zscheile": {"quality": "experimental", "status": "unofficial", "name": "zscheile", "description": {"en": "Zscheile Overlay"}, "homepage": "https://github.com/zseri/portage-zscheile", "owner": [{"type": "person", "email": "zseri@ytrizja.de", "name": "Erik Zscheile"}], "source": [{"type": "git", "uri": "https://github.com/zseri/portage-zscheile.git"}, {"type": "git", "uri": "git://github.com/zseri/portage-zscheile.git"}, {"type": "git", "uri": "git@github.com:zseri/portage-zscheile.git"}], "feed": ["https://github.com/zseri/portage-zscheile/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-09 08:21:42 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 81}, "zugaina": {"quality": "experimental", "status": "unofficial", "name": "zugaina", "description": {"en": "collection of ebuilds by ycarus"}, "homepage": "http://gpo.zugaina.org/Overlays/zugaina/", "owner": [{"type": "person", "email": "ycarus@zugaina.org"}], "source": [{"type": "rsync", "uri": "rsync://gentoo.zugaina.org/zugaina-portage"}], "x-state": "GOOD", "x-timestamp": "2019-07-24 19:12:13.000000000 +0000\n", "x-masters": ["gentoo"], "x-ebuild-count": 467}, "zx2c4": {"quality": "experimental", "status": "official", "name": "zx2c4", "description": {"en": "zx2c4's repository of additional ebuilds"}, "homepage": "http://git.zx2c4.com/portage/", "owner": [{"type": "person", "email": "zx2c4@gentoo.org", "name": "Jason A. Donenfeld"}], "source": [{"type": "git", "uri": "git://git.zx2c4.com/portage"}, {"type": "git", "uri": "http://git.zx2c4.com/portage"}, {"type": "git", "uri": "ssh://git@git.zx2c4.com/portage"}], "feed": ["http://git.zx2c4.com/portage/atom/?h=master"], "x-state": "GOOD", "x-timestamp": "2020-03-01 15:33:49 +0800\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 9}, "zyrenth": {"quality": "experimental", "status": "unofficial", "name": "zyrenth", "description": {"en": "Personal overlay"}, "homepage": "https://github.com/kabili207/zyrenth-overlay", "owner": [{"type": "person", "email": "kabi-bugz.gentoo@zyrenth.com", "name": "Amy Nagle"}], "source": [{"type": "git", "uri": "https://github.com/kabili207/zyrenth-overlay.git"}, {"type": "git", "uri": "git://github.com/kabili207/zyrenth-overlay.git"}, {"type": "git", "uri": "git@github.com:kabili207/zyrenth-overlay.git"}], "feed": ["https://github.com/kabili207/zyrenth-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-01-27 17:51:35 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 33}}
\ No newline at end of file diff --git a/superposition.html b/superposition.html index 8f68d47d6bc0..ad2f635858fd 100644 --- a/superposition.html +++ b/superposition.html @@ -42,35 +42,35 @@ </pre></td></tr> <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync superposition </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing superposition </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing superposition + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced superposition </pre></td></tr> diff --git a/superposition.txt b/superposition.txt index 2c97fc66e8a1..8d0ecfb9d24b 100644 --- a/superposition.txt +++ b/superposition.txt @@ -14,6 +14,7 @@ 'uri': 'git+ssh://git@git.gentoo.org/repo/user/superposition.git'}], 'status': 'unofficial'} $ pmaint sync superposition +*** syncing superposition warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -28,7 +29,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing superposition *** synced superposition * Sync succeeded $ git log --format=%ci -1 diff --git a/swegener.html b/swegener.html index 2cb30d0df0e3..c113915eba2c 100644 --- a/swegener.html +++ b/swegener.html @@ -40,71 +40,71 @@ </pre></td></tr> <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync swegener </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>Welcome To + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing swegener </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> ____ _____ _____ _ _ _____ ____ _ + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>Welcome To </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> / ___|_ _| ____| / \ | | | ____| _ \ _ __ ___| |_ + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> ____ _____ _____ _ _ _____ ____ _ </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> \___ \ | | | _| / _ \ | | | _| | |_) | | '_ \ / _ \ __| + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> / ___|_ _| ____| / \ | | | ____| _ \ _ __ ___| |_ </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> ___) || | | |___ / ___ \| |___| |___| _ < _| | | | __/ |_ + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> \___ \ | | | _| / _ \ | | | _| | |_) | | '_ \ / _ \ __| </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> |____/ |_| |_____/_/ \_\_____|_____|_| \_(_)_| |_|\___|\__| + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> ___) || | | |___ / ___ \| |___| |___| _ < _| | | | __/ |_ </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> |____/ |_| |_____/_/ \_\_____|_____|_| \_(_)_| |_|\___|\__| </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>IP: 144.76.13.132 + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>AKA: rsync7.de.gentoo.org + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>IP: 144.76.13.132 </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>AKA: rsync.gentoo.stealer.net + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>AKA: rsync7.de.gentoo.org </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>AKA: rsync.gentoo.stealer.net </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Connection: 1 GBit/s, rsync limited to 20 connections + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Location: Germany + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Connection: 1 GBit/s, rsync limited to 20 connections </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Contact: Sven Wegener <swegener@gentoo.org> + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Location: Germany </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Contact: Sven Wegener <swegener@gentoo.org> </pre></td></tr> <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Number of files: 167 (reg: 93, dir: 74) + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>Number of created files: 0 + <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>Number of files: 167 (reg: 93, dir: 74) </pre></td></tr> - <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>Number of deleted files: 0 + <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>Number of created files: 0 </pre></td></tr> - <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>Number of regular files transferred: 0 + <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>Number of deleted files: 0 </pre></td></tr> - <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>Total file size: 107.78K bytes + <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>Number of regular files transferred: 0 </pre></td></tr> - <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>Total transferred file size: 0 bytes + <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>Total file size: 107.78K bytes </pre></td></tr> - <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>Literal data: 0 bytes + <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>Total transferred file size: 0 bytes </pre></td></tr> - <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>Matched data: 0 bytes + <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>Literal data: 0 bytes </pre></td></tr> - <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>File list size: 5.00K + <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>Matched data: 0 bytes </pre></td></tr> - <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>File list generation time: 0.001 seconds + <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>File list size: 5.00K </pre></td></tr> - <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>File list transfer time: 0.000 seconds + <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>File list generation time: 0.001 seconds </pre></td></tr> - <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>Total bytes sent: 143 + <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>File list transfer time: 0.000 seconds </pre></td></tr> - <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>Total bytes received: 5.09K + <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>Total bytes sent: 143 </pre></td></tr> - <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> + <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>Total bytes received: 5.09K </pre></td></tr> - <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>sent 143 bytes received 5.09K bytes 2.09K bytes/sec + <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>total size is 107.78K speedup is 20.59 + <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>sent 143 bytes received 5.09K bytes 2.09K bytes/sec </pre></td></tr> - <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>*** syncing swegener + <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>total size is 107.78K speedup is 20.59 </pre></td></tr> <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>*** synced swegener </pre></td></tr> diff --git a/swegener.txt b/swegener.txt index 1eb0bc27ffa5..3d0d2f7aa8f2 100644 --- a/swegener.txt +++ b/swegener.txt @@ -13,6 +13,7 @@ 'uri': 'rsync://rsync.gentoo.stealer.net/swegener-overlay/'}], 'status': 'official'} $ pmaint sync swegener +*** syncing swegener Welcome To ____ _____ _____ _ _ _____ ____ _ / ___|_ _| ____| / \ | | | ____| _ \ _ __ ___| |_ @@ -45,7 +46,6 @@ Total bytes received: 5.09K sent 143 bytes received 5.09K bytes 2.09K bytes/sec total size is 107.78K speedup is 20.59 -*** syncing swegener *** synced swegener * Sync succeeded $ stat --format=%y . diff --git a/tabinol.html b/tabinol.html index 3aab1d777b03..4f5c342d16c5 100644 --- a/tabinol.html +++ b/tabinol.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync tabinol </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing tabinol </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing tabinol + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced tabinol </pre></td></tr> diff --git a/tabinol.txt b/tabinol.txt index 313c888e6037..70eb0daf46bf 100644 --- a/tabinol.txt +++ b/tabinol.txt @@ -12,6 +12,7 @@ 'uri': 'git+ssh://git@github.com/Tabinol/tabinol-overlay.git'}], 'status': 'unofficial'} $ pmaint sync tabinol +*** syncing tabinol warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing tabinol *** synced tabinol * Sync succeeded $ git log --format=%ci -1 diff --git a/tamiko.html b/tamiko.html index 5bf6fdf7d855..e37951d08a94 100644 --- a/tamiko.html +++ b/tamiko.html @@ -42,35 +42,35 @@ </pre></td></tr> <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync tamiko </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing tamiko </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing tamiko + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced tamiko </pre></td></tr> diff --git a/tamiko.txt b/tamiko.txt index be5c436bcc87..a49dfe2ad3a6 100644 --- a/tamiko.txt +++ b/tamiko.txt @@ -14,6 +14,7 @@ 'uri': 'git+ssh://git@git.gentoo.org/repo/dev/tamiko.git'}], 'status': 'unofficial'} $ pmaint sync tamiko +*** syncing tamiko warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -28,7 +29,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing tamiko *** synced tamiko * Sync succeeded $ git log --format=%ci -1 diff --git a/tante.html b/tante.html index 753fdde10c71..ee205fd2d420 100644 --- a/tante.html +++ b/tante.html @@ -26,35 +26,35 @@ </pre></td></tr> <tr class="" id="l8"><td><a href="#l8"><span>8</span></a></td><td><pre>$ pmaint sync tante </pre></td></tr> - <tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre>*** syncing tante </pre></td></tr> - <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>invocation. + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>Already up to date. + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>*** syncing tante + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>*** synced tante </pre></td></tr> diff --git a/tante.txt b/tante.txt index 6f7b9968c7fc..66cc3b0f4a5e 100644 --- a/tante.txt +++ b/tante.txt @@ -6,6 +6,7 @@ 'source': [{'type': 'git', 'uri': 'https://github.com/tante/overlay.git'}], 'status': 'unofficial'} $ pmaint sync tante +*** syncing tante warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -20,7 +21,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing tante *** synced tante * Sync succeeded $ git log --format=%ci -1 diff --git a/tarantool.html b/tarantool.html index b63eb11a3a7b..f25272353172 100644 --- a/tarantool.html +++ b/tarantool.html @@ -42,35 +42,35 @@ </pre></td></tr> <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync tarantool </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing tarantool </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing tarantool + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced tarantool </pre></td></tr> diff --git a/tarantool.txt b/tarantool.txt index 6b5c08cd8cfc..58967521af0b 100644 --- a/tarantool.txt +++ b/tarantool.txt @@ -14,6 +14,7 @@ 'uri': 'git@github.com:tarantool/gentoo-overlay.git'}], 'status': 'unofficial'} $ pmaint sync tarantool +*** syncing tarantool warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -28,7 +29,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing tarantool *** synced tarantool * Sync succeeded $ git log --format=%ci -1 diff --git a/tastytea.html b/tastytea.html index b2ea97113b66..e6818d9a0018 100644 --- a/tastytea.html +++ b/tastytea.html @@ -32,35 +32,35 @@ </pre></td></tr> <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync tastytea </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>*** syncing tastytea </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>invocation. + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Already up to date. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** syncing tastytea + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced tastytea </pre></td></tr> diff --git a/tastytea.txt b/tastytea.txt index 702716ccf216..562674b5c3fc 100644 --- a/tastytea.txt +++ b/tastytea.txt @@ -9,6 +9,7 @@ 'uri': 'https://schlomp.space/tastytea/overlay.git'}], 'status': 'unofficial'} $ pmaint sync tastytea +*** syncing tastytea warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -23,7 +24,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing tastytea *** synced tastytea * Sync succeeded $ git log --format=%ci -1 diff --git a/tatsh-overlay.html b/tatsh-overlay.html index 51844ddffa4a..9d6358183ef7 100644 --- a/tatsh-overlay.html +++ b/tatsh-overlay.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync tatsh-overlay </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing tatsh-overlay </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing tatsh-overlay + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced tatsh-overlay </pre></td></tr> diff --git a/tatsh-overlay.txt b/tatsh-overlay.txt index 4be7a77be8e8..9b2740b86897 100644 --- a/tatsh-overlay.txt +++ b/tatsh-overlay.txt @@ -12,6 +12,7 @@ 'uri': 'git+ssh://git@github.com/Tatsh/tatsh-overlay.git'}], 'status': 'unofficial'} $ pmaint sync tatsh-overlay +*** syncing tatsh-overlay warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing tatsh-overlay *** synced tatsh-overlay * Sync succeeded $ git log --format=%ci -1 diff --git a/telans.html b/telans.html index cc3930559e33..b7dfd3ea67a4 100644 --- a/telans.html +++ b/telans.html @@ -28,35 +28,35 @@ </pre></td></tr> <tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre>$ pmaint sync telans </pre></td></tr> - <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>*** syncing telans </pre></td></tr> - <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>invocation. + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>Already up to date. + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>*** syncing telans + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>*** synced telans </pre></td></tr> diff --git a/telans.txt b/telans.txt index 437088b1eac2..baa3cc137ef8 100644 --- a/telans.txt +++ b/telans.txt @@ -7,6 +7,7 @@ 'source': [{'type': 'git', 'uri': 'https://github.com/telans/EBUILDS.git'}], 'status': 'unofficial'} $ pmaint sync telans +*** syncing telans warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -21,7 +22,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing telans *** synced telans * Sync succeeded $ git log --format=%ci -1 diff --git a/tengine-overlay.html b/tengine-overlay.html index 22cf0cce7ebe..b9d8ec53123a 100644 --- a/tengine-overlay.html +++ b/tengine-overlay.html @@ -34,35 +34,35 @@ </pre></td></tr> <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync tengine-overlay </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing tengine-overlay </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing tengine-overlay + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced tengine-overlay </pre></td></tr> diff --git a/tengine-overlay.txt b/tengine-overlay.txt index d8ad317b3872..386573fd5ea8 100644 --- a/tengine-overlay.txt +++ b/tengine-overlay.txt @@ -10,6 +10,7 @@ 'uri': 'https://github.com/damex/tengine-overlay.git'}], 'status': 'unofficial'} $ pmaint sync tengine-overlay +*** syncing tengine-overlay warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -24,7 +25,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing tengine-overlay *** synced tengine-overlay * Sync succeeded $ git log --format=%ci -1 diff --git a/tf201.html b/tf201.html index bf456477cc84..38988a294dd2 100644 --- a/tf201.html +++ b/tf201.html @@ -26,35 +26,35 @@ </pre></td></tr> <tr class="" id="l8"><td><a href="#l8"><span>8</span></a></td><td><pre>$ pmaint sync tf201 </pre></td></tr> - <tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre>*** syncing tf201 </pre></td></tr> - <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>invocation. + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>Already up to date. + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>*** syncing tf201 + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>*** synced tf201 </pre></td></tr> diff --git a/tf201.txt b/tf201.txt index 7d6820f035ed..7bdb805e6e20 100644 --- a/tf201.txt +++ b/tf201.txt @@ -6,6 +6,7 @@ 'source': [{'type': 'git', 'uri': 'https://github.com/Tux1c/tf201-overlay'}], 'status': 'unofficial'} $ pmaint sync tf201 +*** syncing tf201 warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -20,7 +21,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing tf201 *** synced tf201 * Sync succeeded $ git log --format=%ci -1 diff --git a/tgbugs-overlay.html b/tgbugs-overlay.html index 3eb9462783f6..3189e473f2d8 100644 --- a/tgbugs-overlay.html +++ b/tgbugs-overlay.html @@ -40,35 +40,35 @@ </pre></td></tr> <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync tgbugs-overlay </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing tgbugs-overlay </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing tgbugs-overlay + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced tgbugs-overlay </pre></td></tr> diff --git a/tgbugs-overlay.txt b/tgbugs-overlay.txt index 42e64e43c444..f8ddb1be3802 100644 --- a/tgbugs-overlay.txt +++ b/tgbugs-overlay.txt @@ -13,6 +13,7 @@ {'type': 'git', 'uri': 'git@github.com:tgbugs/tgbugs-overlay.git'}], 'status': 'unofficial'} $ pmaint sync tgbugs-overlay +*** syncing tgbugs-overlay warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -27,7 +28,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing tgbugs-overlay *** synced tgbugs-overlay * Sync succeeded $ git log --format=%ci -1 diff --git a/thabairne.html b/thabairne.html index 84234a10945b..57c797f85740 100644 --- a/thabairne.html +++ b/thabairne.html @@ -34,35 +34,35 @@ </pre></td></tr> <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync thabairne </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing thabairne </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing thabairne + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced thabairne </pre></td></tr> diff --git a/thabairne.txt b/thabairne.txt index d9e86314e519..7b72866aa490 100644 --- a/thabairne.txt +++ b/thabairne.txt @@ -10,6 +10,7 @@ 'uri': 'https://github.com/ntnn/gentoo-thabairne.git'}], 'status': 'unofficial'} $ pmaint sync thabairne +*** syncing thabairne warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -24,7 +25,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing thabairne *** synced thabairne * Sync succeeded $ git log --format=%ci -1 diff --git a/thegreatmcpain.html b/thegreatmcpain.html index daaa7f4a640d..01d47175f6d8 100644 --- a/thegreatmcpain.html +++ b/thegreatmcpain.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync thegreatmcpain </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing thegreatmcpain </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing thegreatmcpain + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced thegreatmcpain </pre></td></tr> diff --git a/thegreatmcpain.txt b/thegreatmcpain.txt index 446758f5d451..4da22177d0b5 100644 --- a/thegreatmcpain.txt +++ b/thegreatmcpain.txt @@ -12,6 +12,7 @@ 'uri': 'git@gitlab.com:TheGreatMcPain/thegreatmcpain-overlay.git'}], 'status': 'unofficial'} $ pmaint sync thegreatmcpain +*** syncing thegreatmcpain warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing thegreatmcpain *** synced thegreatmcpain * Sync succeeded $ git log --format=%ci -1 diff --git a/tmacedo.html b/tmacedo.html index 41375dfb8310..f78e11b0467a 100644 --- a/tmacedo.html +++ b/tmacedo.html @@ -32,35 +32,35 @@ </pre></td></tr> <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync tmacedo </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>*** syncing tmacedo </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>invocation. + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Already up to date. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** syncing tmacedo + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced tmacedo </pre></td></tr> diff --git a/tmacedo.txt b/tmacedo.txt index f5b90c6b3929..61799bcc4e0f 100644 --- a/tmacedo.txt +++ b/tmacedo.txt @@ -9,6 +9,7 @@ 'source': [{'type': 'git', 'uri': 'git://github.com/tmacedo/portage.git'}], 'status': 'unofficial'} $ pmaint sync tmacedo +*** syncing tmacedo warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -23,7 +24,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing tmacedo *** synced tmacedo * Sync succeeded $ git log --format=%ci -1 diff --git a/tocaro.html b/tocaro.html index abf2d13c8dbb..7739c89c4a1d 100644 --- a/tocaro.html +++ b/tocaro.html @@ -40,35 +40,35 @@ </pre></td></tr> <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync tocaro </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing tocaro </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing tocaro + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced tocaro </pre></td></tr> diff --git a/tocaro.txt b/tocaro.txt index 6d4c91a7315d..ef7f9ccdc43b 100644 --- a/tocaro.txt +++ b/tocaro.txt @@ -13,6 +13,7 @@ 'uri': 'git+ssh://git@git.gentoo.org/user/tocaro.git'}], 'status': 'unofficial'} $ pmaint sync tocaro +*** syncing tocaro warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -27,7 +28,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing tocaro *** synced tocaro * Sync succeeded $ git log --format=%ci -1 diff --git a/toniz4-overlay.html b/toniz4-overlay.html index aceae82266d1..12a1fe3e7aa4 100644 --- a/toniz4-overlay.html +++ b/toniz4-overlay.html @@ -42,35 +42,35 @@ </pre></td></tr> <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync toniz4-overlay </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing toniz4-overlay </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing toniz4-overlay + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced toniz4-overlay </pre></td></tr> diff --git a/toniz4-overlay.txt b/toniz4-overlay.txt index 5bbdb9ab182c..8ad5e4306cc9 100644 --- a/toniz4-overlay.txt +++ b/toniz4-overlay.txt @@ -14,6 +14,7 @@ 'uri': 'git+ssh://git@github.com:toniz4/toniz4-overlay.git'}], 'status': 'unofficial'} $ pmaint sync toniz4-overlay +*** syncing toniz4-overlay warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -28,7 +29,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing toniz4-overlay *** synced toniz4-overlay * Sync succeeded $ git log --format=%ci -1 diff --git a/toolchain.html b/toolchain.html index 800b7ecade84..a6a156b1f836 100644 --- a/toolchain.html +++ b/toolchain.html @@ -42,35 +42,35 @@ </pre></td></tr> <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync toolchain </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing toolchain </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing toolchain + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced toolchain </pre></td></tr> diff --git a/toolchain.txt b/toolchain.txt index f1fdd0c3ebd0..06e2bb91032f 100644 --- a/toolchain.txt +++ b/toolchain.txt @@ -14,6 +14,7 @@ 'uri': 'git+ssh://git@git.gentoo.org/proj/toolchain.git'}], 'status': 'official'} $ pmaint sync toolchain +*** syncing toolchain warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -28,7 +29,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing toolchain *** synced toolchain * Sync succeeded $ git log --format=%ci -1 diff --git a/torbrowser.html b/torbrowser.html index fa52041de34b..3ff4a606da19 100644 --- a/torbrowser.html +++ b/torbrowser.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync torbrowser </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing torbrowser </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing torbrowser + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced torbrowser </pre></td></tr> diff --git a/torbrowser.txt b/torbrowser.txt index dd5e84617c65..a538147868fc 100644 --- a/torbrowser.txt +++ b/torbrowser.txt @@ -12,6 +12,7 @@ 'uri': 'git@github.com:MeisterP/torbrowser-overlay.git'}], 'status': 'unofficial'} $ pmaint sync torbrowser +*** syncing torbrowser warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing torbrowser *** synced torbrowser * Sync succeeded $ git log --format=%ci -1 diff --git a/trolltoo.html b/trolltoo.html index 52c980783341..02863c0bb69c 100644 --- a/trolltoo.html +++ b/trolltoo.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync trolltoo </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing trolltoo </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing trolltoo + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced trolltoo </pre></td></tr> diff --git a/trolltoo.txt b/trolltoo.txt index 9f6aa7d02534..84aa513e0a7b 100644 --- a/trolltoo.txt +++ b/trolltoo.txt @@ -12,6 +12,7 @@ 'uri': 'git+ssh://git@github.com/dallenwilson/trolltoo.git'}], 'status': 'unofficial'} $ pmaint sync trolltoo +*** syncing trolltoo warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing trolltoo *** synced trolltoo * Sync succeeded $ git log --format=%ci -1 diff --git a/tryton.html b/tryton.html index ff21270386ea..bad2897193ab 100644 --- a/tryton.html +++ b/tryton.html @@ -28,13 +28,13 @@ </pre></td></tr> <tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre>$ pmaint sync tryton </pre></td></tr> - <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>pulling from https://hg.tryton.org/tryton-overlay + <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>*** syncing tryton </pre></td></tr> - <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>searching for changes + <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>pulling from https://hg.tryton.org/tryton-overlay </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>no changes found + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>searching for changes </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing tryton + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>no changes found </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** synced tryton </pre></td></tr> diff --git a/tryton.txt b/tryton.txt index 2d6168a6b166..574f68e5e8a5 100644 --- a/tryton.txt +++ b/tryton.txt @@ -7,10 +7,10 @@ 'uri': 'https://hg.tryton.org/tryton-overlay'}], 'status': 'unofficial'} $ pmaint sync tryton +*** syncing tryton pulling from https://hg.tryton.org/tryton-overlay searching for changes no changes found -*** syncing tryton *** synced tryton * Sync succeeded $ hg log -l 1 --template={date|isodatesec} diff --git a/twister.html b/twister.html index ce21c526b61d..f67c65ccc7ae 100644 --- a/twister.html +++ b/twister.html @@ -42,35 +42,35 @@ </pre></td></tr> <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync twister </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing twister </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing twister + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced twister </pre></td></tr> diff --git a/twister.txt b/twister.txt index a19086842303..974928f83def 100644 --- a/twister.txt +++ b/twister.txt @@ -14,6 +14,7 @@ 'uri': 'git@github.com:ddorian1/gentoo-twister-overlay.git'}], 'status': 'unofficial'} $ pmaint sync twister +*** syncing twister warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -28,7 +29,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing twister *** synced twister * Sync succeeded $ git log --format=%ci -1 @@ -40,35 +40,35 @@ </pre></td></tr> <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync ulm </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing ulm </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing ulm + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced ulm </pre></td></tr> @@ -13,6 +13,7 @@ 'uri': 'git+ssh://git@git.gentoo.org/repo/dev/ulm.git'}], 'status': 'official'} $ pmaint sync ulm +*** syncing ulm warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -27,7 +28,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing ulm *** synced ulm * Sync succeeded $ git log --format=%ci -1 diff --git a/ultrabug.html b/ultrabug.html index 5e918f5bbca4..7fc63850ac80 100644 --- a/ultrabug.html +++ b/ultrabug.html @@ -40,35 +40,35 @@ </pre></td></tr> <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync ultrabug </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing ultrabug </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing ultrabug + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced ultrabug </pre></td></tr> diff --git a/ultrabug.txt b/ultrabug.txt index 9aa9d7cc6832..2554e05904c7 100644 --- a/ultrabug.txt +++ b/ultrabug.txt @@ -13,6 +13,7 @@ 'uri': 'git+ssh://git@git.gentoo.org/dev/ultrabug.git'}], 'status': 'official'} $ pmaint sync ultrabug +*** syncing ultrabug warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -27,7 +28,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing ultrabug *** synced ultrabug * Sync succeeded $ git log --format=%ci -1 diff --git a/unc3nsored.html b/unc3nsored.html index 3d5a44a62d8d..388d9244a893 100644 --- a/unc3nsored.html +++ b/unc3nsored.html @@ -34,35 +34,35 @@ </pre></td></tr> <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync unc3nsored </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing unc3nsored </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing unc3nsored + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced unc3nsored </pre></td></tr> diff --git a/unc3nsored.txt b/unc3nsored.txt index 2c3ad323b9c8..96e930ac1ecd 100644 --- a/unc3nsored.txt +++ b/unc3nsored.txt @@ -10,6 +10,7 @@ 'uri': 'https://github.com/xxc3nsoredxx/unc3nsored.git'}], 'status': 'unofficial'} $ pmaint sync unc3nsored +*** syncing unc3nsored warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -24,7 +25,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing unc3nsored *** synced unc3nsored * Sync succeeded $ git log --format=%ci -1 diff --git a/unity-gentoo.html b/unity-gentoo.html index 3b9827446997..e378d283ae15 100644 --- a/unity-gentoo.html +++ b/unity-gentoo.html @@ -36,35 +36,35 @@ </pre></td></tr> <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync unity-gentoo </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing unity-gentoo </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** syncing unity-gentoo + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced unity-gentoo </pre></td></tr> diff --git a/unity-gentoo.txt b/unity-gentoo.txt index d558025be0ba..d8937cce5614 100644 --- a/unity-gentoo.txt +++ b/unity-gentoo.txt @@ -11,6 +11,7 @@ 'uri': 'git://github.com/shiznix/unity-gentoo.git'}], 'status': 'unofficial'} $ pmaint sync unity-gentoo +*** syncing unity-gentoo warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -25,7 +26,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing unity-gentoo *** synced unity-gentoo * Sync succeeded $ git log --format=%ci -1 diff --git a/usenet-overlay.html b/usenet-overlay.html index ec773bb06e57..73c3898fa2e9 100644 --- a/usenet-overlay.html +++ b/usenet-overlay.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync usenet-overlay </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing usenet-overlay </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing usenet-overlay + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced usenet-overlay </pre></td></tr> diff --git a/usenet-overlay.txt b/usenet-overlay.txt index fbf572f50c4a..518c4fe69cb4 100644 --- a/usenet-overlay.txt +++ b/usenet-overlay.txt @@ -12,6 +12,7 @@ 'uri': 'git+ssh://git@github.com/xartin/gentoo-overlay.git'}], 'status': 'unofficial'} $ pmaint sync usenet-overlay +*** syncing usenet-overlay warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing usenet-overlay *** synced usenet-overlay * Sync succeeded $ git log --format=%ci -1 diff --git a/vampire.html b/vampire.html index ab0acd0c28f5..d720aecc7dfc 100644 --- a/vampire.html +++ b/vampire.html @@ -40,35 +40,35 @@ </pre></td></tr> <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync vampire </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing vampire </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing vampire + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced vampire </pre></td></tr> diff --git a/vampire.txt b/vampire.txt index 3feb19ba3b85..ec108f4dc48e 100644 --- a/vampire.txt +++ b/vampire.txt @@ -13,6 +13,7 @@ 'uri': 'git://github.com/TheCrueltySage/vampire-overlay.git'}], 'status': 'unofficial'} $ pmaint sync vampire +*** syncing vampire warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -27,7 +28,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing vampire *** synced vampire * Sync succeeded $ git log --format=%ci -1 diff --git a/vapoursynth.html b/vapoursynth.html index 25d2d646a228..0bf80a825109 100644 --- a/vapoursynth.html +++ b/vapoursynth.html @@ -30,35 +30,35 @@ </pre></td></tr> <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>$ pmaint sync vapoursynth </pre></td></tr> - <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>*** syncing vapoursynth </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>invocation. + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>Already up to date. + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>*** syncing vapoursynth + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** synced vapoursynth </pre></td></tr> diff --git a/vapoursynth.txt b/vapoursynth.txt index 1e984290ea35..a1ba414c11c6 100644 --- a/vapoursynth.txt +++ b/vapoursynth.txt @@ -8,6 +8,7 @@ 'uri': 'https://github.com/4re/vapoursynth-portage.git'}], 'status': 'unofficial'} $ pmaint sync vapoursynth +*** syncing vapoursynth warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -22,7 +23,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing vapoursynth *** synced vapoursynth * Sync succeeded $ git log --format=%ci -1 diff --git a/vayerx.html b/vayerx.html index 624ec0c5cdc1..7157f77d763a 100644 --- a/vayerx.html +++ b/vayerx.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync vayerx </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing vayerx </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing vayerx + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced vayerx </pre></td></tr> diff --git a/vayerx.txt b/vayerx.txt index bcb5a77bf0b0..bbb7326d82d7 100644 --- a/vayerx.txt +++ b/vayerx.txt @@ -12,6 +12,7 @@ {'type': 'git', 'uri': 'git@github.com:vayerx/vayerx-gentoo.git'}], 'status': 'unofficial'} $ pmaint sync vayerx +*** syncing vayerx warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing vayerx *** synced vayerx * Sync succeeded $ git log --format=%ci -1 diff --git a/vdr-devel.html b/vdr-devel.html index cb729c6130c4..ed91077adf61 100644 --- a/vdr-devel.html +++ b/vdr-devel.html @@ -42,35 +42,35 @@ </pre></td></tr> <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync vdr-devel </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing vdr-devel </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing vdr-devel + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced vdr-devel </pre></td></tr> diff --git a/vdr-devel.txt b/vdr-devel.txt index 3030c6762174..ce0b1f2b29cd 100644 --- a/vdr-devel.txt +++ b/vdr-devel.txt @@ -14,6 +14,7 @@ 'uri': 'git+ssh://git@git.gentoo.org/proj/vdr/devel.git'}], 'status': 'official'} $ pmaint sync vdr-devel +*** syncing vdr-devel warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -28,7 +29,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing vdr-devel *** synced vdr-devel * Sync succeeded $ git log --format=%ci -1 diff --git a/vifino-overlay.html b/vifino-overlay.html index ee982406d29c..7b75fc522b7d 100644 --- a/vifino-overlay.html +++ b/vifino-overlay.html @@ -40,35 +40,35 @@ </pre></td></tr> <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync vifino-overlay </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing vifino-overlay </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing vifino-overlay + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced vifino-overlay </pre></td></tr> diff --git a/vifino-overlay.txt b/vifino-overlay.txt index b0f4462d7de7..0c36a782c4d4 100644 --- a/vifino-overlay.txt +++ b/vifino-overlay.txt @@ -13,6 +13,7 @@ {'type': 'git', 'uri': 'git@github.com:vifino/vifino-overlay.git'}], 'status': 'unofficial'} $ pmaint sync vifino-overlay +*** syncing vifino-overlay warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -27,7 +28,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing vifino-overlay *** synced vifino-overlay * Sync succeeded $ git log --format=%ci -1 diff --git a/vklimovs.html b/vklimovs.html index 019be01d428a..b450463d8175 100644 --- a/vklimovs.html +++ b/vklimovs.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync vklimovs </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing vklimovs </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing vklimovs + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced vklimovs </pre></td></tr> diff --git a/vklimovs.txt b/vklimovs.txt index fe881afef31a..51935739a2df 100644 --- a/vklimovs.txt +++ b/vklimovs.txt @@ -12,6 +12,7 @@ 'uri': 'git+ssh://git@github.com/vklimovs/portage-overlay.git'}], 'status': 'unofficial'} $ pmaint sync vklimovs +*** syncing vklimovs warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing vklimovs *** synced vklimovs * Sync succeeded $ git log --format=%ci -1 diff --git a/vmacs.html b/vmacs.html index 86ce92ef57e1..f964e442df37 100644 --- a/vmacs.html +++ b/vmacs.html @@ -40,35 +40,35 @@ </pre></td></tr> <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync vmacs </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing vmacs </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing vmacs + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced vmacs </pre></td></tr> diff --git a/vmacs.txt b/vmacs.txt index 82100ff3383e..a23697a8d284 100644 --- a/vmacs.txt +++ b/vmacs.txt @@ -13,6 +13,7 @@ 'uri': 'git+ssh://git@git.gentoo.org/user/vmacs.git'}], 'status': 'unofficial'} $ pmaint sync vmacs +*** syncing vmacs warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -27,7 +28,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing vmacs *** synced vmacs * Sync succeeded $ git log --format=%ci -1 diff --git a/vortex.html b/vortex.html index b068fe9ae317..ed796ddb6d8b 100644 --- a/vortex.html +++ b/vortex.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync vortex </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing vortex </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing vortex + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced vortex </pre></td></tr> diff --git a/vortex.txt b/vortex.txt index 77746cb2a3a2..b2e89ab82bfa 100644 --- a/vortex.txt +++ b/vortex.txt @@ -12,6 +12,7 @@ 'uri': 'git://github.com/nE0sIghT/vortex-overlay.git'}], 'status': 'unofficial'} $ pmaint sync vortex +*** syncing vortex warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing vortex *** synced vortex * Sync succeeded $ git log --format=%ci -1 diff --git a/vowstar.html b/vowstar.html index dbad1a60885a..b02a1eb9e4e4 100644 --- a/vowstar.html +++ b/vowstar.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync vowstar </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing vowstar </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing vowstar + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced vowstar </pre></td></tr> diff --git a/vowstar.txt b/vowstar.txt index 43f6b203a7fe..bd4b81c600da 100644 --- a/vowstar.txt +++ b/vowstar.txt @@ -12,6 +12,7 @@ 'uri': 'git@github.com:vowstar/vowstar-overlay.git'}], 'status': 'unofficial'} $ pmaint sync vowstar +*** syncing vowstar warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing vowstar *** synced vowstar * Sync succeeded $ git log --format=%ci -1 diff --git a/voyageur.html b/voyageur.html index 7aae536b6e7d..6b6616826a6d 100644 --- a/voyageur.html +++ b/voyageur.html @@ -30,35 +30,35 @@ </pre></td></tr> <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>$ pmaint sync voyageur </pre></td></tr> - <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>*** syncing voyageur </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>invocation. + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>Already up to date. + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>*** syncing voyageur + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** synced voyageur </pre></td></tr> diff --git a/voyageur.txt b/voyageur.txt index 0cd2623f2783..c6855ee6b6f0 100644 --- a/voyageur.txt +++ b/voyageur.txt @@ -8,6 +8,7 @@ 'uri': 'https://cafarelli.fr/git/voyageur-overlay/'}], 'status': 'official'} $ pmaint sync voyageur +*** syncing voyageur warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -22,7 +23,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing voyageur *** synced voyageur * Sync succeeded $ git log --format=%ci -1 diff --git a/waebbl.html b/waebbl.html index d969970f6dcb..2c7ca2c3db25 100644 --- a/waebbl.html +++ b/waebbl.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync waebbl </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing waebbl </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing waebbl + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced waebbl </pre></td></tr> diff --git a/waebbl.txt b/waebbl.txt index 37a80c60201e..d5a659e2d151 100644 --- a/waebbl.txt +++ b/waebbl.txt @@ -12,6 +12,7 @@ 'uri': 'git+ssh://git@github.com/waebbl/waebbl-gentoo.git'}], 'status': 'unofficial'} $ pmaint sync waebbl +*** syncing waebbl warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing waebbl *** synced waebbl * Sync succeeded $ git log --format=%ci -1 diff --git a/waffle-builds.html b/waffle-builds.html index 42aa0beb08a0..bcce32994595 100644 --- a/waffle-builds.html +++ b/waffle-builds.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync waffle-builds </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing waffle-builds </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing waffle-builds + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced waffle-builds </pre></td></tr> diff --git a/waffle-builds.txt b/waffle-builds.txt index 193e436ba689..8142ec73f157 100644 --- a/waffle-builds.txt +++ b/waffle-builds.txt @@ -12,6 +12,7 @@ 'uri': 'git+ssh://git@github.com/FlyingWaffleDev/waffle-builds.git'}], 'status': 'unofficial'} $ pmaint sync waffle-builds +*** syncing waffle-builds warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing waffle-builds *** synced waffle-builds * Sync succeeded $ git log --format=%ci -1 diff --git a/wayland-desktop.html b/wayland-desktop.html index 467c63270b04..0f3993a03de4 100644 --- a/wayland-desktop.html +++ b/wayland-desktop.html @@ -36,35 +36,35 @@ </pre></td></tr> <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync wayland-desktop </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing wayland-desktop </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** syncing wayland-desktop + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced wayland-desktop </pre></td></tr> diff --git a/wayland-desktop.txt b/wayland-desktop.txt index e7bc6c3389a1..c0116e5c5a66 100644 --- a/wayland-desktop.txt +++ b/wayland-desktop.txt @@ -11,6 +11,7 @@ 'uri': 'git+ssh://git@github.com/bsd-ac/wayland-desktop.git'}], 'status': 'unofficial'} $ pmaint sync wayland-desktop +*** syncing wayland-desktop warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -25,7 +26,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing wayland-desktop *** synced wayland-desktop * Sync succeeded $ git log --format=%ci -1 diff --git a/wbrana.html b/wbrana.html index c1dbc75992bd..ab22887ed52e 100644 --- a/wbrana.html +++ b/wbrana.html @@ -40,35 +40,35 @@ </pre></td></tr> <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync wbrana </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing wbrana </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing wbrana + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced wbrana </pre></td></tr> diff --git a/wbrana.txt b/wbrana.txt index fb7d9f8002de..ab0a44670d22 100644 --- a/wbrana.txt +++ b/wbrana.txt @@ -13,6 +13,7 @@ 'uri': 'git+ssh://git@git.gentoo.org/user/wbrana.git'}], 'status': 'unofficial'} $ pmaint sync wbrana +*** syncing wbrana warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -27,7 +28,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing wbrana *** synced wbrana * Sync succeeded $ git log --format=%ci -1 diff --git a/wdzierzan.html b/wdzierzan.html index d7377373eb03..267764a4e0a4 100644 --- a/wdzierzan.html +++ b/wdzierzan.html @@ -42,35 +42,35 @@ </pre></td></tr> <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync wdzierzan </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing wdzierzan </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing wdzierzan + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced wdzierzan </pre></td></tr> diff --git a/wdzierzan.txt b/wdzierzan.txt index 9c69103aa5a0..d220dee7843b 100644 --- a/wdzierzan.txt +++ b/wdzierzan.txt @@ -14,6 +14,7 @@ 'uri': 'git+ssh://git@git.gentoo.org/user/wdzierzan.git'}], 'status': 'unofficial'} $ pmaint sync wdzierzan +*** syncing wdzierzan warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -28,7 +29,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing wdzierzan *** synced wdzierzan * Sync succeeded $ git log --format=%ci -1 diff --git a/webos.html b/webos.html index ddb4e4d87f86..64644212d84a 100644 --- a/webos.html +++ b/webos.html @@ -40,35 +40,35 @@ </pre></td></tr> <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync webos </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing webos </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing webos + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced webos </pre></td></tr> diff --git a/webos.txt b/webos.txt index 5420d4b5d41c..a8d031681d80 100644 --- a/webos.txt +++ b/webos.txt @@ -13,6 +13,7 @@ {'type': 'git', 'uri': 'git@github.com:feniksa/webos-overlay.git'}], 'status': 'unofficial'} $ pmaint sync webos +*** syncing webos warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -27,7 +28,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing webos *** synced webos * Sync succeeded $ git log --format=%ci -1 diff --git a/weuxel.html b/weuxel.html index 93ba90e6e773..7b5efa0bd9ae 100644 --- a/weuxel.html +++ b/weuxel.html @@ -40,35 +40,35 @@ </pre></td></tr> <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync weuxel </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing weuxel </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing weuxel + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced weuxel </pre></td></tr> diff --git a/weuxel.txt b/weuxel.txt index cd9de4a5f284..673d7e678eef 100644 --- a/weuxel.txt +++ b/weuxel.txt @@ -13,6 +13,7 @@ {'type': 'git', 'uri': 'git@github.com:Weuxel/portage-weuxel.git'}], 'status': 'unofficial'} $ pmaint sync weuxel +*** syncing weuxel warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -27,7 +28,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing weuxel *** synced weuxel * Sync succeeded $ git log --format=%ci -1 diff --git a/what4-java.html b/what4-java.html index a28c7dae210d..657861a013eb 100644 --- a/what4-java.html +++ b/what4-java.html @@ -34,35 +34,35 @@ </pre></td></tr> <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync what4-java </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing what4-java </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing what4-java + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced what4-java </pre></td></tr> diff --git a/what4-java.txt b/what4-java.txt index a7537d7a7074..5e8ece8e219f 100644 --- a/what4-java.txt +++ b/what4-java.txt @@ -10,6 +10,7 @@ 'uri': 'https://github.com/kwhat/gentoo-what4-java-overlay.git'}], 'status': 'unofficial'} $ pmaint sync what4-java +*** syncing what4-java warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -24,7 +25,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing what4-java *** synced what4-java * Sync succeeded $ git log --format=%ci -1 diff --git a/wichtounet.html b/wichtounet.html index 8ed91c27fc46..ddede668cecf 100644 --- a/wichtounet.html +++ b/wichtounet.html @@ -42,35 +42,35 @@ </pre></td></tr> <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync wichtounet </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing wichtounet </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing wichtounet + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced wichtounet </pre></td></tr> diff --git a/wichtounet.txt b/wichtounet.txt index 8ef025e2c242..a1965f52e543 100644 --- a/wichtounet.txt +++ b/wichtounet.txt @@ -14,6 +14,7 @@ 'uri': 'git@github.com:wichtounet/wichtounet-overlay.git'}], 'status': 'unofficial'} $ pmaint sync wichtounet +*** syncing wichtounet warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -28,7 +29,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing wichtounet *** synced wichtounet * Sync succeeded $ git log --format=%ci -1 diff --git a/wine.html b/wine.html index 909cee73526e..d46194cabe4f 100644 --- a/wine.html +++ b/wine.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync wine </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing wine </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing wine + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced wine </pre></td></tr> @@ -12,6 +12,7 @@ 'uri': 'git://anongit.gentoo.org/repo/proj/wine.git'}], 'status': 'official'} $ pmaint sync wine +*** syncing wine warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing wine *** synced wine * Sync succeeded $ git log --format=%ci -1 diff --git a/winny.html b/winny.html index b879e812ca9b..d446ca9e49f2 100644 --- a/winny.html +++ b/winny.html @@ -34,35 +34,35 @@ </pre></td></tr> <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync winny </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing winny </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing winny + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced winny </pre></td></tr> diff --git a/winny.txt b/winny.txt index 0c5f01b0b2c4..c3de0ff0d965 100644 --- a/winny.txt +++ b/winny.txt @@ -10,6 +10,7 @@ 'uri': 'git+ssh://git@github.com/winny-/winny-overlay.git'}], 'status': 'unofficial'} $ pmaint sync winny +*** syncing winny warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -24,7 +25,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing winny *** synced winny * Sync succeeded $ git log --format=%ci -1 diff --git a/wjn-overlay.html b/wjn-overlay.html index 21d97c3bf9a6..2553dcd408d1 100644 --- a/wjn-overlay.html +++ b/wjn-overlay.html @@ -28,35 +28,35 @@ </pre></td></tr> <tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre>$ pmaint sync wjn-overlay </pre></td></tr> - <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>*** syncing wjn-overlay </pre></td></tr> - <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>invocation. + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>Already up to date. + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>*** syncing wjn-overlay + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>*** synced wjn-overlay </pre></td></tr> diff --git a/wjn-overlay.txt b/wjn-overlay.txt index 7ae50bf817d2..f0f69c328660 100644 --- a/wjn-overlay.txt +++ b/wjn-overlay.txt @@ -7,6 +7,7 @@ 'uri': 'https://bitbucket.org/wjn/wjn-overlay.git'}], 'status': 'unofficial'} $ pmaint sync wjn-overlay +*** syncing wjn-overlay warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -21,7 +22,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing wjn-overlay *** synced wjn-overlay * Sync succeeded $ git log --format=%ci -1 diff --git a/wuodan.html b/wuodan.html index a69d68efe3b9..8c6c5d6c3e81 100644 --- a/wuodan.html +++ b/wuodan.html @@ -38,35 +38,35 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync wuodan </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing wuodan </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing wuodan + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced wuodan </pre></td></tr> diff --git a/wuodan.txt b/wuodan.txt index fdc3bc8c3530..36eaa8118b65 100644 --- a/wuodan.txt +++ b/wuodan.txt @@ -12,6 +12,7 @@ 'uri': 'git+ssh://git@github.com/Wuodan/gentoo-overlay.git'}], 'status': 'unofficial'} $ pmaint sync wuodan +*** syncing wuodan warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -26,7 +27,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing wuodan *** synced wuodan * Sync succeeded $ git log --format=%ci -1 @@ -36,35 +36,35 @@ </pre></td></tr> <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync x11 </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing x11 </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** syncing x11 + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced x11 </pre></td></tr> @@ -11,6 +11,7 @@ 'uri': 'git+ssh://git@git.gentoo.org/proj/x11.git'}], 'status': 'official'} $ pmaint sync x11 +*** syncing x11 warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -25,7 +26,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing x11 *** synced x11 * Sync succeeded $ git log --format=%ci -1 diff --git a/xdch47.html b/xdch47.html index 539776bd2a6b..c6ac8d14b1c6 100644 --- a/xdch47.html +++ b/xdch47.html @@ -34,35 +34,35 @@ </pre></td></tr> <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync xdch47 </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing xdch47 </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing xdch47 + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced xdch47 </pre></td></tr> diff --git a/xdch47.txt b/xdch47.txt index ce176fb66d6f..42f53120e21d 100644 --- a/xdch47.txt +++ b/xdch47.txt @@ -10,6 +10,7 @@ 'uri': 'git+ssh://git@github.com/xdch47/gpo-xdch47.git'}], 'status': 'unofficial'} $ pmaint sync xdch47 +*** syncing xdch47 warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -24,7 +25,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing xdch47 *** synced xdch47 * Sync succeeded $ git log --format=%ci -1 diff --git a/xelnor.html b/xelnor.html index d432144d860a..720820ee1f0b 100644 --- a/xelnor.html +++ b/xelnor.html @@ -26,35 +26,35 @@ </pre></td></tr> <tr class="" id="l8"><td><a href="#l8"><span>8</span></a></td><td><pre>$ pmaint sync xelnor </pre></td></tr> - <tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre>*** syncing xelnor </pre></td></tr> - <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>invocation. + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>Already up to date. + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>*** syncing xelnor + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>*** synced xelnor </pre></td></tr> diff --git a/xelnor.txt b/xelnor.txt index c516a41a9a2a..07e1b05b6bd6 100644 --- a/xelnor.txt +++ b/xelnor.txt @@ -6,6 +6,7 @@ 'source': [{'type': 'git', 'uri': 'git://overlay.xelnor.net/overlay.git'}], 'status': 'unofficial'} $ pmaint sync xelnor +*** syncing xelnor warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -20,7 +21,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing xelnor *** synced xelnor * Sync succeeded $ git log --format=%ci -1 diff --git a/xoreos.html b/xoreos.html index 8c99696938f6..b567292332be 100644 --- a/xoreos.html +++ b/xoreos.html @@ -42,35 +42,35 @@ </pre></td></tr> <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync xoreos </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing xoreos </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing xoreos + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced xoreos </pre></td></tr> diff --git a/xoreos.txt b/xoreos.txt index 1d3cb26bb4b5..6d76c3f2fb53 100644 --- a/xoreos.txt +++ b/xoreos.txt @@ -14,6 +14,7 @@ 'uri': 'git+ssh://git@github.com/xoreos/gentoo-overlay.git'}], 'status': 'unofficial'} $ pmaint sync xoreos +*** syncing xoreos warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -28,7 +29,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing xoreos *** synced xoreos * Sync succeeded $ git log --format=%ci -1 diff --git a/xwing.html b/xwing.html index ffd3e31073ac..e1c96da816d5 100644 --- a/xwing.html +++ b/xwing.html @@ -40,101 +40,59 @@ </pre></td></tr> <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync xwing </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>This is xwing.info / alderaan.xwing.info + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing xwing </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>This is xwing.info / alderaan.xwing.info </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>Contact Name : webmaster@xwing.info + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>Contact Name : webmaster@xwing.info </pre></td></tr> <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>Number of files: 1 (reg: 1) + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>Number of created files: 0 + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>Number of files: 1 (reg: 1) </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>Number of deleted files: 0 + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>Number of created files: 0 </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>Number of regular files transferred: 1 + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>Number of deleted files: 0 </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Total file size: 32 bytes + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Number of regular files transferred: 1 </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Total transferred file size: 32 bytes + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Total file size: 32 bytes </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Literal data: 32 bytes + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Total transferred file size: 32 bytes </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Matched data: 0 bytes + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Literal data: 32 bytes </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>File list size: 47 + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Matched data: 0 bytes </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>File list generation time: 0.001 seconds + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>File list size: 47 </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>File list transfer time: 0.000 seconds + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>File list generation time: 0.001 seconds </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Total bytes sent: 85 + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>File list transfer time: 0.000 seconds </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>Total bytes received: 133 + <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>Total bytes sent: 85 </pre></td></tr> - <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> + <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>Total bytes received: 133 </pre></td></tr> - <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>sent 85 bytes received 133 bytes 87.20 bytes/sec + <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>total size is 32 speedup is 0.15 + <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>sent 85 bytes received 133 bytes 87.20 bytes/sec </pre></td></tr> - <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>This is xwing.info / alderaan.xwing.info + <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>total size is 32 speedup is 0.15 </pre></td></tr> - <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> + <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>*** synced xwing </pre></td></tr> - <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>Contact Name : webmaster@xwing.info + <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * Sync succeeded </pre></td></tr> - <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> + <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>$ stat --format=%y . </pre></td></tr> - <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> + <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 xwing </pre></td></tr> - <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>Number of files: 183 (reg: 121, dir: 62) -</pre></td></tr> - <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>Number of created files: 0 -</pre></td></tr> - <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>Number of deleted files: 0 -</pre></td></tr> - <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>Number of regular files transferred: 26 -</pre></td></tr> - <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>Total file size: 143.62K bytes -</pre></td></tr> - <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>Total transferred file size: 33.64K bytes -</pre></td></tr> - <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>Literal data: 33.64K bytes -</pre></td></tr> - <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>Matched data: 0 bytes -</pre></td></tr> - <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>File list size: 6.00K -</pre></td></tr> - <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>File list generation time: 0.001 seconds -</pre></td></tr> - <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>File list transfer time: 0.000 seconds -</pre></td></tr> - <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>Total bytes sent: 670 -</pre></td></tr> - <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>Total bytes received: 24.67K -</pre></td></tr> - <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> -</pre></td></tr> - <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>sent 670 bytes received 24.67K bytes 10.13K bytes/sec -</pre></td></tr> - <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>total size is 143.62K speedup is 5.67 -</pre></td></tr> - <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>*** syncing xwing -</pre></td></tr> - <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>*** synced xwing -</pre></td></tr> - <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> * Sync succeeded -</pre></td></tr> - <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre>$ stat --format=%y . -</pre></td></tr> - <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 xwing -</pre></td></tr> - <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre> * Cache regenerated successfully + <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * Cache regenerated successfully </pre></td></tr> </table> diff --git a/xwing.txt b/xwing.txt index 0fd97d0045db..78c220cf65a3 100644 --- a/xwing.txt +++ b/xwing.txt @@ -13,6 +13,7 @@ 'uri': 'rsync://gentoo.xwing.info/xwing-overlay'}], 'status': 'unofficial'} $ pmaint sync xwing +*** syncing xwing This is xwing.info / alderaan.xwing.info Contact Name : webmaster@xwing.info @@ -34,28 +35,6 @@ Total bytes received: 133 sent 85 bytes received 133 bytes 87.20 bytes/sec total size is 32 speedup is 0.15 -This is xwing.info / alderaan.xwing.info - -Contact Name : webmaster@xwing.info - - -Number of files: 183 (reg: 121, dir: 62) -Number of created files: 0 -Number of deleted files: 0 -Number of regular files transferred: 26 -Total file size: 143.62K bytes -Total transferred file size: 33.64K bytes -Literal data: 33.64K bytes -Matched data: 0 bytes -File list size: 6.00K -File list generation time: 0.001 seconds -File list transfer time: 0.000 seconds -Total bytes sent: 670 -Total bytes received: 24.67K - -sent 670 bytes received 24.67K bytes 10.13K bytes/sec -total size is 143.62K speedup is 5.67 -*** syncing xwing *** synced xwing * Sync succeeded $ stat --format=%y . diff --git a/yandex.html b/yandex.html index 10747e51124c..8a647a5e1346 100644 --- a/yandex.html +++ b/yandex.html @@ -44,35 +44,35 @@ </pre></td></tr> <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync yandex </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing yandex </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date. + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** syncing yandex + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced yandex </pre></td></tr> diff --git a/yandex.txt b/yandex.txt index fe051fe7687e..710a8ff910b1 100644 --- a/yandex.txt +++ b/yandex.txt @@ -15,6 +15,7 @@ {'type': 'git', 'uri': 'git@github.com:yandex-gentoo/overlay.git'}], 'status': 'unofficial'} $ pmaint sync yandex +*** syncing yandex warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -29,7 +30,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing yandex *** synced yandex * Sync succeeded $ git log --format=%ci -1 diff --git a/yoreek.html b/yoreek.html index d3717abd6368..13229062f2f8 100644 --- a/yoreek.html +++ b/yoreek.html @@ -36,35 +36,35 @@ </pre></td></tr> <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync yoreek </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing yoreek </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** syncing yoreek + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced yoreek </pre></td></tr> diff --git a/yoreek.txt b/yoreek.txt index 9a210d143b82..5235603dee94 100644 --- a/yoreek.txt +++ b/yoreek.txt @@ -11,6 +11,7 @@ 'uri': 'git+ssh://git@git.gentoo.org/user/yoreek.git'}], 'status': 'unofficial'} $ pmaint sync yoreek +*** syncing yoreek warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -25,7 +26,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing yoreek *** synced yoreek * Sync succeeded $ git log --format=%ci -1 diff --git a/youbroketheinternet.html b/youbroketheinternet.html index 8e29a2b13f8d..7083d43b3e3f 100644 --- a/youbroketheinternet.html +++ b/youbroketheinternet.html @@ -58,37 +58,37 @@ </pre></td></tr> <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>$ pmaint sync youbroketheinternet </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>*** syncing youbroketheinternet </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>invocation. + <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> + <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>warning: redirecting to https://git.gnunet.org/youbroketheinternet-overlay.git/ + <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>Already up to date. + <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>warning: redirecting to https://git.gnunet.org/youbroketheinternet-overlay.git/ </pre></td></tr> - <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>*** syncing youbroketheinternet + <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>*** synced youbroketheinternet </pre></td></tr> diff --git a/youbroketheinternet.txt b/youbroketheinternet.txt index 5fee174a1b9a..d8980a19e26d 100644 --- a/youbroketheinternet.txt +++ b/youbroketheinternet.txt @@ -22,6 +22,7 @@ 'uri': 'git://gnunet.org/youbroketheinternet-overlay.git'}], 'status': 'unofficial'} $ pmaint sync youbroketheinternet +*** syncing youbroketheinternet warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -37,7 +38,6 @@ invocation. warning: redirecting to https://git.gnunet.org/youbroketheinternet-overlay.git/ Already up to date. -*** syncing youbroketheinternet *** synced youbroketheinternet * Sync succeeded $ git log --format=%ci -1 diff --git a/yurij-overlay.html b/yurij-overlay.html index e7329e019cff..d1387327c40b 100644 --- a/yurij-overlay.html +++ b/yurij-overlay.html @@ -42,35 +42,35 @@ </pre></td></tr> <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync yurij-overlay </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing yurij-overlay </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing yurij-overlay + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced yurij-overlay </pre></td></tr> diff --git a/yurij-overlay.txt b/yurij-overlay.txt index f4a943a432a5..603870ee057d 100644 --- a/yurij-overlay.txt +++ b/yurij-overlay.txt @@ -14,6 +14,7 @@ 'uri': 'git@github.com:yurijmikhalevich/yurij-overlay.git'}], 'status': 'unofficial'} $ pmaint sync yurij-overlay +*** syncing yurij-overlay warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -28,7 +29,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing yurij-overlay *** synced yurij-overlay * Sync succeeded $ git log --format=%ci -1 diff --git a/yuzu-overlay.html b/yuzu-overlay.html index 9482bbdff672..d8a3fe6b3cde 100644 --- a/yuzu-overlay.html +++ b/yuzu-overlay.html @@ -44,35 +44,35 @@ </pre></td></tr> <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync yuzu-overlay </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing yuzu-overlay </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date. + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** syncing yuzu-overlay + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced yuzu-overlay </pre></td></tr> diff --git a/yuzu-overlay.txt b/yuzu-overlay.txt index 70a292c407f7..577cf1a63055 100644 --- a/yuzu-overlay.txt +++ b/yuzu-overlay.txt @@ -15,6 +15,7 @@ 'uri': 'git@github.com:Alex-Aralis/yuzu-overlay.git'}], 'status': 'unofficial'} $ pmaint sync yuzu-overlay +*** syncing yuzu-overlay warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -29,7 +30,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing yuzu-overlay *** synced yuzu-overlay * Sync succeeded $ git log --format=%ci -1 diff --git a/zerodaysfordays.html b/zerodaysfordays.html index f0ee015113a8..8f0a98ef075d 100644 --- a/zerodaysfordays.html +++ b/zerodaysfordays.html @@ -30,35 +30,35 @@ </pre></td></tr> <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>$ pmaint sync zerodaysfordays </pre></td></tr> - <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>*** syncing zerodaysfordays </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>invocation. + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>Already up to date. + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>*** syncing zerodaysfordays + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** synced zerodaysfordays </pre></td></tr> diff --git a/zerodaysfordays.txt b/zerodaysfordays.txt index ed4c0c9f4c1c..2ab922e4ea70 100644 --- a/zerodaysfordays.txt +++ b/zerodaysfordays.txt @@ -8,6 +8,7 @@ 'source': [{'type': 'git', 'uri': 'https://git.sr.ht/~jakob/zerodaysfordays'}], 'status': 'unofficial'} $ pmaint sync zerodaysfordays +*** syncing zerodaysfordays warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -22,7 +23,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing zerodaysfordays *** synced zerodaysfordays * Sync succeeded $ git log --format=%ci -1 diff --git a/zscheile.html b/zscheile.html index 78e1658505fd..a1ee176d341e 100644 --- a/zscheile.html +++ b/zscheile.html @@ -42,35 +42,35 @@ </pre></td></tr> <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync zscheile </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing zscheile </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing zscheile + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced zscheile </pre></td></tr> diff --git a/zscheile.txt b/zscheile.txt index a9ef1bbda429..7b15f16bfc47 100644 --- a/zscheile.txt +++ b/zscheile.txt @@ -14,6 +14,7 @@ 'uri': 'git@github.com:zseri/portage-zscheile.git'}], 'status': 'unofficial'} $ pmaint sync zscheile +*** syncing zscheile warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -28,7 +29,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing zscheile *** synced zscheile * Sync succeeded $ git log --format=%ci -1 diff --git a/zugaina.html b/zugaina.html index 2b03abaed448..90ce3ec513e3 100644 --- a/zugaina.html +++ b/zugaina.html @@ -28,43 +28,43 @@ </pre></td></tr> <tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre>$ pmaint sync zugaina </pre></td></tr> - <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre> + <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>*** syncing zugaina </pre></td></tr> <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>Number of files: 1,813 (reg: 1,423, dir: 390) + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>Number of created files: 0 + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>Number of files: 1,813 (reg: 1,423, dir: 390) </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>Number of deleted files: 0 + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>Number of created files: 0 </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>Number of regular files transferred: 0 + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>Number of deleted files: 0 </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>Total file size: 2.19M bytes + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>Number of regular files transferred: 0 </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>Total transferred file size: 0 bytes + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>Total file size: 2.19M bytes </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>Literal data: 0 bytes + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>Total transferred file size: 0 bytes </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>Matched data: 0 bytes + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>Literal data: 0 bytes </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>File list size: 44.81K + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>Matched data: 0 bytes </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>File list generation time: 0.001 seconds + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>File list size: 42.21K </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>File list transfer time: 0.000 seconds + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>File list generation time: 0.001 seconds </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>Total bytes sent: 503 + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>File list transfer time: 0.000 seconds </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>Total bytes received: 46.56K + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>Total bytes sent: 495 </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Total bytes received: 46.56K </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>sent 503 bytes received 46.56K bytes 18.82K bytes/sec + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>total size is 2.19M speedup is 46.53 + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>sent 495 bytes received 46.56K bytes 13.44K bytes/sec </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** syncing zugaina + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>total size is 2.19M speedup is 46.53 </pre></td></tr> <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced zugaina </pre></td></tr> diff --git a/zugaina.txt b/zugaina.txt index 76f27ae11563..941dd66a3c8f 100644 --- a/zugaina.txt +++ b/zugaina.txt @@ -7,6 +7,7 @@ 'uri': 'rsync://gentoo.zugaina.org/zugaina-portage'}], 'status': 'unofficial'} $ pmaint sync zugaina +*** syncing zugaina Number of files: 1,813 (reg: 1,423, dir: 390) @@ -17,15 +18,14 @@ Total file size: 2.19M bytes Total transferred file size: 0 bytes Literal data: 0 bytes Matched data: 0 bytes -File list size: 44.81K +File list size: 42.21K File list generation time: 0.001 seconds File list transfer time: 0.000 seconds -Total bytes sent: 503 +Total bytes sent: 495 Total bytes received: 46.56K -sent 503 bytes received 46.56K bytes 18.82K bytes/sec +sent 495 bytes received 46.56K bytes 13.44K bytes/sec total size is 2.19M speedup is 46.53 -*** syncing zugaina *** synced zugaina * Sync succeeded $ stat --format=%y . diff --git a/zx2c4.html b/zx2c4.html index 2a6cfcaef754..d15e78830f73 100644 --- a/zx2c4.html +++ b/zx2c4.html @@ -36,35 +36,35 @@ </pre></td></tr> <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync zx2c4 </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing zx2c4 </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** syncing zx2c4 + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced zx2c4 </pre></td></tr> diff --git a/zx2c4.txt b/zx2c4.txt index 1c686c062f61..869933793f08 100644 --- a/zx2c4.txt +++ b/zx2c4.txt @@ -11,6 +11,7 @@ {'type': 'git', 'uri': 'ssh://git@git.zx2c4.com/portage'}], 'status': 'official'} $ pmaint sync zx2c4 +*** syncing zx2c4 warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -25,7 +26,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing zx2c4 *** synced zx2c4 * Sync succeeded $ git log --format=%ci -1 diff --git a/zyrenth.html b/zyrenth.html index 18126d3285dc..15a07b11518a 100644 --- a/zyrenth.html +++ b/zyrenth.html @@ -42,35 +42,35 @@ </pre></td></tr> <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync zyrenth </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing zyrenth </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing zyrenth + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date. </pre></td></tr> <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced zyrenth </pre></td></tr> diff --git a/zyrenth.txt b/zyrenth.txt index 0d3e4f7ba906..6d24fc0a271f 100644 --- a/zyrenth.txt +++ b/zyrenth.txt @@ -14,6 +14,7 @@ 'uri': 'git@github.com:kabili207/zyrenth-overlay.git'}], 'status': 'unofficial'} $ pmaint sync zyrenth +*** syncing zyrenth warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -28,7 +29,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing zyrenth *** synced zyrenth * Sync succeeded $ git log --format=%ci -1 |