diff options
| -rw-r--r-- | builtin-commit.c | 2 | ||||
| -rwxr-xr-x | git-repack.sh | 1 | ||||
| -rw-r--r-- | wt-status.h | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/builtin-commit.c b/builtin-commit.c index 6433f86..a65c2b8 100644 --- a/builtin-commit.c +++ b/builtin-commit.c @@ -101,7 +101,7 @@ static struct option builtin_commit_options[] = { OPT_BOOLEAN('o', "only", &only, "commit only specified files"), OPT_BOOLEAN('n', "no-verify", &no_verify, "bypass pre-commit hook"), OPT_BOOLEAN(0, "amend", &amend, "amend previous commit"), - OPT_BOOLEAN(0, "untracked-files", &untracked_files, "show all untracked files"), + OPT_BOOLEAN('u', "untracked-files", &untracked_files, "show all untracked files"), OPT_BOOLEAN(0, "allow-empty", &allow_empty, "ok to record an empty change"), OPT_STRING(0, "cleanup", &cleanup_arg, "default", "how to strip spaces and #comments from message"), diff --git a/git-repack.sh b/git-repack.sh index e18eb3f..501519a 100755 --- a/git-repack.sh +++ b/git-repack.sh @@ -11,6 +11,7 @@ a pack everything in a single pack A same as -a, and keep unreachable objects too d remove redundant packs, and run git-prune-packed f pass --no-reuse-delta to git-pack-objects +n do not run git-update-server-info q,quiet be quiet l pass --local to git-pack-objects Packing constraints diff --git a/wt-status.h b/wt-status.h index 02afaa6..7d61410 100644 --- a/wt-status.h +++ b/wt-status.h @@ -28,8 +28,8 @@ struct wt_status { }; int git_status_config(const char *var, const char *value); -int wt_status_use_color; -int wt_status_relative_paths; +extern int wt_status_use_color; +extern int wt_status_relative_paths; void wt_status_prepare(struct wt_status *s); void wt_status_print(struct wt_status *s); |