diff options
| author | Juuso Lapinlampi <wub@partyvan.eu> | 2016-01-21 14:34:05 +0100 |
|---|---|---|
| committer | Juuso Lapinlampi <wub@partyvan.eu> | 2016-01-21 14:34:05 +0100 |
| commit | 7217269eca509ef9a0db65171c5dd9c0a8fd13d4 (patch) | |
| tree | 16ce2447d387213f83c0cef4f1763984f9cf491f /static/favicon.ico | |
| parent | f9355878744516f61ba59a74bd1990bad3c7af5a (diff) | |
| parent | 968ade81751d661399a54bc3cb2526d606f3b659 (diff) | |
Merge branch 'maint'
Sanity merge. Instead of merging feature branches to both maint and
master, we should merge them to maint and then merge maint to master as
per gitworkflows(7).
This makes sure the branches are in sync and there will be no issues
later on. It also simplifies git-log(1) with --graph.
Fixes disperancy with `git log master..maint`, which should not list any
commits. My fault.
Diffstat (limited to 'static/favicon.ico')
0 files changed, 0 insertions, 0 deletions