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

GIT-CHERRY(1)							    Git Manual							     GIT-CHERRY(1)

NAME

       git-cherry - Find commits not merged upstream

SYNOPSIS

       git cherry [-v] [<upstream> [<head> [<limit>]]]

DESCRIPTION

       The changeset (or "diff") of each commit between the fork-point and <head> is compared against each commit between the fork-point and
       <upstream>. The commits are compared with their patch id, obtained from the git patch-id program.

       Every commit that doesn't exist in the <upstream> branch has its id (sha1) reported, prefixed by a symbol. The ones that have equivalent
       change already in the <upstream> branch are prefixed with a minus (-) sign, and those that only exist in the <head> branch are prefixed
       with a plus (+) symbol:

		      __*__*__*__*__> <upstream>
		     /
	   fork-point
		     \__+__+__-__+__+__-__+__> <head>

       If a <limit> has been given then the commits along the <head> branch up to and including <limit> are not reported:

		      __*__*__*__*__> <upstream>
		     /
	   fork-point
		     \__*__*__<limit>__-__+__> <head>

       Because git cherry compares the changeset rather than the commit id (sha1), you can use git cherry to find out if a commit you made locally
       has been applied <upstream> under a different commit id. For example, this will happen if you're feeding patches <upstream> via email
       rather than pushing or pulling commits directly.

OPTIONS

       -v
	   Verbose.

       <upstream>
	   Upstream branch to compare against. Defaults to the first tracked remote branch, if available.

       <head>
	   Working branch; defaults to HEAD.

       <limit>
	   Do not report commits up to (and including) limit.

SEE ALSO

       git-patch-id(1)

GIT

       Part of the git(1) suite

Git 1.7.10.4							    11/24/2012							     GIT-CHERRY(1)
Man Page