[haiku-development] Re: FYI: Be sure to do a --rebase during your git pull
- From: "Ingo Weinhold" <ingo_weinhold@xxxxxx>
- To: haiku-development@xxxxxxxxxxxxx
- Date: Sun, 13 Nov 2011 00:23:20 +0100
Alexander von Gluck wrote:
[...]
> The nonlinear push can be blocked server side (and warn the end user),
> but would require a hook in
> the repo.
>
> Blocking this action also may get the user stranded in a tough spot as
> he couldn't push his
> repo to origin... but that may be a good thing to get everyone in the
> habit.
As I wrote recently already, rebasing is fine for stuff people do locally only,
but it doesn't work for collaborative efforts. So a commit hook to generally
disallow merge commits is definitely a no-go. It would be nice to have the
server interactively ask "Are you sure? (y/[n])" or require a special flag
(e.g. like the "--force" when pushing a branch with rewritten history) in such
a case. But that might not be possible.
CU, Ingo
Other related posts:
