summaryrefslogtreecommitdiff
path: root/builtin-merge-ours.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2008-06-24 19:05:45 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-06-24 19:06:06 -0700
commitba2d0f4f35beffbf715ca652d5b36df8c0ad5ceb (patch)
tree101a2cbb0ee1bb98dc095d7c1103b2feeab78db6 /builtin-merge-ours.c
parentrefactor pack structure allocation (diff)
downloadtgif-ba2d0f4f35beffbf715ca652d5b36df8c0ad5ceb.tar.xz
pre-rebase hook update
This hook is what I have been using to manage topic branches in git.git, but have not been updated to the Real Thing for a while. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-merge-ours.c')
0 files changed, 0 insertions, 0 deletions