contrib/subtree: spell checking
contrib/subtree: Add from-submodule.

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

Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
contrib/subtree: Use .gittrees config file like a .gitmodules when pull or push

Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
contrib/subtree: new commands: pull_all and push_all

Conflicts:
	contrib/subtree/git-subtree.sh

Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
contrib/subtree: 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

Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
contrib/subtree: 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

Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
contrib/subtree: Added check to ensure that split succeeds before trying to push

Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
contrib/subtree: fixing typo

Conflicts:
	git-subtree.sh

Add diff command

Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
contrib/subtree: Adding a "list" command

Conflicts:
	git-subtree.sh

Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
contrib/subtree: 'prune' command to clear out stale .gittrees info

Conflicts:
	git-subtree.sh

Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
contrib/subtree: Add prune command to OPTS_SPEC

Conflicts:
	git-subtree.sh

Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
contrib/subtree: Remove trailing slash from prefix parameter

Conflicts:
	git-subtree.sh

Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
contrib/subtree: from-submodule: add url to .gittrees

Conflicts:
	git-subtree.sh

Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
contrib/subtree: Document pull-all and push-all

Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
contrib/subtree: Document from-submodule and prune commands

Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
contrib/subtree: Update SYNOPSIS

Conflicts:
	contrib/subtree/git-subtree.txt

Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
contrib/subtree: Document list command

Conflicts:
	git-subtree.sh

Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
contrib/subtree: Added --force option to push

Conflicts:
	contrib/subtree/git-subtree.sh

Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
contrib/subtree: Fix some trailing whitespace

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

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

Signed-off-by: Paul Campbell <pcampbell@kemitix.net>