From 0086e2c854e3af3209915e4ec2f933bcef400050 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 13 Nov 2005 02:07:02 -0800 Subject: Rename lost+found to lost-found. Because we use "lost-found" as the directory name to hold dangling object names, it is confusing to call the command git-lost+found, although it makes sense and is even cute ;-). Signed-off-by: Junio C Hamano --- Documentation/git-lost+found.txt | 78 ---------------------------------------- Documentation/git-lost-found.txt | 78 ++++++++++++++++++++++++++++++++++++++++ Documentation/git.txt | 2 +- 3 files changed, 79 insertions(+), 79 deletions(-) delete mode 100644 Documentation/git-lost+found.txt create mode 100644 Documentation/git-lost-found.txt (limited to 'Documentation') diff --git a/Documentation/git-lost+found.txt b/Documentation/git-lost+found.txt deleted file mode 100644 index a8cc5739d7..0000000000 --- a/Documentation/git-lost+found.txt +++ /dev/null @@ -1,78 +0,0 @@ -git-lost+found(1) -================= - -NAME ----- -git-lost+found - Recover lost refs that luckily have not yet been pruned. - -SYNOPSIS --------- -'git-lost+found' - -DESCRIPTION ------------ -Finds dangling commits and tags from the object database, and -creates refs to them in .git/lost-found/ directory. Commits and -tags that dereference to commits go to .git/lost-found/commit -and others are stored in .git/lost-found/other directory. - - -OUTPUT ------- -One line description from the commit and tag found along with -their object name are printed on the standard output. - - -EXAMPLE -------- - -Suppose you run 'git tag -f' and mistyped the tag to overwrite. -The ref to your tag is overwritten, but until you run 'git -prune', it is still there. - ------------- -$ git lost+found -[1ef2b196d909eed523d4f3c9bf54b78cdd6843c6] GIT 0.99.9c -... ------------- - -Also you can use gitk to browse how they relate to each other -and existing (probably old) tags. - ------------- -$ gitk $(cd .git/lost-found/commit && echo ??*) ------------- - -After making sure that it is the object you are looking for, you -can reconnect it to your regular .git/refs hierarchy. - ------------- -$ git cat-file -t 1ef2b196 -tag -$ git cat-file tag 1ef2b196 -object fa41bbce8e38c67a218415de6cfa510c7e50032a -type commit -tag v0.99.9c -tagger Junio C Hamano 1131059594 -0800 - -GIT 0.99.9c - -This contains the following changes from the "master" branch, since -... -$ git update-ref refs/tags/not-lost-anymore 1ef2b196 -$ git rev-parse not-lost-anymore -1ef2b196d909eed523d4f3c9bf54b78cdd6843c6 ------------- - -Author ------- -Written by Junio C Hamano 濱野 純 - -Documentation --------------- -Documentation by Junio C Hamano and the git-list . - - -GIT ---- -Part of the gitlink:git[7] suite diff --git a/Documentation/git-lost-found.txt b/Documentation/git-lost-found.txt new file mode 100644 index 0000000000..03156f218b --- /dev/null +++ b/Documentation/git-lost-found.txt @@ -0,0 +1,78 @@ +git-lost-found(1) +================= + +NAME +---- +git-lost-found - Recover lost refs that luckily have not yet been pruned. + +SYNOPSIS +-------- +'git-lost-found' + +DESCRIPTION +----------- +Finds dangling commits and tags from the object database, and +creates refs to them in .git/lost-found/ directory. Commits and +tags that dereference to commits go to .git/lost-found/commit +and others are stored in .git/lost-found/other directory. + + +OUTPUT +------ +One line description from the commit and tag found along with +their object name are printed on the standard output. + + +EXAMPLE +------- + +Suppose you run 'git tag -f' and mistyped the tag to overwrite. +The ref to your tag is overwritten, but until you run 'git +prune', it is still there. + +------------ +$ git lost-found +[1ef2b196d909eed523d4f3c9bf54b78cdd6843c6] GIT 0.99.9c +... +------------ + +Also you can use gitk to browse how they relate to each other +and existing (probably old) tags. + +------------ +$ gitk $(cd .git/lost-found/commit && echo ??*) +------------ + +After making sure that it is the object you are looking for, you +can reconnect it to your regular .git/refs hierarchy. + +------------ +$ git cat-file -t 1ef2b196 +tag +$ git cat-file tag 1ef2b196 +object fa41bbce8e38c67a218415de6cfa510c7e50032a +type commit +tag v0.99.9c +tagger Junio C Hamano 1131059594 -0800 + +GIT 0.99.9c + +This contains the following changes from the "master" branch, since +... +$ git update-ref refs/tags/not-lost-anymore 1ef2b196 +$ git rev-parse not-lost-anymore +1ef2b196d909eed523d4f3c9bf54b78cdd6843c6 +------------ + +Author +------ +Written by Junio C Hamano 濱野 純 + +Documentation +-------------- +Documentation by Junio C Hamano and the git-list . + + +GIT +--- +Part of the gitlink:git[7] suite diff --git a/Documentation/git.txt b/Documentation/git.txt index a9d47c115c..1c32dd5be7 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -309,7 +309,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]:: -- cgit v1.3 From 1331df878113037aabc496860b49ed14a762517c Mon Sep 17 00:00:00 2001 From: Josef Weidendorfer Date: Sun, 13 Nov 2005 15:08:00 +0100 Subject: Remove git-rename. git-mv does the same Signed-off-by: Josef Weidendorfer Signed-off-by: Junio C Hamano --- .gitignore | 1 - Documentation/git-rename.txt | 32 -------------------- Documentation/git.txt | 3 -- Makefile | 2 +- git-rename.perl | 70 -------------------------------------------- 5 files changed, 1 insertion(+), 107 deletions(-) delete mode 100644 Documentation/git-rename.txt delete mode 100755 git-rename.perl (limited to 'Documentation') diff --git a/.gitignore b/.gitignore index 16a8af63f0..0dd7b9c7b4 100644 --- a/.gitignore +++ b/.gitignore @@ -74,7 +74,6 @@ git-read-tree git-rebase git-receive-pack git-relink -git-rename git-repack git-request-pull git-reset diff --git a/Documentation/git-rename.txt b/Documentation/git-rename.txt deleted file mode 100644 index 583cb0315e..0000000000 --- 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' - -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 -Rewritten by Ryan Anderson - -Documentation --------------- -Documentation by David Greaves, Junio C Hamano and the git-list . - -GIT ---- -Part of the gitlink:git[7] suite - diff --git a/Documentation/git.txt b/Documentation/git.txt index 1c32dd5be7..7045f3f97e 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. diff --git a/Makefile b/Makefile index eeedf8ceb9..63cb99847f 100644 --- a/Makefile +++ b/Makefile @@ -96,7 +96,7 @@ SCRIPT_SH = \ SCRIPT_PERL = \ git-archimport.perl git-cvsimport.perl git-relink.perl \ - git-rename.perl git-shortlog.perl git-fmt-merge-msg.perl \ + git-shortlog.perl git-fmt-merge-msg.perl \ git-svnimport.perl git-mv.perl git-cvsexportcommit.perl SCRIPT_PYTHON = \ diff --git a/git-rename.perl b/git-rename.perl deleted file mode 100755 index 3b1127b1b2..0000000000 --- a/git-rename.perl +++ /dev/null @@ -1,70 +0,0 @@ -#!/usr/bin/perl -# -# Copyright 2005, Ryan Anderson -# -# This file is licensed under the GPL v2, or a later version -# at the discretion of Linus Torvalds. - - -use warnings; -use strict; - -sub usage($); - -# Sanity checks: -my $GIT_DIR = $ENV{'GIT_DIR'} || ".git"; - -unless ( -d $GIT_DIR && -d $GIT_DIR . "/objects" && - -d $GIT_DIR . "/objects/" && -d $GIT_DIR . "/refs") { - usage("Git repository not found."); -} - -usage("") if scalar @ARGV != 2; - -my ($src,$dst) = @ARGV; - -unless (-f $src || -l $src || -d $src) { - usage("git rename: bad source '$src'"); -} - -if (-e $dst) { - usage("git rename: destinations '$dst' already exists"); -} - -my (@allfiles,@srcfiles,@dstfiles); - -$/ = "\0"; -open(F,"-|","git-ls-files","-z") - or die "Failed to open pipe from git-ls-files: " . $!; - -@allfiles = map { chomp; $_; } ; -close(F); - -my $safesrc = quotemeta($src); -@srcfiles = grep /^$safesrc/, @allfiles; -@dstfiles = @srcfiles; -s#^$safesrc(/|$)#$dst$1# for @dstfiles; - -rename($src,$dst) - or die "rename failed: $!"; - -my $rc = system("git-update-index","--add","--",@dstfiles); -die "git-update-index failed to add new name with code $?\n" if $rc; - -$rc = system("git-update-index","--remove","--",@srcfiles); -die "git-update-index failed to remove old name with code $?\n" if $rc; - - -sub usage($) { - my $s = shift; - print $s, "\n" if (length $s != 0); - print < -source must exist and be either a file, symlink or directory. -dest must NOT exist. - -Renames source to dest, and updates the git cache to reflect the change. -Use "git commit" to make record the change permanently. -EOT - exit(1); -} -- cgit v1.3 From d4072c9722d1ef28abe8ef0eb0b244017fff3f42 Mon Sep 17 00:00:00 2001 From: Andreas Ericsson Date: Mon, 14 Nov 2005 17:53:42 +0100 Subject: git-branch: Mention -d and -D in man-page. Signed-off-by: Andreas Ericsson Signed-off-by: Junio C Hamano --- Documentation/git-branch.txt | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'Documentation') diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt index a7121a4c63..98014f6d9b 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' [ [start-point]] +'git-branch' [-d | -D] [ [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. + :: - 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 ------ -- cgit v1.3 From b2309b70197f9067cb32a620465a9b3477d8f0c3 Mon Sep 17 00:00:00 2001 From: Nikolai Weibull Date: Tue, 15 Nov 2005 00:20:01 +0100 Subject: Document the -n command-line option to git-unpack-objects This patch documents the -n command-line option to git-unpack-objects, as it was previously undocumented. Signed-off-by: Nikolai Weibull Signed-off-by: Junio C Hamano --- Documentation/git-unpack-objects.txt | 6 +++++- unpack-objects.c | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'Documentation') diff --git a/Documentation/git-unpack-objects.txt b/Documentation/git-unpack-objects.txt index b716ba1ad3..31ea34d229 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] static int dry_run, quiet; -static const char unpack_usage[] = "git-unpack-objects [-q] < pack-file"; +static const char unpack_usage[] = "git-unpack-objects [-n] [-q] < pack-file"; /* We always read in 4kB chunks. */ static unsigned char buffer[4096]; -- cgit v1.3 From 2db0bfbc04478d9fb42f58ff50ad4123a2a9ddde Mon Sep 17 00:00:00 2001 From: Nikolai Weibull Date: Tue, 15 Nov 2005 00:20:01 +0100 Subject: Document a couple of missing command-line options. This patch adds documentation to quite a few command-line options. Signed-off-by: Nikolai Weibull Signed-off-by: Junio C Hamano --- Documentation/git-checkout-index.txt | 10 +++++----- Documentation/git-prune-packed.txt | 6 ++++++ Documentation/git-read-tree.txt | 4 ++++ 3 files changed, 15 insertions(+), 5 deletions(-) (limited to 'Documentation') diff --git a/Documentation/git-checkout-index.txt b/Documentation/git-checkout-index.txt index 94b283a6bf..5bff4865f7 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-prune-packed.txt b/Documentation/git-prune-packed.txt index 28a1500d39..8d96a91b41 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 diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt index e219c6a788..7be0cbd620 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. -- cgit v1.3 From 7acab8f16785151f9b6d9bbd8a9b0a8b76b26fba Mon Sep 17 00:00:00 2001 From: Nikolai Weibull Date: Tue, 15 Nov 2005 00:20:01 +0100 Subject: Documentation nitpicking This patch fixes some small problems with the documentation. Signed-off-by: Nikolai Weibull Signed-off-by: Junio C Hamano --- Documentation/git-commit-tree.txt | 2 +- Documentation/git-update-index.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'Documentation') diff --git a/Documentation/git-commit-tree.txt b/Documentation/git-commit-tree.txt index b64cd6a84b..5cf6bd3e21 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' [-p ]\ < changelog +'git-commit-tree' [-p ]\* < changelog DESCRIPTION ----------- diff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt index 52874c8562..fdcb8bea7d 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. -- cgit v1.3