summaryrefslogtreecommitdiff
path: root/sha1_file.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-05-19 20:37:19 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-05-19 20:37:19 -0700
commit6699c959efccc7cb969b87bdf8e0154a0fe9ccc8 (patch)
tree96b536942f08c30e8d5f9f7dc6ec950ddd67f0e3 /sha1_file.c
parentMerge branch 'jc/maint-pathspec-stdin-and-cmdline' (diff)
parentt3503: test cherry picking and reverting root commits (diff)
downloadtgif-6699c959efccc7cb969b87bdf8e0154a0fe9ccc8.tar.xz
Merge branch 'jk/cherry-pick-root-with-resolve'
* jk/cherry-pick-root-with-resolve: t3503: test cherry picking and reverting root commits revert: allow reverting a root commit cherry-pick: handle root commits with external strategies
Diffstat (limited to 'sha1_file.c')
0 files changed, 0 insertions, 0 deletions