aboutsummaryrefslogtreecommitdiff
path: root/builtin-diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-05-15 18:15:26 -0700
committerJunio C Hamano <junkio@cox.net>2006-05-15 18:15:26 -0700
commit8701ea0f627dcba4bb75570f87df9c93985d397a (patch)
tree77ef1b918b14b04d2f294c32bb8aca12cb40da06 /builtin-diff.c
parent63166cd64fe7f0cb8290ad33e0e7cd0273bc551d (diff)
parent6d6776cb497ea7fbf5fe43912dbe3286f76c9933 (diff)
downloadgit-8701ea0f627dcba4bb75570f87df9c93985d397a.tar.gz
git-8701ea0f627dcba4bb75570f87df9c93985d397a.tar.xz
Merge branch 'lt/oneway'
* 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
Diffstat (limited to 'builtin-diff.c')
0 files changed, 0 insertions, 0 deletions