git/contrib/subtree, branch v2.0.2

subtree: initialize "prefix" variable

2014-03-17T22:19:52Z

We parse the "--prefix" command-line option into the "$prefix" shell variable. However, if we do not see such an option, the variable is left with whatever value it had in the environment. We should initialize it to a known value, like we do for other variables. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

subtree: fix argument validation in add/pull/push

2014-01-13T22:37:52Z

When working with a remote repository add/pull/push do not accept a as parameter but just a . They should accept any well-formatted ref name. This patch: - relaxes the check the argument in "git subtree add " (previous code would not accept a ref name that does not exist locally too, new code only ensures that the ref is well formatted) - add the same check in "git subtree pull/push" + check the number of parameters - update the doc to use instead of Signed-off-by: Anthony Baire Signed-off-by: Junio C Hamano

Merge branch 'jk/subtree-install-fix'

2013-11-04T22:58:08Z

* jk/subtree-install-fix: subtree: add makefile target for html docs

subtree: add makefile target for html docs

2013-10-30T17:47:37Z

The Makefile currently builds the roff manpage, but not the html form. As some people may prefer the latter, let's make it an option to build that, too. We also wire it into "make doc" so that it is built by default. This patch does not build or install it as part of "install-doc"; that would require extra infrastructure to handle installing the html as we do in git's regular Documentation/ tree. That can come later if somebody is interested. Tested-by: Sebastian Schuberth Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

Merge branch 'ob/typofixes'

2013-08-01T19:01:01Z

* ob/typofixes: many small typofixes

Merge branch 'ms/subtree-install-fix'

2013-08-01T18:57:25Z

* ms/subtree-install-fix: contrib/subtree: Fix make install target

Merge branch 'lf/echo-n-is-not-portable'

2013-08-01T18:52:43Z

* lf/echo-n-is-not-portable: Avoid using `echo -n` anywhere

contrib/subtree: Fix make install target

2013-07-30T14:50:23Z

If the libexec directory doesn't exist, git-subtree gets installed as $prefix/share/libexec/git-core file. This patch creates the directory before installing git-subtree file into it. Signed-off-by: Michal Sojka Signed-off-by: Junio C Hamano

many small typofixes

2013-07-29T19:32:25Z

Signed-off-by: Ondřej Bílka Reviewed-by: Marc Branchaud Signed-off-by: Junio C Hamano

Avoid using `echo -n` anywhere

2013-07-29T16:56:58Z

`echo -n` is non-portable. The POSIX specification says: Conforming applications that wish to do prompting without characters or that could possibly be expecting to echo a -n, should use the printf utility derived from the Ninth Edition system. Since all of the affected shell scripts use a POSIX shell shebang, replace `echo -n` invocations with printf. Signed-off-by: Lukas Fleischer Signed-off-by: Junio C Hamano