diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-06 05:07:31 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-06 05:07:31 (GMT) |
| commit | 220a0b527bd6ecd30a9d6dfed22195c95e6f445a (patch) | |
| tree | c788895bfca71435d016d554c79b2d504b445550 /merge-base.c | |
| parent | 12dccc165400beae564d2357ce86c71937e5cdc0 (diff) | |
| download | git-220a0b527bd6ecd30a9d6dfed22195c95e6f445a.zip git-220a0b527bd6ecd30a9d6dfed22195c95e6f445a.tar.gz git-220a0b527bd6ecd30a9d6dfed22195c95e6f445a.tar.bz2 | |
More work on merging with git-read-tree..
Add a "-u" flag to update the tree as a result of a merge.
Right now this code is way too anal about things, and fails merges it
shouldn't, but let me fix up the different cases and this will allow for
much smoother merging even in the presense of dirty data in the working
tree.
Diffstat (limited to 'merge-base.c')
0 files changed, 0 insertions, 0 deletions