<html>
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8">
</head>
<body text="#000000" bgcolor="#FFFFFF">
<tt><tt>Everyone,<br>
<br>
After numerous discussions, I have renamed the PKI git
repository branches following our new naming conventions.<br>
<br>
The table below identifies the original branch name and its new
branch name.<br>
<br>
Some original branch names were left unchanged.<br>
<br>
Some other original branches were deleted, and thus have no new
branch name.<br>
<br>
Finally, the new branch entitled 'DOGTAG_10_2_RHEL_BRANCH' was
created from the '</tt></tt><tt><tt><tt><tt><tt>7cf3bd73a7c41d8633fb2a92053a55e0e36a4925</tt>'
hash checked in to the 'master' branch.<br>
<br>
I have included an example of how to sync an existing
checked out repository with the original name to the revised
name in the current repository.<br>
<br>
-- Matt<br>
<br>
</tt></tt></tt></tt><br>
<tt><tt><tt><tt><tt><tt>==================================================================================================</tt><tt><br>
</tt>ORIGINAL BRANCH NAME
NEW BRANCH NAME</tt><tt><br>
</tt><tt>==================================================================================================</tt><tt><br>
</tt><tt>remotes/origin/DOGTAG_10_0_BRANCH
==> </tt><tt>remotes/origin/DOGTAG_10_0_BRANCH<br>
</tt><tt>remotes/origin/IPA_V3_RHEL_7_ERRATA_BRANCH
==> </tt><tt>remotes/origin/DOGTAG_10_0_RHEL_BRANCH</tt><br>
<tt><tt>remotes/origin/DOGTAG_10_1_BRANCH
==> </tt><tt>remotes/origin/DOGTAG_10_1_BRANCH<br>
</tt></tt><tt><tt>remotes/origin/IPA_V4_RHEL_7_1_ERRATA_BRANCH
==> remotes/origin/DOGTAG_10_1_RHEL_BRANCH<br>
</tt></tt><tt><tt>'master' </tt></tt><tt><tt><tt>7cf3bd73a7c41d8633fb2a92053a55e0e36a4925</tt><tt>
==> remotes/origin/DOGTAG_10_2_RHEL_BRANCH</tt></tt></tt><br>
<tt><tt><tt><tt>remotes/origin/DOGTAG_9_BRANCH
==> remotes/origin/DOGTAG_9_0_BRANCH</tt><tt><br>
</tt><tt>remotes/origin/IPA_v2_RHEL_6_ERRATA_BRANCH
</tt><tt>==</tt><tt>></tt><tt> </tt><tt>remotes/origin/DOGTAG_</tt><tt>9_0</tt><tt>_</tt><tt>RHEL_BRANCH<br>
</tt><b> </b></tt>remotes/origin/RHEL_7_0_BRANCH
==> </tt><br>
</tt><tt>remotes/origin/RHEL_7_BRANCH
==> <br>
remotes/origin/autoformat
==> <br>
remotes/origin/autoformat2
==> <br>
</tt><tt><tt>remotes/origin/HEAD ->
origin/master ==> </tt></tt><tt><tt>remotes/origin/HEAD
-> origin/master</tt><br>
remotes/origin/master
==> remotes/origin/master</tt><br>
<tt><tt>==================================================================================================</tt><tt><br>
</tt><br>
<br>
<br>
</tt><tt><tt>===========================================================================<br>
</tt>EXAMPLE OF UPDATING AN EXISTING BRANCH THAT HAS BEEN
PREVIOUSLY CHECKED OUT<br>
===========================================================================<br>
(1) Identify the local branch<br>
<br>
# git branch<br>
IPA_V3_RHEL_7_ERRATA_BRANCH<br>
<br>
(2) Rename the local branch<br>
<br>
# git branch -m </tt><tt>IPA_V3_RHEL_7_ERRATA_BRANCH
</tt><tt>DOGTAG_10_0_RHEL_BRANCH<br>
<br>
(3) Identify the local branch<br>
<br>
# git branch<br>
</tt><tt> DOGTAG_10_0_RHEL_BRANCH<br>
<br>
(4) </tt><tt><tt>Attempt to update the local branch from
the remote branch</tt><br>
<br>
# git pull<br>
. . .<br>
Your configuration specifies to merge with the ref
'IPA_V3_RHEL_7_ERRATA_BRANCH'<br>
from the remote, but no such ref was fetched.<br>
<br>
(5) </tt><tt>Setup remote upstream tracking on the branch
you just renamed<br>
<br>
# git branch -u origin/</tt><tt>DOGTAG_10_0_RHEL_BRANCH<br>
Branch DOGTAG_10_0_RHEL_BRANCH set up to track remote
branch DOGTAG_10_0_RHEL_BRANCH from origin.<br>
<br>
(6) </tt><tt><tt>Attempt to update the local branch from
the remote branch<br>
<br>
</tt> # git pull<br>
Already up-to-date.</tt><tt><br>
===========================================================================</tt><br>
</tt></tt></tt></tt>
</body>
</html>