propellor

propellor config for hosts.
git clone git://git.ricketyspace.net/propellor.git
Log | Files | Refs | LICENSE

comment_7_de411d55ffbd72c5a4182168dead6b29._comment (719B)


      1 [[!comment format=mdwn
      2  username="s@aa9ff9ce06b08acfd2a93ebd342ce6879430fbdd"
      3  nickname="s"
      4  avatar="http://cdn.libravatar.org/avatar/81bf27f8b35011d1846711fa37a5588f"
      5  subject="comment 7"
      6  date="2019-06-06T03:13:02Z"
      7  content="""
      8 Documenting it (in case there is another user who wishes to do the same):
      9 
     10 Add upstream repo and fetch tags:
     11 
     12 ```
     13 $ cd ~/.propellor
     14 
     15 $ git remote add u git://propellor.branchable.com/propellor
     16 $ git fetch u --tags
     17 ```
     18 
     19 Look for the list releases:
     20 
     21 ```
     22 $ git tag -l
     23 0.1
     24 0.1.1
     25 0.1.2
     26 0.2.0
     27 0.2.1
     28 ...
     29 ...
     30 ...
     31 X.Y.Z
     32 ```
     33 
     34 To merge release `X.Y.Z` into your master branch, do:
     35 
     36 ```
     37 $ git merge -X theirs --allow-unrelated-histories X.Y.Z
     38 ```
     39 
     40 Fix any conflicts and:
     41 
     42 ```
     43 $ git commit
     44 ```
     45 
     46 """]]