ncr · July 25, 2008 10:43
diff --git a/.gitconfig b/.gitconfig
 [alias]
  up   = !sh -c 'git checkout master && git pull && git merge $0 && git push && git checkout $0'
  down = !sh -c 'git checkout master && git pull && git checkout $0 && git merge master'
diff --git a/down.sh b/down.sh
 # down: updating feature branch from remote master

 git checkout master
 git pull
 git checkout $1
 git merge master
diff --git a/gistfile3.txt b/gistfile3.txt
 git config alias.ci commit

 or edit $HOME/.gitconfig

 [alias]
        ci = commit
diff --git a/up.sh b/up.sh
 # up: pushing feature branch changes to remote master

 git checkout master
 git pull
 git merge $1
 git push
 git checkout $1
	[alias]
	up = !sh -c 'git checkout master && git pull && git merge $0 && git push && git checkout $0'
	down = !sh -c 'git checkout master && git pull && git checkout $0 && git merge master'
	# down: updating feature branch from remote master

	git checkout master
	git pull
	git checkout $1
	git merge master
	# up: pushing feature branch changes to remote master

	git checkout master
	git pull
	git merge $1
	git push
	git checkout $1