diff options
| author | René Scharfe <rene.scharfe@lsrfire.ath.cx> | 2009-08-29 13:05:00 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-08-30 01:08:03 +0400 |
| commit | f7aec129fa78e39e200352502377f57952516f98 (patch) | |
| tree | b6aa55c7e3089c2fe2da9eb1dcd1dfac4902ec2e /Documentation | |
| parent | 53a1116c611e9e717d90e1406b29d97648460773 (diff) | |
UI consistency: allow --force for where -f means force
git branch, checkout, clean, mv and tag all have an option -f to override
certain checks. This patch makes them accept the long option --force as
a synonym.
While we're at it, document that checkout support --quiet as synonym for
its short option -q.
Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-branch.txt | 1 | ||||
| -rw-r--r-- | Documentation/git-checkout.txt | 2 | ||||
| -rw-r--r-- | Documentation/git-clean.txt | 1 | ||||
| -rw-r--r-- | Documentation/git-mv.txt | 1 | ||||
| -rw-r--r-- | Documentation/git-tag.txt | 1 |
5 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt index 99988872eb..aad71dc59a 100644 --- a/Documentation/git-branch.txt +++ b/Documentation/git-branch.txt @@ -76,6 +76,7 @@ OPTIONS based sha1 expressions such as "<branchname>@\{yesterday}". -f:: +--force:: Reset <branchname> to <startpoint> if <branchname> exists already. Without `-f` 'git-branch' refuses to change an existing branch. diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt index ad4b31e892..b1314b5614 100644 --- a/Documentation/git-checkout.txt +++ b/Documentation/git-checkout.txt @@ -45,9 +45,11 @@ file can be discarded to recreate the original conflicted merge result. OPTIONS ------- -q:: +--quiet:: Quiet, suppress feedback messages. -f:: +--force:: When switching branches, proceed even if the index or the working tree differs from HEAD. This is used to throw away local changes. diff --git a/Documentation/git-clean.txt b/Documentation/git-clean.txt index ae8938b2de..9d291bdd26 100644 --- a/Documentation/git-clean.txt +++ b/Documentation/git-clean.txt @@ -32,6 +32,7 @@ OPTIONS if you really want to remove such a directory. -f:: +--force:: If the git configuration specifies clean.requireForce as true, 'git-clean' will refuse to run unless given -f or -n. diff --git a/Documentation/git-mv.txt b/Documentation/git-mv.txt index 9c5660275b..bdcb58526e 100644 --- a/Documentation/git-mv.txt +++ b/Documentation/git-mv.txt @@ -28,6 +28,7 @@ committed. OPTIONS ------- -f:: +--force:: Force renaming or moving of a file even if the target exists -k:: Skip move or rename actions which would lead to an error diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt index 5113eaec62..299b04f726 100644 --- a/Documentation/git-tag.txt +++ b/Documentation/git-tag.txt @@ -51,6 +51,7 @@ OPTIONS Make a GPG-signed tag, using the given key -f:: +--force:: Replace an existing tag with the given name (instead of failing) -d:: |