diff options
author | Junio C Hamano <junkio@cox.net> | 2006-05-14 16:58:44 -0700 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-05-14 16:58:44 -0700 |
commit | 5708a6666dd9f6d233836fdc86afef0a408c01b6 (patch) | |
tree | ce9b5036804fa69b113e9d8a16dfc1ee40502401 /unpack-objects.c | |
parent | Merge branch 'lt/diff' into next (diff) | |
parent | Simplify "git reset --hard" (diff) | |
download | tgif-5708a6666dd9f6d233836fdc86afef0a408c01b6.tar.xz |
Merge branch 'lt/oneway' into next
* lt/oneway:
Simplify "git reset --hard"
Allow one-way tree merge to remove old files
Diffstat (limited to 'unpack-objects.c')
0 files changed, 0 insertions, 0 deletions