summaryrefslogtreecommitdiff
path: root/builtin-merge-ours.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2009-09-05 04:59:56 -0400
committerJunio C Hamano <gitster@pobox.com>2009-09-05 23:16:32 -0700
commit7c9f7038e923e6eb135b27c6fca9a010b034bc27 (patch)
treee123bfb2fe90b490cf5fcb89c5ff5db03cc3451b /builtin-merge-ours.c
parent6f15787181a163e158c6fee1d79085b97692ac2f (diff)
downloadgit-7c9f7038e923e6eb135b27c6fca9a010b034bc27.tar.gz
commit: support alternate status formats
The status command recently grew "short" and "porcelain" options for alternate output formats. Since status is no longer "commit --dry-run", these formats are inaccessible to people who do want to see a dry-run in a parseable form. This patch makes those formats available to "git commit", implying the "dry-run" option when they are used. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-merge-ours.c')
0 files changed, 0 insertions, 0 deletions