| commit | 01df529722618a78d2acf6159c7b1e65f565cabc | |
| author | Linus Torvalds <torvalds@osdl.org> | |
| Wed, 15 Feb 2006 02:33:02 +0000 (14 18:33 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Thu, 16 Feb 2006 07:35:40 +0000 (15 23:35 -0800) | ||
| tree | a1755b8df4754b4605fffc2cd1d1cabff14dc524 | treesnapshot (tar.gz zip) |
| parent | 492e0759bfe4ff238b80ab80c27291ab99e4512b | commitdiff |
Handling large files with GIT
On Tue, 14 Feb 2006, Linus Torvalds wrote:
>
> Here, btw, is the trivial diff to turn my previous "tree-resolve" into a
> "resolve tree relative to the current branch".
Gaah. It was trivial, and it happened to work fine for my test-case, but
when I started looking at not doing that extremely aggressive subdirectory
merging, that showed a few other issues...
So in case people want to try, here's a third patch. Oh, and it's against
my _original_ path, not incremental to the middle one (ie both patches two
and three are against patch #1, it's not a nice series).
Now I'm really done, and won't be sending out any more patches today.
Sorry for the noise.
Linus
Signed-off-by: Junio C Hamano <junkio@cox.net>
On Tue, 14 Feb 2006, Linus Torvalds wrote:
>
> Here, btw, is the trivial diff to turn my previous "tree-resolve" into a
> "resolve tree relative to the current branch".
Gaah. It was trivial, and it happened to work fine for my test-case, but
when I started looking at not doing that extremely aggressive subdirectory
merging, that showed a few other issues...
So in case people want to try, here's a third patch. Oh, and it's against
my _original_ path, not incremental to the middle one (ie both patches two
and three are against patch #1, it's not a nice series).
Now I'm really done, and won't be sending out any more patches today.
Sorry for the noise.
Linus
Signed-off-by: Junio C Hamano <junkio@cox.net>
| merge-tree.c | diffblobblamehistory |