summaryrefslogtreecommitdiff
path: root/builtin-reset.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-05-25 07:59:59 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-05-25 07:59:59 (GMT)
commit8a17595899ac49a24128db76a80fbb35da487845 (patch)
tree0f63c48a50c0a3174bac68d151cb09e39283089a /builtin-reset.c
parentb064e2fc3d197c3c691fe89c43d1bf79f64fcdf7 (diff)
parentfff02ee666021b67b2272ce4445f7c1f5b26b77c (diff)
downloadgit-8a17595899ac49a24128db76a80fbb35da487845.zip
git-8a17595899ac49a24128db76a80fbb35da487845.tar.gz
git-8a17595899ac49a24128db76a80fbb35da487845.tar.bz2
Merge branch 'sb/format-patch-parseopt' into sb/opt-filename
* sb/format-patch-parseopt: format-patch: migrate to parse-options API Conflicts: builtin-log.c
Diffstat (limited to 'builtin-reset.c')
0 files changed, 0 insertions, 0 deletions