jks@feddit.nltoTechnology@beehaw.org•Google reminds us that Google Chat can be used with friends and familyEnglish
1·
1 year agoThe article says
Just to recap: Google Talk (gchat) > Google Hangouts > Hangouts Chat > Google Chat
but of course that’s only part of the story. Here’s a longer recap from 2021.
Not exactly an alias but a short script. First, get git-revise which is a replacement for
git rebase
, and fzf if for some reason you don’t have it yet. Then make a script in your~/.local/bin
calledgit-f
or whatever you’d like:#!/bin/bash REF=${1:-origin/main} # adjust to your favorite trunk branch name COMMIT=$(git log --pretty=oneline ${REF}.. \ | fzf --preview "git show -p --stat {+1}" | cut -d' ' -f1) if [ -n "$COMMIT" ]; then exec git revise "$COMMIT" else exit 1 fi
Now hack away in a branch, make some commits, and at some point you will realize you want to modify an earlier commit. Use
git add -p
to add the relevant lines, but then instead of making a fixup commit just typegit f
and pick the target commit from the list.