summaryrefslogtreecommitdiff
path: root/bundle.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-06-23 14:53:07 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-06-23 14:53:08 -0700
commitafaa2a479d4994b0e98847f95754f8c3536a662a (patch)
tree706c9c71ba3968db33e8931f481513ae305c9d36 /bundle.h
parentMerge branch 'rr/prompt-rebase-breakage-fix' (diff)
parentrebase: finish_rebase() in noop rebase (diff)
downloadtgif-afaa2a479d4994b0e98847f95754f8c3536a662a.tar.xz
Merge branch 'rr/rebase-autostash'
* rr/rebase-autostash: rebase: finish_rebase() in noop rebase rebase: finish_rebase() in fast-forward rebase rebase: guard against missing files in read_basic_state()
Diffstat (limited to 'bundle.h')
0 files changed, 0 insertions, 0 deletions