From dcfdbdf08bbe102bd4806f3c92fb0e43f53a623a Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Sat, 3 Jan 2009 04:59:12 +0100 Subject: [PATCH 1/3] fast-export: print usage when no options specified Signed-off-by: Miklos Vajna Signed-off-by: Junio C Hamano --- builtin-fast-export.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/builtin-fast-export.c b/builtin-fast-export.c index 838633808c..e9ee2c79ac 100644 --- a/builtin-fast-export.c +++ b/builtin-fast-export.c @@ -497,6 +497,9 @@ int cmd_fast_export(int argc, const char **argv, const char *prefix) OPT_END() }; + if (argc == 1) + usage_with_options (fast_export_usage, options); + /* we handle encodings */ git_config(git_default_config, NULL); From c7719fbe46deae03578c4e19516b9567e98b9f04 Mon Sep 17 00:00:00 2001 From: Henrik Austad Date: Mon, 5 Jan 2009 16:25:36 +0100 Subject: [PATCH 2/3] Use capitalized names where appropriate The Linux kernel and Emacs are both spelled capitalized Signed-off-by: Henrik Austad Signed-off-by: Junio C Hamano --- Documentation/gittutorial.txt | 4 ++-- Documentation/user-manual.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation/gittutorial.txt b/Documentation/gittutorial.txt index 7892244ef1..458fafdb2c 100644 --- a/Documentation/gittutorial.txt +++ b/Documentation/gittutorial.txt @@ -590,7 +590,7 @@ list. When the history has lines of development that diverged and then merged back together, the order in which 'git-log' presents those commits is meaningless. -Most projects with multiple contributors (such as the linux kernel, +Most projects with multiple contributors (such as the Linux kernel, or git itself) have frequent merges, and 'gitk' does a better job of visualizing their history. For example, @@ -642,7 +642,7 @@ digressions that may be interesting at this point are: * linkgit:git-format-patch[1], linkgit:git-am[1]: These convert series of git commits into emailed patches, and vice versa, - useful for projects such as the linux kernel which rely heavily + useful for projects such as the Linux kernel which rely heavily on emailed patches. * linkgit:git-bisect[1]: When there is a regression in your diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index d4b1e90f94..5242a7e97b 100644 --- a/Documentation/user-manual.txt +++ b/Documentation/user-manual.txt @@ -59,7 +59,7 @@ project in mind, here are some interesting examples: ------------------------------------------------ # git itself (approx. 10MB download): $ git clone git://git.kernel.org/pub/scm/git/git.git - # the linux kernel (approx. 150MB download): + # the Linux kernel (approx. 150MB download): $ git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git ------------------------------------------------ @@ -1340,7 +1340,7 @@ These will display all commits which exist only on HEAD or on MERGE_HEAD, and which touch an unmerged file. You may also use linkgit:git-mergetool[1], which lets you merge the -unmerged files using external tools such as emacs or kdiff3. +unmerged files using external tools such as Emacs or kdiff3. Each time you resolve the conflicts in a file and update the index: From 0ddd93b2717d4da074485d42a08e4d3824580afe Mon Sep 17 00:00:00 2001 From: Henrik Austad Date: Mon, 5 Jan 2009 16:25:37 +0100 Subject: [PATCH 3/3] Be consistent in switch usage for tar tar handles switches with and witout preceding '-', but the documentation should be consistent nonetheless. Signed-off-by: Henrik Austad Signed-off-by: Junio C Hamano --- Documentation/user-manual.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index 5242a7e97b..19f571ae3b 100644 --- a/Documentation/user-manual.txt +++ b/Documentation/user-manual.txt @@ -1009,7 +1009,7 @@ $ git init If you have some initial content (say, a tarball): ------------------------------------------------- -$ tar -xzvf project.tar.gz +$ tar xzvf project.tar.gz $ cd project $ git init $ git add . # include everything below ./ in the first commit: