summaryrefslogtreecommitdiffstats
path: root/builtin/commit.c
diff options
context:
space:
mode:
Diffstat (limited to 'builtin/commit.c')
-rw-r--r--builtin/commit.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/commit.c b/builtin/commit.c
index 8a534de3cc..0245d9f2ce 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -145,7 +145,7 @@ static struct option builtin_commit_options[] = {
STATUS_FORMAT_SHORT),
OPT_BOOLEAN(0, "branch", &status_show_branch, "show branch information"),
OPT_SET_INT(0, "porcelain", &status_format,
- "show porcelain output format", STATUS_FORMAT_PORCELAIN),
+ "machine-readable output", STATUS_FORMAT_PORCELAIN),
OPT_BOOLEAN('z', "null", &null_termination,
"terminate entries with NUL"),
OPT_BOOLEAN(0, "amend", &amend, "amend previous commit"),
@@ -1092,7 +1092,7 @@ int cmd_status(int argc, const char **argv, const char *prefix)
OPT_BOOLEAN('b', "branch", &status_show_branch,
"show branch information"),
OPT_SET_INT(0, "porcelain", &status_format,
- "show porcelain output format",
+ "machine-readable output",
STATUS_FORMAT_PORCELAIN),
OPT_BOOLEAN('z', "null", &null_termination,
"terminate entries with NUL"),
allocation failure pathSasha Levin1-2/+1 2025-10-03ima: don't clear IMA_DIGSIG flag when setting or removing non-IMA xattrCoiby Xu1-5/+18 2025-10-03lib/digsig: Use SHA-1 library instead of crypto_shashEric Biggers2-42/+7 2025-10-03integrity: Select CRYPTO from INTEGRITY_ASYMMETRIC_KEYSEric Biggers1-0/+1 2025-10-03f2fs: add missing dput() when printing the donation listJaegeuk Kim1-0/+1 2025-10-02libbpf: Fix missing #pragma in libbpf_utils.cTony Ambardar1-0/+1 2025-10-02selftests/bpf: Add tests for rejection of ALU ops with negative offsetsEduard Zingerman1-0/+29 2025-10-01cifs: client: force multichannel=off when max_channels=1Rajasi Mandal1-0/+7 2025-10-01smb client: fix bug with newly created file in cached dirBharath SM1-0/+1 2025-10-01smb: client: short-circuit negative lookups when parent dir is fully cachedHenrique Carvalho1-1/+42 2025-10-01smb: client: short-circuit in open_cached_dir_by_dentry() if !dentryHenrique Carvalho1-1/+4 2025-10-01smb: client: remove pointless cfid->has_lease checkHenrique Carvalho1-4/+1 2025-10-01smb: client: transport: minor indentation style fixFiona Ebner1-2/+1 2025-10-01smb: client: transport: avoid reconnects triggered by pending task workFiona Ebner1-1/+9 2025-10-01smb: client: remove unused fid_lockHenrique Carvalho2-15/+3 2025-10-01smb: client: update cfid->last_access_time in open_cached_dir_by_dentry()Henrique Carvalho1-0/+1 2025-10-01smb: client: ensure open_cached_dir_by_dentry() only returns valid cfidSteve French4-6/+13 2025-10-01smb: client: account smb directory cache usage and per-tcon totalsBharath SM5-14/+63 2025-10-01smb: client: add drop_dir_cache module parameter to invalidate cached direntsBharath SM1-0/+38 2025-10-01clk: COMMON_CLK_RPMI should depend on RISCVGeert Uytterhoeven1-0/+1 2025-10-02tracing: Fix race condition in kprobe initialization causing NULL pointer der...Yuan Chen4-14/+28