diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-07 15:17:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-07 15:17:33 -0700 |
| commit | b5b425074e5f84f261b1290b1a83eca635c49147 (patch) | |
| tree | baa081569a1a1c671593aeacd8c225998fcff24a /commit.c | |
| parent | [PATCH] read-tree: update documentation for 3-way merge. (diff) | |
| download | git-b5b425074e5f84f261b1290b1a83eca635c49147.tar.gz git-b5b425074e5f84f261b1290b1a83eca635c49147.zip | |
git-read-tree: make one-way merge also honor the "update" flag
It didn't set CE_UPDATE before, so "-u" was a no-op.
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions