| commit | 438195ccedce7270cf5ba167a940c90467cb72d7 | |
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | |
| Thu, 9 Jun 2005 19:51:01 +0000 (9 12:51 -0700) | ||
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | |
| Thu, 9 Jun 2005 19:51:01 +0000 (9 12:51 -0700) | ||
| tree | 57b0518f32c7f43327e6ccb9bd91dedcceae77d7 | treesnapshot (tar.gz zip) |
| parent | 98a96b00b88ee35866cd0b1e94697db76bd5ddf9 | commitdiff |
git-read-tree: add "--reset" flag
This is the same as "-m", but it will silently ignore any unmerged
entries, which makes it useful for efficiently forcing a new position
regardless of the state of the current index file.
IOW, to reset to a previous HEAD (in case you have had a failed
merge, for example), you'd just do
git-read-tree -u --reset HEAD
which will also update your working tree to the right state.
NOTE! The "update" will not remove files that may have been added by the
merge. Yet.
This is the same as "-m", but it will silently ignore any unmerged
entries, which makes it useful for efficiently forcing a new position
regardless of the state of the current index file.
IOW, to reset to a previous HEAD (in case you have had a failed
merge, for example), you'd just do
git-read-tree -u --reset HEAD
which will also update your working tree to the right state.
NOTE! The "update" will not remove files that may have been added by the
merge. Yet.
| read-tree.c | diffblobblamehistory |