diff options
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-branch.txt | 15 | ||||
| -rw-r--r-- | Documentation/git-checkout-index.txt | 10 | ||||
| -rw-r--r-- | Documentation/git-commit-tree.txt | 2 | ||||
| -rw-r--r-- | Documentation/git-lost-found.txt (renamed from Documentation/git-lost+found.txt) | 8 | ||||
| -rw-r--r-- | Documentation/git-prune-packed.txt | 6 | ||||
| -rw-r--r-- | Documentation/git-read-tree.txt | 4 | ||||
| -rw-r--r-- | Documentation/git-rename.txt | 32 | ||||
| -rw-r--r-- | Documentation/git-unpack-objects.txt | 6 | ||||
| -rw-r--r-- | Documentation/git-update-index.txt | 2 | ||||
| -rw-r--r-- | Documentation/git.txt | 5 |
10 files changed, 38 insertions, 52 deletions
diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt index a7121a4c6..98014f6d9 100644 --- a/Documentation/git-branch.txt +++ b/Documentation/git-branch.txt @@ -3,11 +3,11 @@ git-branch(1) NAME ---- -git-branch - Create a new branch. +git-branch - Create a new branch, or remove an old one. SYNOPSIS -------- -'git-branch' [<branchname> [start-point]] +'git-branch' [-d | -D] [<branchname> [start-point]] DESCRIPTION ----------- @@ -19,11 +19,18 @@ created, otherwise it will be created at the current HEAD. OPTIONS ------- +-d:: + Delete a branch. The branch must be fully merged. + +-D:: + Delete a branch irrespective of its index status. + <branchname>:: - The name of the branch to create. + The name of the branch to create or delete. start-point:: - Where to create the branch; defaults to HEAD. + Where to create the branch; defaults to HEAD. This + option has no meaning with -d and -D. Author ------ diff --git a/Documentation/git-checkout-index.txt b/Documentation/git-checkout-index.txt index 94b283a6b..5bff4865f 100644 --- a/Documentation/git-checkout-index.txt +++ b/Documentation/git-checkout-index.txt @@ -18,21 +18,21 @@ Will copy all files listed from the index to the working directory OPTIONS ------- --u:: +-u|--index:: update stat information for the checked out entries in the index file. --q:: +-q|--quiet:: be quiet if files exist or are not in the index --f:: +-f|--force:: forces overwrite of existing files --a:: +-a|--all:: checks out all files in the index. Cannot be used together with explicit filenames. --n:: +-n|--no-create:: Don't checkout new files, only refresh files already checked out. diff --git a/Documentation/git-commit-tree.txt b/Documentation/git-commit-tree.txt index b64cd6a84..5cf6bd3e2 100644 --- a/Documentation/git-commit-tree.txt +++ b/Documentation/git-commit-tree.txt @@ -8,7 +8,7 @@ git-commit-tree - Creates a new commit object SYNOPSIS -------- -'git-commit-tree' <tree> [-p <parent commit>]\ < changelog +'git-commit-tree' <tree> [-p <parent commit>]\* < changelog DESCRIPTION ----------- diff --git a/Documentation/git-lost+found.txt b/Documentation/git-lost-found.txt index a8cc5739d..03156f218 100644 --- a/Documentation/git-lost+found.txt +++ b/Documentation/git-lost-found.txt @@ -1,13 +1,13 @@ -git-lost+found(1) +git-lost-found(1) ================= NAME ---- -git-lost+found - Recover lost refs that luckily have not yet been pruned. +git-lost-found - Recover lost refs that luckily have not yet been pruned. SYNOPSIS -------- -'git-lost+found' +'git-lost-found' DESCRIPTION ----------- @@ -31,7 +31,7 @@ The ref to your tag is overwritten, but until you run 'git prune', it is still there. ------------ -$ git lost+found +$ git lost-found [1ef2b196d909eed523d4f3c9bf54b78cdd6843c6] GIT 0.99.9c ... ------------ diff --git a/Documentation/git-prune-packed.txt b/Documentation/git-prune-packed.txt index 28a1500d3..8d96a91b4 100644 --- a/Documentation/git-prune-packed.txt +++ b/Documentation/git-prune-packed.txt @@ -23,6 +23,12 @@ compression applied, stored in a single file, with an associated index file. Packs are used to reduce the load on mirror systems, backup engines, disk storage, etc. +OPTIONS +------- +-n:: + Don't actually remove any objects, only show those that would have been + removed. + Author ------ Written by Linus Torvalds <torvalds@osdl.org> diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt index e219c6a78..7be0cbd62 100644 --- a/Documentation/git-read-tree.txt +++ b/Documentation/git-read-tree.txt @@ -30,6 +30,10 @@ OPTIONS -m:: Perform a merge, not just a read. +--reset:: + + Same as -m except that unmerged entries will be silently ignored. + -u:: After a successful merge, update the files in the work tree with the result of the merge. diff --git a/Documentation/git-rename.txt b/Documentation/git-rename.txt deleted file mode 100644 index 583cb0315..000000000 --- a/Documentation/git-rename.txt +++ /dev/null @@ -1,32 +0,0 @@ -git-rename(1) -============= - -NAME ----- -git-rename - Script used to rename a file, directory or symlink. - - -SYNOPSIS --------- -'git-rename' <source> <destination> - -DESCRIPTION ------------ -This script is used to rename a file, directory or symlink. - -The index is updated after successful completion, but the change must still be -committed. - -Author ------- -Written by Linus Torvalds <torvalds@osdl.org> -Rewritten by Ryan Anderson <ryan@michonline.com> - -Documentation --------------- -Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>. - -GIT ---- -Part of the gitlink:git[7] suite - diff --git a/Documentation/git-unpack-objects.txt b/Documentation/git-unpack-objects.txt index b716ba1ad..31ea34d22 100644 --- a/Documentation/git-unpack-objects.txt +++ b/Documentation/git-unpack-objects.txt @@ -8,7 +8,7 @@ git-unpack-objects - Unpack objects from a packed archive. SYNOPSIS -------- -'git-unpack-objects' [-q] <pack-file +'git-unpack-objects' [-n] [-q] <pack-file DESCRIPTION @@ -19,6 +19,10 @@ one-object" format in $GIT_OBJECT_DIRECTORY. OPTIONS ------- +-n:: + Only list the objects that would be unpacked, don't actually unpack + them. + -q:: The command usually shows percentage progress. This flag suppresses it. diff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt index 52874c856..fdcb8bea7 100644 --- a/Documentation/git-update-index.txt +++ b/Documentation/git-update-index.txt @@ -60,7 +60,7 @@ OPTIONS Directly insert the specified info into the index. --index-info:: - Read index info from stdin. + Read index information from stdin. --chmod=(+|-)x:: Set the execute permissions on the updated files. diff --git a/Documentation/git.txt b/Documentation/git.txt index a9d47c115..7045f3f97 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -262,9 +262,6 @@ gitlink:git-push[1]:: gitlink:git-rebase[1]:: Rebase local commits to new upstream head. -gitlink:git-rename[1]:: - Rename files and directories. - gitlink:git-repack[1]:: Pack unpacked objects in a repository. @@ -309,7 +306,7 @@ gitlink:git-convert-objects[1]:: gitlink:git-cvsimport[1]:: Salvage your data out of another SCM people love to hate. -gitlink:git-lost+found[1]:: +gitlink:git-lost-found[1]:: Recover lost refs that luckily have not yet been pruned. gitlink:git-merge-one-file[1]:: |