~armagetronad-dev/armagetronad/+git/ubuntu-packaging:ubuntu-bionic-0.4-vanilla

Last commit made on 2020-06-06
Get this branch:
git clone -b ubuntu-bionic-0.4-vanilla https://git.launchpad.net/~armagetronad-dev/armagetronad/+git/ubuntu-packaging

Branch merges

Branch information

Name:
ubuntu-bionic-0.4-vanilla
Repository:
lp:~armagetronad-dev/armagetronad/+git/ubuntu-packaging

Recent commits

65225d9... by Manuel Moos

Merge branch 'ubuntu-bionic-0.2.8-vanilla' into ubuntu-bionic-0.4-vanilla

1b8a6b7... by Manuel Moos

Merge branch 'ubuntu-bionic-0.2.8.3-vanilla' into ubuntu-bionic-0.2.8-vanilla

4490889... by Manuel Moos

Merge from master

591601d... by Manuel Moos

Merge from main legacy_0.2.8

2b37478... by Manuel Moos

Merge from main legacy_0.2.8.3

724e8b6... by Manuel Moos

Merge from 0.2.8

Docker documentation
Git handling for versioning and merges

37151f3... by Manuel Moos

Merge from 0.2.8.3

Docker documentation
Git handling for versioning and merges

42965a6... by Manuel Moos

Update the index before checking for modifications

Else, files with changed date, but identical content, will
look like they have been modified.

b6e263c... by Manuel Moos

Test for git existence with 'test -e'

For external work trees, it is just a file.

d2ae3fd... by Manuel Moos

Refuse to merge/ff if the branch has local changes