diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org.(none)> | 2005-04-19 11:41:18 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org.(none)> | 2005-04-19 11:41:18 -0700 |
| commit | a3a65234dba0f90a0b8e06fa7b5f269fe5126761 (patch) | |
| tree | 7315346f212d77d19f8c7c2fc82c5beda21e4a95 /git-pull-script | |
| parent | ca016f0e4e7e508407fe17e121fcd520fbb7c865 (diff) | |
| download | git-a3a65234dba0f90a0b8e06fa7b5f269fe5126761.tar.gz | |
Make "read-tree" know how to do a "1-way merge".
This one just reads one tree, but picks up any matching stat information
from the old index.
Diffstat (limited to 'git-pull-script')
0 files changed, 0 insertions, 0 deletions