summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@osdl.org>2006-02-15 02:33:02 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-02-16 07:35:40 (GMT)
commit01df529722618a78d2acf6159c7b1e65f565cabc (patch)
treea1755b8df4754b4605fffc2cd1d1cabff14dc524 /Makefile
parent492e0759bfe4ff238b80ab80c27291ab99e4512b (diff)
downloadgit-01df529722618a78d2acf6159c7b1e65f565cabc.zip
git-01df529722618a78d2acf6159c7b1e65f565cabc.tar.gz
git-01df529722618a78d2acf6159c7b1e65f565cabc.tar.bz2
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>
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions