git/contrib/examples, branch v1.8.2.2

contrib/examples/git-remote.perl: use a lowercase "usage:" string

2013-02-25T05:30:15Z

Make the usage string consistent with Git. Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano

contrib/examples: use a lowercase "usage:" string

2013-02-24T21:31:09Z

Make the usage string consistent with Git. Reviewed-by: Jonathan Nieder Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano

Merge branch 'jc/merge-bases'

2012-09-11T18:36:05Z

Optimise the "merge-base" computation a bit, and also update its users that do not need the full merge-base information to call a cheaper subset. * jc/merge-bases: reduce_heads(): reimplement on top of remove_redundant() merge-base: "--is-ancestor A B" get_merge_bases_many(): walk from many tips in parallel in_merge_bases(): use paint_down_to_common() merge_bases_many(): split out the logic to paint history in_merge_bases(): omit unnecessary redundant common ancestor reduction http-push: use in_merge_bases() for fast-forward check receive-pack: use in_merge_bases() for fast-forward check in_merge_bases(): support only one "other" commit

in_merge_bases(): support only one "other" commit

2012-08-28T01:36:39Z

In early days of its life, I planned to make it possible to compute "is a commit contained in all of these other commits?" with this function, but it turned out that no caller needed it. Just make it take two commit objects and add a comment to say what these two functions do. Signed-off-by: Junio C Hamano

remove superfluous newlines in error messages

2012-04-30T22:45:51Z

The error handling routines add a newline. Remove the duplicate ones in error messages. Signed-off-by: Pete Wyckoff Signed-off-by: Junio C Hamano

cherry-pick/revert: add support for -X/--strategy-option

2010-12-28T19:27:56Z

For example, this would allow cherry-picking or reverting patches from a piece of history with a different end-of-line style, like so: $ git revert -Xrenormalize old-problematic-commit Currently that is possible with manual use of merge-recursive but the cherry-pick/revert porcelain does not expose the functionality. While at it, document the existing support for --strategy. Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano

Change incorrect "remote branch" to "remote tracking branch" in C code

2010-11-03T16:20:47Z

(Just like we did for documentation already) In the process, we change "non-remote branch" to "branch outside the refs/remotes/ hierarchy" to avoid the ugly "non-remote-tracking branch". The new formulation actually corresponds to how the code detects this case (i.e. prefixcmp(refname, "refs/remotes")). Also, we use 'remote-tracking branch' in generated merge messages (by merge an fmt-merge-msg). Signed-off-by: Matthieu Moy Signed-off-by: Junio C Hamano

Merge branch 'ab/require-perl-5.8'

2010-10-27T04:57:31Z

* ab/require-perl-5.8: perl: use "use warnings" instead of -w perl: bump the required Perl version to 5.8 from 5.6.[21]

{cvs,svn}import: use the new 'git read-tree --empty'

2010-10-19T21:15:59Z

Since fb1bb96 (read-tree: deprecate syntax without tree-ish args, 2010-09-10) not passing --empty caused a spurious warning that was shown to the user. Signed-off-by: Thomas Rast Signed-off-by: Junio C Hamano

perl: use "use warnings" instead of -w

2010-09-27T19:37:56Z

Change the Perl scripts to turn on lexical warnings instead of setting the global $^W variable via the -w switch. The -w sets warnings for all code that interpreter runs, while "use warnings" is lexically scoped. The former is probably not what the authors wanted. As an auxiliary benefit it's now possible to build Git with: PERL_PATH='/usr/bin/env perl' Which would previously result in failures, since "#!/usr/bin/env perl -w" doesn't work as a shebang. Signed-off-by: Ævar Arnfjörð Bjarmason Signed-off-by: Junio C Hamano