Re: [PATCH] Added guilt.reusebranch configuration option.

2 messages, 2 authors, 2016-06-15 · open the first message on its own page

Re: [PATCH] Added guilt.reusebranch configuration option.

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:57:24

Theodore Ts'o [off-list ref] writes:
I was actually thinking that it might be interesting to have a
branch.<branch>.rewindable, which would change the guilt defaults, and
could also key changes in key git behavior which makes it less likely
that a user shoots him or herself in the foot --- i.e., give warnings
if he or she has modified the branch in such a way that
remotes.origin.<branch> is no longer contained within the branch head.
At least "rebase" can pay attention to it and might make the world a
better place.

Your final "git push" needs to be forced if you rewound beyond
remotes.origin.<branch> so in that sense, there already is a sefety,
but it is better to give the user a chance to notice that before the
user spends more time to polish the rewound topic to perfection,
only to see the push rejected.

Re: [PATCH] Added guilt.reusebranch configuration option.

From: Theodore Ts'o <tytso@mit.edu>
Date: 2016-06-15 22:57:24

On Wed, May 22, 2013 at 10:58:49AM -0700, Junio C Hamano wrote:
Theodore Ts'o [off-list ref] writes:
quoted
I was actually thinking that it might be interesting to have a
branch.<branch>.rewindable, which would change the guilt defaults, and
could also key changes in key git behavior which makes it less likely
that a user shoots him or herself in the foot --- i.e., give warnings
if he or she has modified the branch in such a way that
remotes.origin.<branch> is no longer contained within the branch head.
At least "rebase" can pay attention to it and might make the world a
better place.
Yeah, rebase was the primary command I was thinking about.  The other
one would be "git commit --amend" after the branch had been pushed
out.

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