Keeping a local branch up to date

cool git aliases

[alias]
	st = status
	c = commit -m
	aa = add -A
	fa = fetch --all
	co = checkout
	pu = clean -dfx
	cu = !git fetch --all && git pull --rebase origin && git submodule update
	new = checkout -b
	done = !git fetch && git rebase origin/master && git checkout master && git merge @{-1} && rake && git push

gistfile1.txt

Yuck 

git checkout master; 
git pull origin master; 
git checkout working; 
git rebase master; 
git checkout master; 
git merge working; 
git checkout working

This is basically what I do as well... Seems tedious, but keeps the history clean.

Except I don't go back into master until I'm ready to push to origin.

Dru just showed me his git aliases. Adding above.

new is nice, done seems like it does a LOT

@KevM
Have you tried something like this? https://gist.github.com/1280290

@jmarnold that looks fantastic

…

On Thu, Dec 1, 2011 at 4:00 PM, Josh Arnold < ***@***.*** > wrote: @KevM Have you tried something like this? https://gist.github.com/1280290 --- Reply to this email directly or view it on GitHub: https://gist.github.com/1420048