summaryrefslogtreecommitdiff
path: root/dir.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-03-26 00:28:22 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-03-26 00:28:22 -0700
commit3fcee259d023087184c63eedf1015be6e23ea6e1 (patch)
treeab734962b5eb4883ed269bb2785e67322c504ced /dir.c
parentMerge branch 'mg/http-auth' (diff)
parentblame: read custom grafts given by -S before calling setup_revisions() (diff)
downloadtgif-3fcee259d023087184c63eedf1015be6e23ea6e1.tar.xz
Merge branch 'jc/maint-1.6.0-blame-s'
* jc/maint-1.6.0-blame-s: blame: read custom grafts given by -S before calling setup_revisions() Conflicts: builtin-blame.c
Diffstat (limited to 'dir.c')
0 files changed, 0 insertions, 0 deletions