Re: Merging using only fast-forward

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Randal L. Schwartz
Date: Wednesday, January 16, 2008 - 9:27 am

>>>>> "Sverre" == Sverre Hvammen Johansen <hvammen@gmail.com> writes:

Sverre> If there are changes on both A and B that have not yet been integrated
Sverre> (by A doing a pull (fetch/rebase)) I want a pull (fetch/merge) on B to
Sverre> fail.

Junio implemented a 7-line patch on the IRC channel (calling parts of it
"for randal" or something, I believe :) to do precisely this.

Perhaps you can test it, and submit it as if it were your idea.  I, for one,
would use it as well.  I'm doing ugly things with parsing the output of
git-status right now to achieve the same thing.

-- 
Randal L. Schwartz - Stonehenge Consulting Services, Inc. - +1 503 777 0095
<merlyn@stonehenge.com> <URL:http://www.stonehenge.com/merlyn/>
Perl/Unix/security consulting, Technical writing, Comedy, etc. etc.
See PerlTraining.Stonehenge.com for onsite and open-enrollment Perl training!
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
Merging using only fast-forward, Sverre Hvammen Johansen, (Wed Jan 16, 8:54 am)
Re: Merging using only fast-forward, Randal L. Schwartz, (Wed Jan 16, 9:27 am)
Re: Merging using only fast-forward, Junio C Hamano, (Wed Jan 16, 1:31 pm)
Re: Merging using only fast-forward, Sverre Hvammen Johansen, (Wed Jan 16, 3:38 pm)
Re: Merging using only fast-forward, Junio C Hamano, (Wed Jan 16, 3:49 pm)
Re: Merging using only fast-forward, Sverre Hvammen Johansen, (Wed Jan 16, 11:53 pm)
Re: Merging using only fast-forward, Sverre Hvammen Johansen, (Thu Jan 17, 11:58 pm)
Re: Merging using only fast-forward, Junio C Hamano, (Fri Jan 18, 2:25 pm)
Re: Merging using only fast-forward, Sverre Hvammen Johansen, (Sat Jan 19, 3:28 am)
Re: Merging using only fast-forward, Sverre Hvammen Johansen, (Sat Jan 19, 3:38 am)
Re: Merging using only fast-forward, Junio C Hamano, (Sat Jan 19, 3:43 am)
Re: Merging using only fast-forward, Sverre Hvammen Johansen, (Sat Jan 19, 5:39 am)
Re: Merging using only fast-forward, Sverre Hvammen Johansen, (Sun Jan 20, 11:26 pm)