From: Jun Wang Date: Tue, 26 Jan 2016 11:09:29 +0000 (+0800) Subject: merger to 655a6f0528afcebe1b4493abe865ee568c505bbf X-Git-Tag: debian/0.6.26~164 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a7015d3914342cff618bb4cea2663fbbed6da5dc;p=tools%2Fgit-buildpackage.git merger to 655a6f0528afcebe1b4493abe865ee568c505bbf --- a7015d3914342cff618bb4cea2663fbbed6da5dc diff --cc docs/manpages/gbp-buildpackage.sgml index d0b5a13,f382634..382b781 --- a/docs/manpages/gbp-buildpackage.sgml +++ b/docs/manpages/gbp-buildpackage.sgml @@@ -261,30 -206,26 +261,45 @@@ + =COLOR_SCHEME + + + + Colors to use in output (when color is enabled). The format for + COLOR_SCHEME is + '<debug>:<info>:<warning>:<error>'. + Numerical values and color names are accepted, empty fields imply + the default color. For example --git-color-scheme='cyan:34::' would + show debug messages in cyan, info messages in blue and other messages + in default (i.e. warning and error messages in red). + + + + + =BRANCH_NAME + =COLOR_SCHEME + + + Colors to use in output (when color is enabled). The format for + COLOR_SCHEME is + '<debug>:<info>:<warning>:<error>'. + Numerical values and color names are accepted, empty fields imply + the default color. For example --git-color-scheme='cyan:34::' would + show debug messages in cyan, info messages in blue and other messages + in default (i.e. warning and error messages in red). + + + + + =branch_name - Branch to build the orig tarball from if - is set to BRANCH. Default is - upstream. + + Branch to build the orig tarball from if + is set to + BRANCH. Default is + upstream. + @@@ -329,12 -265,22 +344,21 @@@ + gpg-keyid + + - use this keyid for gpg signing tags ++ ++ Include git submodules in the orig tarball. ++ + + + - command + GPG-KEYID - excecute command after tagging a new - version.Exported environment variables are: - GBP_TAG (the name of the generated tag), - GBP_BRANCH (the branch the package was build from) and - GBP_SHA1 (the sha1 of the commit the tag was created - at). + + use this keyid for gpg signing tags + diff --cc docs/manpages/gbp-dch.sgml index 8ffdc4f,94a535a..0959ca2 --- a/docs/manpages/gbp-dch.sgml +++ b/docs/manpages/gbp-dch.sgml @@@ -356,22 -310,20 +356,33 @@@ - Commit the generated changelog. + + Commit the generated changelog. + + + + + customization-file + + + + Load Python code from customization-file. + At the moment, the only useful thing the code can do is define a + custom format_changelog_entry() function. + + + customization-file + + + + Load Python code from customization-file. + At the moment, the only useful thing the code can do is define a + custom format_changelog_entry() function. + + + diff --cc docs/manpages/gbp-import-orig.sgml index 714a534,74a0f63..f5326d3 --- a/docs/manpages/gbp-import-orig.sgml +++ b/docs/manpages/gbp-import-orig.sgml @@@ -218,18 -191,16 +218,27 @@@ - Use uscan to fetch new upstream version. + + Use uscan to fetch new upstream version. + + + + + + + + Run command interactively, i.e. ask package name and version if + needed. + + + + + + + + Run command interactively, i.e. ask package name and version if + needed. + diff --cc docs/manpages/gbp-pq.sgml index e094208,697916c..ba195e9 --- a/docs/manpages/gbp-pq.sgml +++ b/docs/manpages/gbp-pq.sgml @@@ -123,9 -124,35 +125,23 @@@ OPTIONS - - - - - verbose execution - - - - [auto|on|off] - - - Whether to use colored output. - - + &man.common.options.description; + + =COLOR_SCHEME + + + Colors to use in output (when color is enabled). The format for + COLOR_SCHEME is + '<debug>:<info>:<warning>:<error>'. + Numerical values and color names are accepted, empty fields imply + the default color. For example --git-color-scheme='cyan:34::' would + show debug messages in cyan, info messages in blue and other messages + in default (i.e. warning and error messages in red). + + + +