Thread (3 messages) flat view 3 messages, 2 authors, 2016-06-15

Re: [PATCH 1/2] Add feature release instructions to MaintNotes addendum

From: Raman Gupta <hidden>
Date: 2016-06-15 22:46:28

Nanako Shiraishi wrote:
Quoting rocketraman@fastmail.fm:
quoted
+ - The 'maint' branch is updated to the new release.
+
+     $ git checkout maint
+     $ git merge master
+
+   This is equivalent to deleting maint and recreating it from
+   master, but it preserves the maint reflog.
After giving a recipe that is better than an alternative, what's
the point of describing an inferior alternative as "equivalent",
when it is obviously not "equivalent"?
Is this better:

The resulting maint tree is equivalent to deleting maint and
recreating it from the tip of master, but merging from master
preserves the maint reflog.

Cheers,
Raman
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help