Markus Elfring [off-list ref] writes:
How are the chances to make unfinished and uncommitted content updates sticky
for a particular branch (or a selection of branches) so that changes will not be
mixed more as it will be really required for an editing task?
Traditionally the right way to do this has been to make a temporary commit
on the branch, i.e.
$ git checkout topic
work work work... yikes, I cannot get this working
$ git commit -a -m 'wip: does not work yet' ;# temporary commit
$ git checkout other-topic
work work work....
$ git checkout topic
$ git reset --soft HEAD^ ;# drop the temporary commit
I didn't re-read our documentation set for some time, but don't we teach
this anymore?
Traditionally the right way to do this has been to make a temporary commit
on the branch, i.e.
I would like to avoid such commits for unfinished content updates. Should the
storage operation be provided by the stash instead for intermediate work results?
Will it happen to forget corresponding clean-up for "temporary" changes that
might be committed too early just to get them stored?
Regards,
Markus
On Wed, Mar 3, 2010 at 09:55, Markus Elfring [off-list ref] wrote:
quoted
Traditionally the right way to do this has been to make a temporary commit
on the branch, i.e.
I would like to avoid such commits for unfinished content updates. Should the
storage operation be provided by the stash instead for intermediate work results?
Will it happen to forget corresponding clean-up for "temporary" changes that
might be committed too early just to get them stored?
Junio,
I'm not sure how often WIP commits become accidentally published or
left in the history, but perhaps it would be advantageous to provide a
means of specifying officially that a particular commit is in fact a
WIP commit such that no other commits can be made on top of this WIP
commit and it can't be merged with other branches or pushed or
whatever.
I'm not sure how often WIP commits become accidentally published or
left in the history, but perhaps it would be advantageous to provide
a means of specifying officially that a particular commit is in fact
a WIP commit such that no other commits can be made on top of this WIP
commit and it can't be merged with other branches or pushed or whatever.
When will such blocking commits be useful?
Would you really like to support a stopper or barrier for branches?
Regards,
Markus