gistfile1.txt

➜  shipit git:(main) git log -n1 | cat
commit 906563cf58ffcc57643c0bd936c80ef1c6dc70bb (HEAD -> main, upstream/main)
Author: Aki Sasaki <[email protected]>
Date:   Fri Feb 12 10:31:12 2021 -0800

    move bforehand to normandy team (#632)
➜  shipit git:(main) # i don't have the latest changes, so i'll pull them
➜  shipit git:(main) git pull upstream main # pull the latest changes from upstream (mozilla-releng)'s main branch to my local one
hint: Pulling without specifying how to reconcile divergent branches is
hint: discouraged. You can squelch this message by running one of the following
hint: commands sometime before your next pull:
hint: 
hint:   git config pull.rebase false  # merge (the default strategy)
hint:   git config pull.rebase true   # rebase
hint:   git config pull.ff only       # fast-forward only
hint: 
hint: You can replace "git config" with "git config --global" to set a default
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
hint: or --ff-only on the command line to override the configured default per
hint: invocation.
remote: Enumerating objects: 32, done.
remote: Counting objects: 100% (32/32), done.
remote: Compressing objects: 100% (14/14), done.
remote: Total 35 (delta 20), reused 21 (delta 18), pack-reused 3
Unpacking objects: 100% (35/35), 11.52 KiB | 347.00 KiB/s, done.
From github.com:mozilla-releng/shipit
 * branch            main       -> FETCH_HEAD
   906563c..81cbd25  main       -> upstream/main
Updating 906563c..81cbd25
Fast-forward
 api/src/shipit_api/admin/api.yml           | 36 ++++++++++++++++++++++++++++++++++++
 api/src/shipit_api/admin/github.py         | 48 ++++++++++++++++++++++++++++++++----------------
 api/src/shipit_api/admin/settings.py       |  1 +
 api/src/shipit_api/common/config.py        | 16 ++++++++--------
 docker-compose.yml                         |  4 ++--
 frontend/src/components/vcs.js             |  9 +++++++--
 frontend/src/configs/dev.js                |  4 ++--
 frontend/src/configs/development.js        |  4 ++--
 frontend/src/configs/master.js             |  4 ++--
 frontend/src/views/NewXPIRelease/index.jsx |  5 +++--
 10 files changed, 95 insertions(+), 36 deletions(-)
➜  shipit git:(main) git log -n1 # check to make sure the latest one i have is jmaher's
➜  shipit git:(main) git log -n1 # check to make sure the latest one i have is jmaher's

➜  shipit git:(main) git log -n1 | cat # check to make sure the latest one i have is jmaher's

commit 81cbd258b14c6bd7d490aba1d1a1b6cc1154b70f (HEAD -> main, upstream/main)
Author: Joel Maher <[email protected]>
Date:   Fri Apr 2 13:03:45 2021 -0700

    Adjust shipit to use  repos instead of  repos (#680)
➜  shipit git:(main) git push -n upstream main:production # push my local 'main' branch to upstream's 'production' branch
To github.com:mozilla-releng/shipit.git
   e05f559..81cbd25  main -> production
➜  shipit git:(main) git log e05f559..81cbd25 | cat # check what commits would be pushed                 
commit 81cbd258b14c6bd7d490aba1d1a1b6cc1154b70f (HEAD -> main, upstream/main)
Author: Joel Maher <[email protected]>
Date:   Fri Apr 2 13:03:45 2021 -0700

    Adjust shipit to use  repos instead of  repos (#680)
➜  shipit git:(main) git push -n upstream
➜  shipit git:(main) git push upstream main:production # do the push
Total 0 (delta 0), reused 0 (delta 0), pack-reused 0
remote: 
remote: GitHub found 18 vulnerabilities on mozilla-releng/shipit's default branch (2 high, 10 moderate, 6 low). To find out more, visit:
remote:      https://github.com/mozilla-releng/shipit/security/dependabot
remote: 
To github.com:mozilla-releng/shipit.git
   e05f559..81cbd25  main -> production