vine77

Create a branch on the upstream repository that contains only the history of a subdirectory, now with that subdirectory at the root.

cd ~/src/design-system/
git subtree split --prefix=packages/react-workflow --branch=react-workflow

Import from the branch created above into a subdirectory of the main repository. Note: The prefix for this subdirectory doesn't have to be the same as that used

vine77

[alias]
  lg = "!f() { orgrepo=$(git remote -v | grep 'upstream.*fetch' | sed -E 's/.*github\\.com[:\\/]([^\\. ]+).*/\\1/' | sed -E 's/\\//\\\\\\//'); git log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit | sed -E \"s/Merge pull request #/Merge PR http:\\/\\/github.com\\/$orgrepo\\/pull\\//\"; }; f"

vine77

git log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit | sed -E "s/Merge pull request #/Merge PR http:\/\/github.com\/$(git remote -v | grep 'upstream.*fetch' | sed -E 's/.*github\.com[:\/]([^\. ]+).*/\1/' | sed -E 's/\//\\\//')\/pull\//"

vine77

var locations = {
  morning: [{
    route: 17,
    locID: 6849
  }, {
    route: 290,
    locID: 13714
  }],
  evening: [{
    route: 17,

vine77

import Ember from 'ember';

export default Ember.Controller.extend({
  appName: 'Next TriMet Arrival',
  minutes: Ember.computed('model.scheduled', function () {
    return Math.floor((new Date(this.get('model.scheduled')) - new Date()) / 60000);
  })
});

vine77

import Ember from 'ember';
// Imports: Use the app's name as the namespace
import foo from 'twiddle/lib/foo'

export default Ember.Controller.extend({
  appName: 'Ember Twiddle',
  message: Ember.computed(foo)
});

vine77

import Ember from 'ember';
import Person from '../ddau-objects/person';
import Name from '../ddau-objects/name';

const presets = [
  Person.create({
    firstName: Name.create({value: 'John'}),
    lastName: Name.create({value: 'Doe'})
  }),
  Person.create({

vine77

import Ember from 'ember';

export default Ember.Route.extend({
  model() {
    return Ember.RSVP.hashSettled({
      first: new Ember.RSVP.Promise(function (resolve) {
        window.setTimeout(function () {
          resolve('Hello world!');
        }, 1500);
      }),

vine77

import Ember from 'ember';

export default Ember.Controller.extend({
  appName:'Ember Twiddle'
});

vine77

import Ember from 'ember';

export default Ember.Route.extend({
  model: function () {
    return {
      id: 'hello2020'
    };
  }
});