so I can find them here later: Fast-forward merge Some people like to git pull, but I never do. That brings new stuff from origin and then merges. I always do these do steps separately: git fetch and then either merge or rebase. The easy case, when I don’t have any local-only commits, is to …
TL;DR: gci -r -fi <filename-pattern> My favorite use of find in bash is to find files whose name matches a pattern. For instance, find all the jar files under this directory: bash# find . -name ‘*.jar’ In PowerShell, there’s a program called “find” but it ain’t the same program. Short Answer Instead, use Get-ChildItem. The …
TL;DR – Remove-Item -Recurse -Force <path> On linuxy systems, rm -rf <path> means “remove this path and everything under it, dammit.” If the files aren’t writeable, but you own the files, it deletes them anyway. In PowerShell, rm is aliased to Remove-Item, but it doesn’t accept -rf. Windows Terminal> rm -rf fooRemove-Item : A parameter …
Git tries to help translate line endings between operating systems with different standards. This gets sooo frustrating. Here’s what I always want: On Windows: git config –global core.autocrlf inputThis says, “If I commit a file with the wrong line endings, fix it before other people notice.” Otherwise, leave it alone. On Linux, Mac, etc: git …
I’ve been frustrated every time I try to grasp CSS for years. “I just want this on the left and this to be over here!” etc. Now I realize that CSS doesn’t work that way for very good reasons. In most programming, we give instructions for what we want to happen. But in CSS, it’s …
My objective is to run some services on Pivotal Web Services (PWS; hosted instance of Pivotal Cloud Foundry), and have them respond to requests to `https://survey.atomist.com` at various paths. Currently these services run on AWS, along with services that respond at other subdomains of atomist.com. TL;DR: this is easy enough for HTTP requests and prohibitively …
Read moreMigrating some services from AWS to Pivotal Web Services
To quickly move to the root of the current git repository, I set up this alias: git config –global alias.home ‘rev-parse –show-toplevel’ Now, git home prints the full path to the root directory of the current project. To go there, type (Mac/Linux only) cd `git home` Notice the backticks. They’re not single quotes. This executes the command and then uses …
Ah, command line tools, they’re so fast. And so easy to use on a Mac. Given a bunch of image files in the same dimensions, that you want to crop to a fixed portion of the image: 1) Install imagemagick brew install imagemagick 2) put all the images in a directory by themselves, and cd …
Read moreCropping a bunch of pictures to the same dimensions
It’s time to clean out some old branches from the team’s git repository. In memory of them, I record useful tricks here. First, Sharon’s post talks about finding branches that are ripe for deletion, by detecting branches already merged. This post covers those, plus how to find out more about the others. This post is …
How much data can our Hadoop instance hold, and how can I make it hold more? Architectural Background Hadoop is a lot of things, and one of those is a distributed, abstracted file system. It’s called HDFS (for “hadoop distributed file system,” maybe), and it has its uses. HDFS isn’t a file system in the …