projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 63166cd 6d6776c)
Merge branch 'lt/oneway'
authorJunio C Hamano <junkio@cox.net>
Tue, 16 May 2006 01:15:26 +0000 (18:15 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 16 May 2006 01:15:26 +0000 (18:15 -0700)
* lt/oneway:
  read-tree --reset -u fix.
  read-tree -u one-way merge fix to check out locally modified paths.
  Simplify "git reset --hard"
  Allow one-way tree merge to remove old files


Trivial merge
The core git plumbing