maff

rebase --onto

• we have a master
• we have a feature branch feat-xyz
• we do a bugfix on branch bug-abc but branched from feat-xyz instead of master and want to rebase our bugfix branch to contain only commits from master + our bugfix branch

$ (bug-abc) git rebase --onto master feat-xyz

maff

Keybase proof

I hereby claim:

• I am maff on github.
• I am maffibk (https://keybase.io/maffibk) on keybase.
• I have a public key ASC2IrNbz7is8UPMNMqZ9t7yEO9u9dnYRbbAoTFoAPIDUgo

To claim this, I am signing this object:

maff

$(document).ready(function() {
    var Processor = (function() {
        var currentSection = 0;

        var languageMapping = {
            php: 'PHP',
            twig: 'Twig',
            yml: 'YAML',
            yaml: 'YAML',
            unknown: 'Code'

maff

---
ip: "10.0.85.15"
memory: 2048
cpus: 1
provider: virtualbox
name: pimcore5vagrant

authorize: ~/.ssh/id_rsa.pub

keys:

maff

#!/usr/bin/env bash

# macOS sierra needs an UseKeychain yes SSH config entry in order to use the
# Keychain to store key passphrases. This scripts checks your .ssh/config for
# the existence of such a config entry and prepends the following entry if
# nothing is found:
#
# Host *
#     UseKeychain yes