]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'sr/remote-helper-export'
authorJunio C Hamano <gitster@pobox.com>
Fri, 21 May 2010 11:02:15 +0000 (04:02 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 21 May 2010 11:02:15 +0000 (04:02 -0700)
* sr/remote-helper-export:
  t5800: testgit helper requires Python support
  Makefile: Simplify handling of python scripts
  remote-helpers: add tests for testgit helper
  remote-helpers: add testgit helper
  remote-helpers: add support for an export command
  remote-helpers: allow requesing the path to the .git directory
  fast-import: always create marks_file directories
  clone: also configure url for bare clones
  clone: pass the remote name to remote_get

Conflicts:
Makefile

1  2 
.gitignore
Makefile
builtin/clone.c

diff --cc .gitignore
Simple merge
diff --cc Makefile
Simple merge
diff --cc builtin/clone.c
Simple merge