git/contrib/examples, branch v1.6.3

Fix typo in contrib/examples/git-svnimport.txt

2009-02-25T16:33:14Z

Signed-off-by: Michael J Gruber Signed-off-by: Junio C Hamano

Convert git-* invocations to "git *" in the svnimport example.

2009-02-25T05:10:57Z

After these changes, git-svnimport worked fine for me. Signed-off-by: Abhijit Menon-Sen Signed-off-by: Junio C Hamano

contrib/examples/README: give an explanation of the status of these files

2009-01-13T01:47:36Z

We attempt to give an explanation of the status of the files in this directory. Signed-off-by: jidanni Signed-off-by: Junio C Hamano

Typo "does not exists" when git remote update remote.

2008-10-16T15:20:15Z

Replace uses of "git-var" with "git var"

2008-07-30T18:42:01Z

Signed-off-by: Todd Zullinger Signed-off-by: Junio C Hamano

svnimport: newer libsvn wants us to ask for the root with "", not "/"

2008-07-23T23:58:09Z

In r27729, libsvn introduced an assert which explicitly forbids searching the tree at "/". Luckily enough, it still accepts an empty string "" as the starting point. http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_ra/ra_loader.c?r1=27653&r2=27729 Tested against libsvn0-1.5.0-4mdv2009.0 (needs the fix), libsvn0-1.4.6-5mdv2008.1 (works anyway) Signed-off-by: P. Christeas Signed-off-by: Junio C Hamano

Merge branch 'sb/dashless'

2008-07-17T00:22:50Z

* sb/dashless: Make usage strings dash-less t/: Use "test_must_fail git" instead of "! git" t/test-lib.sh: exit with small negagive int is ok with test_must_fail Conflicts: builtin-blame.c builtin-mailinfo.c builtin-mailsplit.c builtin-shortlog.c git-am.sh t/t4150-am.sh t/t4200-rerere.sh

Merge branch 'mv/merge-in-c'

2008-07-16T02:09:46Z

* mv/merge-in-c: reduce_heads(): protect from duplicate input reduce_heads(): thinkofix Add a new test for git-merge-resolve t6021: add a new test for git-merge-resolve Teach merge.log to "git-merge" again Build in merge Fix t7601-merge-pull-config.sh on AIX git-commit-tree: make it usable from other builtins Add new test case to ensure git-merge prepends the custom merge message Add new test case to ensure git-merge reduces octopus parents when possible Introduce reduce_heads() Introduce get_merge_bases_many() Add new test to ensure git-merge handles more than 25 refs. Introduce get_octopus_merge_bases() in commit.c git-fmt-merge-msg: make it usable from other builtins Move read_cache_unmerged() to read-cache.c Add new test to ensure git-merge handles pull.twohead and pull.octopus Move parse-options's skip_prefix() to git-compat-util.h Move commit_list_count() to commit.c Move split_cmdline() to alias.c Conflicts: Makefile parse-options.c

Git.pm: Add remote_refs() git-ls-remote frontend

2008-07-09T05:46:01Z

This patch also converts the good ole' git-remote.perl to use it. It is otherwise used in the repo.or.cz machinery and I guess other scripts might find it useful too. Unfortunately, git-ls-remote --heads . is subtly different from git-ls-remote . refs/heads/ (since the second matches anywhere in the string, not just at the beginning) so we have to provide interface for both. Signed-off-by: Petr Baudis Signed-off-by: Junio C Hamano

Build in merge

2008-07-08T00:50:01Z

Mentored-by: Johannes Schindelin Signed-off-by: Miklos Vajna Signed-off-by: Junio C Hamano