summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorLibravatar Rene Scharfe <rene.scharfe@lsrfire.ath.cx>2006-06-18 12:57:56 +0200
committerLibravatar Junio C Hamano <junkio@cox.net>2006-06-18 04:17:49 -0700
commit37958be79227dc01f965993174af42672fc6756c (patch)
treeedc3c29b8f310916509ea3bf869be485f23232a2 /Documentation/git-merge.txt
parentSome more memory leak avoidance (diff)
downloadtgif-37958be79227dc01f965993174af42672fc6756c.tar.xz
git-tar-tree: Simplify write_trailer()
We can write the trailer in one or at most two steps; it will always fit within two blocks. With the last caller of get_record() gone we can get rid of it. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions