It’s been 2 years since I’ve had a proper company holiday party to attend! I enjoyed getting together with other entrepreneurs and my friends at @crosscampusla yesterday. It officially feels like Christmas in LA. 🥳
#DontBeAfraidOfTheTerminal ___ Last week, I shared several ways to edit the author or email of a commit in different scenarios. Today, I'll show a more advanced technique using git interactive rebase! Interactive rebase can be used for many other actions as well, not JUST fixing the author and email. It is worth mentioning that git interactive rebase is a very powerful tool and is essentially used to rewrite your git history. Before you do any kind of rebasing, make sure you aren't impacting a shared/highly collaborative branch (unless your team knows what's happening and is ok with the rebase) and possibly practice a few times on test branches until you are comfortable with the workflow of rebasing! ___ Interactive rebase is kind of like a rewind and replay workflow. You start with the last "good" commit you know (rewind), and then re-apply the commits one-by-one (replay), making any changes that you missed the first time around or are otherwise necessary. ___ So... let's say you need to fix the author/email for your last 4 commits. Here's how to use git interactive rebase to fix that: ___ git rebase -i HEAD~4 - First, we need to rewind back 4 commits. So we initiate the git rebase command with the interactive (-i) flag. Then we pass the PARENT of the last commit we want to edit. In our case that's HEAD~4. 💡Pro tip: It may be easier to remember that the ~4 means you want to edit the last 4 commits, but it's worth noting that you're actually specifying 5 commits ago. Just an FYI 🙂) ___ Once you run this command, you'll enter text editor mode with lots of options. At the top, you'll see the last 4 commits (commit hash and commit message) you've designated in chronological order. You'll also notice that each commit has the word "pick" before them. These are the commands that will be executed for each commit. If you read the description, you'll see that the "pick" command essentially means "use this commit as-is, make no changes". Since, however, we do want to change something for each commit (the author and email) we should change the "pick" commands to the "edit" commands. (Continued in comments!)...
First quarterly event @theinfluxlab took place over the weekend. New post, link in bio! Cover image by @scottlistfield Featuring TED-style talks, #immersive #tech demos and #digital #art installations With @highfidelityinc @moonbloom_ar @magicleap @jauntxr @noctvrnal_vr @zerosystemimmersivemusic @kevinmackart @thewavevr @empactlabs @_marrythemoon_ @freethebid @mindshow @4thwallapp and more . . . #VR #AR #techblog
Always having fun sharing my stories at DevFest! . . . #developerart #innovator #engineer #engineeringlife #womenintech #womenwhocode #womentechmakers #googledevelopers #googledevexpert #gamedev #mahattanbeach #gde #programmer #programming #devfestLA #devfest #productdesign #coderlife #programmerrepublic #LA #publicspeaker #publicspeaking #presenter #crosscampus #gdg #googledeveloper #downtownLA #devfest18 #devfest2018 #peoplewhocode
@moonbloom_ar First experience with @magicleap @theinfluxlab, helping the little fox Luna to save the planet Adara from becoming forever lost. An interactive and gamified narrative with free roam AR! Multiplayer will be so much fun! . . . #vr #AR #magicleap #digital #game #techblog