1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-08 18:23:01 +01:00
git/contrib/fast-import
Junio C Hamano a1975c4fea Merge branch 'ak/p4'
* ak/p4:
  Utilise our new p4_read_pipe and p4_write_pipe wrappers
  Add p4 read_pipe and write_pipe wrappers
  Put in the two other configuration elements found in the source
  Put some documentation in about the parameters that have been added
  Move git-p4.syncFromOrigin into a configuration parameters section
  Consistently use 'git-p4' for the configuration entries
  If the user has configured various parameters, use them.
  Switch to using 'p4_build_cmd'
  If we are in verbose mode, output what we are about to run (or return)
  Add a single command that will be used to construct the 'p4' command
  Utilise the new 'p4_system' function.
  Have a command that specifically invokes 'p4' (via system)
  Utilise the new 'p4_read_pipe_lines' command
  Create a specific version of the read_pipe_lines command for p4 invocations

Conflicts:
	contrib/fast-import/git-p4
2008-08-17 10:53:57 -07:00
..
git-import.perl contrib/fast-import: add perl version of simple example 2007-09-18 03:14:18 -07:00
git-import.sh contrib/fast-import: add simple shell example 2007-09-18 03:14:16 -07:00
git-p4 Merge branch 'ak/p4' 2008-08-17 10:53:57 -07:00
git-p4.bat Make the command call silent 2007-05-15 16:07:41 +02:00
git-p4.txt Put in the two other configuration elements found in the source 2008-08-11 18:57:04 -07:00
import-tars.perl Merge branch 'maint' 2007-05-16 12:43:05 -07:00
import-zips.py Add another fast-import example, this time for .zip files 2008-07-01 00:48:17 -07:00