diff options
| author |  Linus Torvalds <torvalds@ppc970.osdl.org.(none)> | 2005-04-19 12:56:47 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org.(none)> | 2005-04-19 12:56:47 -0700 |
| commit | 8ccfbf3279b07028035aeb58baed5c4a79b63567 (patch) | |
| tree | 79c21a1f0b5ac1eab8ac9044564468048f320fd6 /show-diff.c | |
| parent | Make "read-tree" know how to do a "1-way merge". (diff) | |
| download | tgif-8ccfbf3279b07028035aeb58baed5c4a79b63567.tar.xz | |
Update "git-pull-script" to use "read-tree -m" for
reading a single tree too. That should speed up a
trivial merge noticeably.
Also, don't bother reading back the tree we just wrote
when we committed a real merge. It had better be the
same one we still have..
Diffstat (limited to 'show-diff.c')
0 files changed, 0 insertions, 0 deletions