login
Login
/
Register
Search
Search this site:
Forums
News
Blogs
Features
Site
Home
»
Mailing list archives
»
git
»
2008
»
December
»
9
Re: Forcing --no-ff on pull
view
thread
Previous message: [
thread
] [
date
] [
author
]
Next message: [
thread
] [
date
] [
author
]
[view in full thread]
From: Daniel Barkalow
Subject:
Re: Forcing --no-ff on pull
Date: Tuesday, December 9, 2008 - 3:32 pm
On Tue, 9 Dec 2008, R. Tyler Ballance wrote:
quoted text
> On Tue, 2008-12-09 at 19:17 +0900, Nanako Shiraishi wrote: > > Quoting "R. Tyler Ballance" <tyler@slide.com>: > > > > > The most common use-case involves a user merging a project branch into a > > > stabilization branch (`git checkout stable && git pull . project`) in > > > such a way that no merge commit is generated. Of course, without > > > thinking they'll push these changes up to the centralized repository. > > > Not 15 minutes later they realize "ruh roh! I didn't want to do that" > > > > Why does the user not want to fast-forward, if the merge she wants to do is actually a fast-forward? > > I agree with you, this is more about preventing coworkers who are too > lazy to understand the entirety of what they're doing from hurting the > workflow of "the rest of us". It's a technically solution to a people > problem (I understand technology far more than people ;)) > > Consider the following scenarion: > % git checkout -b project
Previous message: [
thread
] [
date
] [
author
]
Next message: [
thread
] [
date
] [
author
]
Messages in current thread:
Forcing --no-ff on pull
, R. Tyler Ballance
, (Tue Dec 9, 2:34 am)
Re: Forcing --no-ff on pull
, Jakub Narebski
, (Tue Dec 9, 2:46 am)
Re: Forcing --no-ff on pull
, Lars Hjemli
, (Tue Dec 9, 2:49 am)
Re: Forcing --no-ff on pull
, Johannes Sixt
, (Tue Dec 9, 3:00 am)
Re: Forcing --no-ff on pull
, R. Tyler Ballance
, (Tue Dec 9, 3:12 am)
Re: Forcing --no-ff on pull
, Nanako Shiraishi
, (Tue Dec 9, 3:17 am)
Re: Forcing --no-ff on pull
, Lars Hjemli
, (Tue Dec 9, 3:31 am)
Re: Forcing --no-ff on pull
, R. Tyler Ballance
, (Tue Dec 9, 3:38 am)
Re: Forcing --no-ff on pull
, R. Tyler Ballance
, (Tue Dec 9, 3:45 am)
Re: Forcing --no-ff on pull
, Jeff King
, (Tue Dec 9, 3:57 am)
Re: Forcing --no-ff on pull
, Lars Hjemli
, (Tue Dec 9, 3:57 am)
Re: Forcing --no-ff on pull
, Boyd Stephen Smith Jr.
, (Tue Dec 9, 7:36 am)
Re: Forcing --no-ff on pull
, Stephen Haberman
, (Tue Dec 9, 9:39 am)
Re: Forcing --no-ff on pull
, Daniel Barkalow
, (Tue Dec 9, 3:32 pm)
Re: Forcing --no-ff on pull
, Stephen Haberman
, (Wed Dec 10, 12:07 pm)
Navigation
Mailing list archives
Recent posts