diff options
| author |  Petr Baudis <pasky@suse.cz> | 2006-06-07 20:43:50 +0200 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2006-06-07 12:37:46 -0700 |
| commit | 4514ad4fb77b3c68f69133c22b9c0d3b88ff058f (patch) | |
| tree | 53df5da969bdf6993afc831847307d70e1d1d1b3 /Documentation | |
| parent | make clean: remove dist-doc targets. (diff) | |
| download | tgif-4514ad4fb77b3c68f69133c22b9c0d3b88ff058f.tar.xz | |
Document git aliases support
This patch ports and modifies appropriately the git aliases documentation
from my patch, shall it rest in peace.
Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 8 | ||||
| -rw-r--r-- | Documentation/git.txt | 3 |
2 files changed, 11 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 4ce78679fe..570b691ba1 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -91,6 +91,14 @@ core.warnAmbiguousRefs:: If true, git will warn you if the ref name you passed it is ambiguous and might match multiple refs in the .git/refs/ tree. True by default. +alias.*:: + Command aliases for the gitlink:git[1] command wrapper - e.g. + after defining "alias.last = cat-file commit HEAD", the invocation + "git last" is equivalent to "git cat-file commit HEAD". To avoid + confusion, aliases that hide existing git commands are ignored. + Arguments are split at whitespaces, but single or double + quote pair can be used to quote them. + apply.whitespace:: Tells `git-apply` how to handle whitespaces, in the same way as the '--whitespace' option. See gitlink:git-apply[1]. diff --git a/Documentation/git.txt b/Documentation/git.txt index 61331ab121..d4472b56d1 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -21,6 +21,9 @@ link:everyday.html[Everyday Git] for a useful minimum set of commands, and "man git-commandname" for documentation of each command. CVS users may also want to read link:cvs-migration.html[CVS migration]. +The COMMAND is either a name of a Git command (see below) or an alias +as defined in the configuration file (see gitlink:git-repo-config[1]). + OPTIONS ------- --version:: |