2. My Two Favorite Git Aliases →

    Definitely handy – I’ve added them to my .gitconfig. (note the double-encoded ampersands should simply be & instead of &)

    UPDATE: Here is a Gist with some of my favorite alises – including incoming and outgoing that will use the currently checked out branch against the matching origin branch (no longer hard coded to master):


    [alias]
    up = "pull –rebase"
    pullmerge = "pull –no-rebase"
    subup = "!f() { git submodule sync; git submodule update –init –recursive; }; f"
    subreset = "submodule foreach 'git reset –hard HEAD'"
    who = shortlog -s —
    lg = log –graph –pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' –abbrev-commit –date=relative
    info = remote -v
    incoming = !(git fetch –quiet && git log –pretty=format:'%C(yellow)%h %C(white)- %C(red)%an %C(white)- %C(cyan)%d%Creset %s %C(white)- %ar%Creset' ..@{u})
    outgoing = !(git fetch –quiet && git log –pretty=format:'%C(yellow)%h %C(white)- %C(red)%an %C(white)- %C(cyan)%d%Creset %s %C(white)- %ar%Creset' @{u}..)

    view raw

    .gitconfig

    hosted with ❤ by GitHub

    This post is part of the thread: Version Control – an ongoing story on this site. View the thread timeline for more context on this post.

    1 Reply

  3. Siri, Focus My Attention →

    Great post by Evan. I learned long ago as a BlackBerry user to turn off notifications for everything except:

    1. phone calls
    2. SMS / text messages
    3. calendar alerts

    My phone rarely buzzes, but when it does I probably need to pay attention to it. The rest of the time it’s on me to choose to look at it (for new email, tweets, etc.) or not.

    1 Reply

  6. Email Reply Checklist

    Stuck on how to reply to an email? Here’s the mental checklist I use: Re-read the email a second time, without an emotion reaction. What was the real purpose of the incoming email? (informative, question, request for action, express frustration/anger/etc.) What type of response is needed? (simple reply, take some action then reply, ask for…

    2 Replies

  8. To: Family & Friends

    Date: August 13, 2013

    Subject: Chemo #11

    Hi Everyone– I’m very glad that this is the next-to-last treatment in this round of chemo! Nothing too exciting to report. The side-effects and fatigue are piling up a bit as expected – the chemo has a cumulative effect, but everything is still manageable. There aren’t too many surprises about the process, effects, etc. at…

    Continued…

  9. You can make a new friend but you can’t make an old one.

    — Tom Bodett