diff options
author | Repository mirror & CI <repomirrorci@gentoo.org> | 2021-03-16 17:50:50 +0000 |
---|---|---|
committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2021-03-16 17:50:50 +0000 |
commit | 35d8c44244b81d318bb52b9a3984864cd593902f (patch) | |
tree | 9425dfee3fdabc1394d77fd8a6c05bbd0e439731 /stuff.html | |
parent | 2021-03-16T17:15:01Z (diff) | |
download | repos-35d8c44244b81d318bb52b9a3984864cd593902f.tar.gz repos-35d8c44244b81d318bb52b9a3984864cd593902f.tar.bz2 repos-35d8c44244b81d318bb52b9a3984864cd593902f.zip |
2021-03-16T17:45:01Z
Diffstat (limited to 'stuff.html')
-rw-r--r-- | stuff.html | 30 |
1 files changed, 15 insertions, 15 deletions
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> |