NAME

gmrg - merge a component's last git branch to the master branch

SYNOPSIS

  gmrg [options] <name>

DESCRIPTION

gmrg merge the final git branch for a given name with the master branch. gmrg works with branch names that follow a standard naming format, which specifies a name and an index number that is appended to the name. When merging a branch with gmrg, the current branch must be "master".

The branch names follow this format:

    name.NNNNNN
The "name" portion is specified by the user and the "NNNNNN" index number is calculated by gmrg. The numbers are six digits long, with leading zeroes included.

The checked-out, current branch can be merged with the master by not specifying a component on the command line. In this case, gmrg will save the current branch name, check out the master branch, and then merge the the two branches.

The gchk command may be used to easily create branches named in this format.

gmrg and gchk do not use meaningful branch names and they should not be used if meaningful branch names are required. These commands are useful in situations where there are many files being managed by git and many, frequent changes are being made to those files, and creating meaningful branch names is likely to become time-consuming and a hindrance.

OPTIONS

gmrg takes the following options:

LICENSE

Copyright 2014 Wayne Morrison

Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at

     http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.

AUTHOR

Wayne Morrison, wayne@waynemorrison.com

SEE ALSO

git(1), gchk(1)