[haiku-development] Re: [haiku] Subversion to Git migration scheduled for November 12, 2011

  • From: Travis Geiselbrecht <geist@xxxxxxxxxx>
  • To: haiku-development@xxxxxxxxxxxxx
  • Date: Thu, 3 Nov 2011 17:47:22 -0700

On Thu, Nov 3, 2011 at 10:36 AM, Ryan Leavengood <leavengood@xxxxxxxxx> wrote:
> Those are great. I'm also a big fan of shell aliases to really make
> things fast. The oh-my-zsh system
> (https://github.com/robbyrussell/oh-my-zsh) which I use in Linux (and
> will try to set up on Haiku eventually) comes with several out of the
> box:
>
> alias g='git'
> alias gst='git status'
> alias gl='git pull'
> alias gup='git fetch && git rebase'
> alias gp='git push'
> alias gd='git diff | mate'
> alias gdv='git diff -w "$@" | vim -R -'
> alias gc='git commit -v'
> alias gca='git commit -v -a'
> alias gb='git branch'
> alias gba='git branch -a'
> alias gcount='git shortlog -sn'
> alias gcp='git cherry-pick'
>
> Plus I add my own (overriding the above gd):
>
> alias gpr='git pull --rebase'
> alias ga='git add'
> alias gd='git diff'
> alias gdc='git diff --cached'
> alias gco='git checkout'
>
> I mostly use gst, gd, gdc, ga, gco and gp. As far as I know these
> don't conflict with any programs on any system.

These are great. Interesting that we actually have the same ones for
about half of these.

Here are a few more

alias gru='git remote update --prune'
alias grc='git rebase --continue'

Good to see you're using 'git pull --rebase' and in general using a
'rebase your local branch on the upstream branch instead of creating a
merge commit' strategy to dealing with local branches, especially
before pushing upstream. It's a bit more conceptually difficult, but
it's much nicer on the main repository when there aren't any more
extraneous merge commits than necessary. I don't know if this should
be the official policy, but it's one I've maintained at work for a few
years and it generally works well.

Travis

Other related posts:

  1. Home
  2. haiku-development
  3. Archive
  4. 11-2011