threads / discuss / 9656

Re: user-manual patches

Subject: Re: user-manual patches

## tl;dr

2 messages between Aug 26, 2007 and Aug 26, 2007.

replies: 1people: 2as markdown or json

J. Bruce Fields· Aug 26, 2007, 16:20 UTC · lore
On Sun, Aug 26, 2007 at 12:16:56PM -0400, J. Bruce Fields wrote:
> 
> The following changes are available from the "maint" branch at:
> 
>   ssh://linux-nfs.org/~bfields/exports/git.git maint

Um, sorry for the duplicates. I'm clearly not competent to operation git-send-email.

Also one chunk from David Kastrup's gitlink fixes only applied to master, so I applied the whole thing there, did a merge, and pushed the result to my master branch. If that was the right thing to do, then I guess you can just pull from both of

	git://linux-nfs.org/~bfields/git	maint
	git://linux-nfs.org/~bfields/git	master
?
--b.
Junio C Hamano· Aug 26, 2007, 21:26 UTC · re: J. Bruce Fields · lore
"J. Bruce Fields" <bfields@fieldses.org> writes:
Show 18 quoted lines
> On Sun, Aug 26, 2007 at 12:16:56PM -0400, J. Bruce Fields wrote:
>> 
>> The following changes are available from the "maint" branch at:
>> 
>>   ssh://linux-nfs.org/~bfields/exports/git.git maint
>
> Um, sorry for the duplicates.  I'm clearly not competent to operation
> git-send-email.
>
> Also one chunk from David Kastrup's gitlink fixes only applied to
> master, so I applied the whole thing there, did a merge, and pushed the
> result to my master branch.  If that was the right thing to do, then I
> guess you can just pull from both of
>
> 	git://linux-nfs.org/~bfields/git	maint
> 	git://linux-nfs.org/~bfields/git	master
>
> ?

Thanks. I'd imagined just I'd just merge your master and everything would be fine, as your maint would be an ancestor of your maint. And it indeed went fine ;-)

← back to recent threads