spell checking
Add from-submodule.
Conflicts:
	.gitignore
	contrib/subtree/git-subtree.sh
	test.sh

Original-Author: Peter Jaros <pjaros@pivotallabs.com>
Conflicts-resolved-by: Paul Campbell <pcampbell@kemitix.net>
Use .gittrees config file like a .gitmodules when pull or push
new commands: pull_all and push_all

Conflicts:
	contrib/subtree/git-subtree.sh

Original-Author: bibendi <bibendi@bk.ru>
Conflicts-resolved-by: Paul Campbell <pcampbell@kemitix.net>
A number of changes to push_all and pull_all:

* adding commands in "add" to populate the .gittrees file
* changing underscores to dashes (push_all -> push-all)
* changing commands to not be hardcoded to branch "master" from remote
* letting the user specify 0, 1, or 2 arguments to push and pull, like
normal "git push" and "git pull".  We'll try to look up missing
information from .gittrees, like git normally does from .git/config

Conflicts:
	.gitignore
	contrib/subtree/git-subtree.sh

Original-Author: mhoffman <matt.hoffman@quantumretail.com>
Conflicts-resolved-by: Paul Campbell <pcampbell@kemitix.net>
merging change from nresni

manual merge at the moment...i'll try a proper merge next now that
formatting is cleaner

Conflicts:
	git-subtree.sh

Fixes hidden carriage return

Original-Author: mhoffman <matt.hoffman@quantumretail.com>
Conflicts-resolved-by: Paul Campbell <pcampbell@kemitix.net>
Added check to ensure that split succeeds before trying to push
fixing typo

Conflicts:
	git-subtree.sh

Add diff command

Original-Author: mhoffman <matt.hoffman@quantumretail.com>
Conflicts-resolved-by: Paul Campbell <pcampbell@kemitix.net>
Adding a "list" command

Conflicts:
	git-subtree.sh

Original-Author: mhoffman <matt.hoffman@quantumretail.com>
Conflicts-resolved-by: Paul Campbell <pcampbell@kemitix.net>
'prune' command to clear out stale .gittrees info

Conflicts:
	git-subtree.sh

Original-Author: Nate Jones <nate@endot.org>
Conflicts-resolved-by: Paul Campbell <pcampbell@kemitix.net>
Add prune command to OPTS_SPEC

Conflicts:
	git-subtree.sh

Original-Author: Herman van Rink <rink@initfour.nl>
Conflicts-resolved-by: Paul Campbell <pcampbell@kemitix.net>
Remove trailing slash from prefix parameter

Conflicts:
	git-subtree.sh

Original-Author: Herman van Rink <rink@initfour.nl>
Conflicts-resolved-by: Paul Campbell <pcampbell@kemitix.net>
from-submodule: add url to .gittrees

Conflicts:
	git-subtree.sh

Original-Author: Herman van Rink <rink@initfour.nl>
Conflicts-resolved-by: Paul Campbell <pcampbell@kemitix.net>
Document pull-all and push-all
Document from-submodule and prune commands
Update SYNOPSIS

Conflicts:
	contrib/subtree/git-subtree.txt

Original-Author: Herman van Rink <rink@initfour.nl>
Conflicts-resolved-by: Paul Campbell <pcampbell@kemitix.net>
Document list command

Conflicts:
	git-subtree.sh

Original-Author: Herman van Rink <rink@initfour.nl>
Conflicts-resolved-by: Paul Campbell <pcampbell@kemitix.net>
Added --force option to push

Conflicts:
	contrib/subtree/git-subtree.sh

Original-Author: James Roper <jroper@vz.net>
Conflicts-resolved-by: Paul Campbell <pcampbell@kemitix.net>
Fix some trailing whitespace

Conflicts:
	contrib/subtree/.gitignore
	contrib/subtree/git-subtree.sh
	contrib/subtree/test.sh

Original-Author: Herman van Rink <rink@initfour.nl>

OPTS_SPEC for push and pull updated (should have been picked up in an
earlier commit)

Fixed order of cases in setting the --default parameter

Conflicts-resolved-by: Paul Campbell <pcampbell@kemitix.net>