diff options
| author |  Linus Torvalds <torvalds@osdl.org> | 2006-09-11 20:10:15 -0700 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2006-09-17 19:09:11 -0700 |
| commit | b37a562a1097af7403c649a5f903a93acaf279e8 (patch) | |
| tree | 1ba2c642fa6bc94484876d58d8848c48e5fd274b /git-merge-ours.sh | |
| parent | Start handling references internally as a sorted in-memory list (diff) | |
| download | tgif-b37a562a1097af7403c649a5f903a93acaf279e8.tar.xz | |
Add support for negative refs
You can remove a ref that is packed two different ways: either simply
repack all the refs without that one, or create a loose ref that has the
magic all-zero SHA1.
This also adds back the test that a ref actually has the object it
points to.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge-ours.sh')
0 files changed, 0 insertions, 0 deletions