NAME

gear-merge - merge branches in the package repository

SYNOPSIS

gear-merge [Options]

DESCRIPTION

This utility might help you to store upstream sources, patches and metafiles to facilitate packaging for different repository branches.

Its main purpose is merging differerent branches (usually upstream sources and/or patch branches) into single master branch.

OPTIONS

-I, --no-interactive

merge branches non-interactively;

-a, --add

add new patches in git repository;

-r, --rules=FILENAME

name of file with rules, default is .gear/merge;

-s, --stop=BRANCH

stop merge when BRANCH shows in <to-branch>, implies --no-interactive;

--ignore-changed

do not bail if index changed;

--ignore-untracked

do not bail if untracked or modified files found;

-v, --verbose

print a message for each action;

-V, --version

print program version and exit;

-h, --help

show this text and exit.

ENVIRONMENT

GIT_DIR

If the GIT_DIR environment variable is set then it specifies a path to use instead of the default for the base of the repository.

GEAR_MERGE

gear-merge always exports GEAR_MERGE=1 to the environment.

AUTHOR

Written by Alexey Gladkov <legion@altlinux.org>

REPORTING BUGS

Report bugs to https://bugzilla.altlinux.org/

COPYRIGHT

Copyright © 2007-2018 Alexey Gladkov <legion@altlinux.org>
Copyright © 2008-2016 Dmitry V. Levin <ldv@altlinux.org>
Copyright © 2008 Alexey I. Froloff <raorn@altlinux.org>
This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

SEE ALSO

gear(1).