diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-12-01 12:47:04 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-12-01 12:47:04 -0800 |
| commit | 32ef08f4e5ab6ce8f3b47201f1df46d1a33deb80 (patch) | |
| tree | 12a4265c7ef9c801e5ec882fe8a807c86173d3a5 | |
| parent | Merge branch 'jc/deprecate-old-syntax-from-merge' (diff) | |
| parent | help: Do not unnecessarily look for a repository (diff) | |
| download | tgif-32ef08f4e5ab6ce8f3b47201f1df46d1a33deb80.tar.xz | |
Merge branch 'maint'
* maint:
help: Do not unnecessarily look for a repository
Documentation: Fix a few i.e./e.g. mix-ups
Documentation: Document --branch option in git clone synopsis
| -rw-r--r-- | Documentation/git-bundle.txt | 2 | ||||
| -rw-r--r-- | Documentation/git-clone.txt | 2 | ||||
| -rw-r--r-- | Documentation/gitcore-tutorial.txt | 2 | ||||
| -rw-r--r-- | builtin-help.c | 6 |
4 files changed, 6 insertions, 6 deletions
diff --git a/Documentation/git-bundle.txt b/Documentation/git-bundle.txt index aee7e4a8c9..c3a066e60c 100644 --- a/Documentation/git-bundle.txt +++ b/Documentation/git-bundle.txt @@ -24,7 +24,7 @@ ssh, rsync, http) cannot be used. This command provides support for 'git-fetch' and 'git-pull' to operate by packaging objects and references in an archive at the originating machine, then importing those into another repository using 'git-fetch' and 'git-pull' -after moving the archive by some means (i.e., by sneakernet). As no +after moving the archive by some means (e.g., by sneakernet). As no direct connection between the repositories exists, the user must specify a basis for the bundle that is held by the destination repository: the bundle assumes that all objects in the basis are already in the diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt index 7e7d9fcf50..7ccd742a87 100644 --- a/Documentation/git-clone.txt +++ b/Documentation/git-clone.txt @@ -11,7 +11,7 @@ SYNOPSIS [verse] 'git clone' [--template=<template_directory>] [-l] [-s] [--no-hardlinks] [-q] [-n] [--bare] [--mirror] - [-o <name>] [-u <upload-pack>] [--reference <repository>] + [-o <name>] [-b <name>] [-u <upload-pack>] [--reference <repository>] [--depth <depth>] [--recursive] [--] <repository> [<directory>] DESCRIPTION diff --git a/Documentation/gitcore-tutorial.txt b/Documentation/gitcore-tutorial.txt index e237394397..f762dca440 100644 --- a/Documentation/gitcore-tutorial.txt +++ b/Documentation/gitcore-tutorial.txt @@ -602,7 +602,7 @@ $ git tag -s <tagname> ---------------- which will sign the current `HEAD` (but you can also give it another -argument that specifies the thing to tag, i.e., you could have tagged the +argument that specifies the thing to tag, e.g., you could have tagged the current `mybranch` point by using `git tag <tagname> mybranch`). You normally only do signed tags for major releases or things diff --git a/builtin-help.c b/builtin-help.c index ca08519d9d..09ad4b04f9 100644 --- a/builtin-help.c +++ b/builtin-help.c @@ -427,9 +427,6 @@ int cmd_help(int argc, const char **argv, const char *prefix) return 0; } - setup_git_directory_gently(&nongit); - git_config(git_help_config, NULL); - if (!argv[0]) { printf("usage: %s\n\n", git_usage_string); list_common_cmds_help(); @@ -437,6 +434,9 @@ int cmd_help(int argc, const char **argv, const char *prefix) return 0; } + setup_git_directory_gently(&nongit); + git_config(git_help_config, NULL); + alias = alias_lookup(argv[0]); if (alias && !is_git_command(argv[0])) { printf("`git %s' is aliased to `%s'\n", argv[0], alias); |