login
Header Space

 
 

Re: git-pull and tag objects

Score:
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: Johannes Schindelin <Johannes.Schindelin@...>
Cc: Junio C Hamano <junkio@...>, Theodore Tso <tytso@...>, Alex Riesen <raa.lkml@...>, Alex Bennee <kernel-hacker@...>, <git@...>
Date: Wednesday, February 14, 2007 - 12:35 pm

On Wed, 14 Feb 2007, Johannes Schindelin wrote:

In fact, it's even quite doable as

	git commit-tree theirs^{tree} -p HEAD -p theirs < changelog

(choose your parent order at will) so it's not as if it's much of a 
"script". It's a core command to do something like this.

Using "git commit -s theirs" might not work (shouldn't, but I didn't test) 
for the first entry, so you probably *do* want to script this regardless. 
But git makes it really really easy.

		Linus
-
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:
Re: git-pull and tag objects, Junio C Hamano, (Tue Feb 13, 2:17 am)
Re: git-pull and tag objects, Linus Torvalds, (Wed Feb 14, 2:38 am)
Re: git-pull and tag objects, Junio C Hamano, (Wed Feb 14, 3:22 am)
Re: git-pull and tag objects, Johannes Schindelin, (Wed Feb 14, 7:18 am)
Re: git-pull and tag objects, Linus Torvalds, (Wed Feb 14, 12:35 pm)
speck-geostationary