Login or Register to Ask a Question and Join Our Community

Linux and UNIX Man Pages

Linux & Unix Commands - Search Man Pages

git-import-orig(1) [debian man page]

GIT-IMPORT-ORIG(1)					      git-buildpackage Manual						GIT-IMPORT-ORIG(1)

NAME

       git-import-orig - Import an upstream source into a git repository

SYNOPSIS

       git-import-orig	 [   --verbose	]  [  --upstream-version=version  ]  [	--[no-]merge  ]  [  --upstream-branch=branch_name  ]  [  --debian-
       branch=branch_name ] [ --upstream-vcs-tag=tag_name ] [ --[no-]sign-tags ] [ --keyid=gpg-keyid ]	[  --upstream-tag=tag-format  ]  [  --fil-
       ter=pattern ] [ --[no-]pristine-tar ] [ --[no-]filter-pristine-tar ] [ --postimport=cmd ] [ --uscan ] upstream-source

DESCRIPTION

       git-import-orig imports upstream-source into the Git repository. upstream-source can either be a gzip or bzip2 compressed tar archive or an
       already unpacked source tree. If it is already of the form package-name_version.orig.tar.gz, the version information is read from the  tar-
       ball's filename otherwise it can be given on the command line via --upstream-version.

       The sources are placed on the upstream branch (default: upstream), tagged and merged onto the debian branch (default: master).

OPTIONS

       --upstream-version=version

       -uversion
	      The upstream version number

       --merge
	      Merge the upstream branch to the debian branch after import

       --upstream-branch=branch_name
	      The branch in the Git repository the upstream sources are put onto. Default is upstream.

       --debian-branch=branch_name
	      The branch in the Git repository the Debian package is being developed on, default is master. After importing the new sources on the
	      upstream branch, git-import-orig will try to merge the new version onto this branch.

       --upstream-vcs-tag=tag_name
	      Add tag_name as additional parent to the commit of the upstream tarball. Useful when upstream uses git and you want to link to  it's
	      revision history.

       --verbose

       -v     verbose execution

       --[no-]sign-tags
	      GPG sign all created tags

       --keyid=gpg-keyid
	      use this keyid for gpg signing tags

       --upstream-tag=tag-format
	      use this tag format when tagging upstream versions, default is upstream/%(versions)s

       --import-msg=msg-format
	      use this format string for the commit message when importing upstream versions, default is Imported Upstream version %(version)s

       --filter=pattern
	      filter out files glob-matching pattern. Can be given multiple times.

       --pristine-tar
	      generate pristine-tar delta file

       --filter-pristine-tar
	      if using a filter also filter the files out of the tarball passed to pristine tar

       --postimport=cmd
	      run cmd after the import.

       --uscan
	      Use uscan to fetch new upstream version.

CONFIGURATION FILES

       Several	gbp.conf  files  are  parsed  to  set defaults for the above commandline arguments. See the [XRef to GBP.MAN.GBP.CONF] manpage for
       details.

SEE ALSO

       git-buildpackage(1), git-import-dsc(1), git-import-dscs(1), git-dch(1), gbp.conf(5), debuild(1), git(1),  pristine-tar(1),  The	Git-Build-
       package Manual <URL:file:///usr/share/doc/git-buildpackage/manual-html/index.html>

AUTHOR

       Guido Guenther <agx@sigxcpu.org>

								   01 June 2012 						GIT-IMPORT-ORIG(1)

Check Out this Related Man Page

GBP-PQ(1)						      git-buildpackage Manual							 GBP-PQ(1)

NAME

       gbp-pq - Manage quilt patches on patch queue branches in git

SYNOPSIS

       gbp-pq  [  --verbose ] [ --color=[auto|on|off] ] [ --[no-]patch-numbers ] [ --topic=topic ] [ --time-machine=num ] drop | export | import |
       rebase | switch

DESCRIPTION

       gbp-pq helps one to manage quilt patches in Debian packages that are maintained with git-buildpackage. This is especially useful with pack-
       ages  using the 3.0 (quilt) source format. With gbp-pq you can maintain the quilt patches that should be applied to a package on a separate
       branch called patch-queue branch. So if your Debian package lives on master  the  associated  patch-queue  branch  will	be  called  patch-
       queue/master.

       See  <URL:https://honk.sigxcpu.org/piki/development/debian_packages_in_git/> for example workflows.

ACTIONS

       import Create a patch queue branch from quilt patches in debian/patches/ that are listed in debian/patches/series.

       export Export  the  patches  on	the  patch-queue  branch associated to the current branch into a quilt patch series in debian/patches/ and
	      update the series file.

       rebase Switch to the patch-queue branch associated to the current branch and rebase it against the current branch.

       drop   Drop (delete) the patch queue associated to the current branch. So if you're on branch foo this would drop branch patch-queue/foo.

       apply  Add a single patch to the patch-queue similar to using git-am. Use --topic if you want the patch to appear in a separate subdir when
	      exporting the patch queue using export. This can be used to separate upstream pathes from debian specific patches.

       switch Switch to the patch-queue branch if on the base branch and switch to base branch if on patch-queue branch.

OPTIONS

       --verbose

       -v     verbose execution

       --color=[auto|on|off]
	      Whether to use colored output.

       --[no-]patch-numbers
	      Whether the patch files should start with a number or not.

       --topic=topic
	      Topic to use when importing a single patch

       --time-machine=NUM
	      When  importing  a  patch  queue fails, go back commit by commit on the current branch to check if the patch-queue applies there. Do
	      this at most NUM times. This can be useful if the patch-queue doesn't apply to the current branch HEAD anymore, e.g.  after  import-
	      ing a new upstream version.

TAGS

       When  exporting	patches  from  a  patch-queue branch gbp-pq will look at the patch header for special tags it recognizes. All tags need to
       start at the first column and require at least one whitespace after the colon.

       Gbp-Pq-Topic: topic
	      Moves the patch into a subdir called topic when running

	      gbp-pq
		     export
	      . This allows for some structure below debian/patches.

SEE ALSO

       git-buildpackage(1), dpkg-source(1), quilt(1), gbp.conf(5)

AUTHOR

       Guido Guenther <agx@sigxcpu.org>

								   01 June 2012 							 GBP-PQ(1)
Man Page