diff options
author | Junio C Hamano <junkio@cox.net> | 2006-06-04 00:01:52 -0700 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-06-04 00:01:52 -0700 |
commit | f63237a18e951b93ac46a0e594f286255e1eaaaf (patch) | |
tree | a131e9466bc5ca7ca42e31e71274ce3152dc8615 /Documentation/git-sh-setup.txt | |
parent | Merge branch 'jc/fmt-patch' into next (diff) | |
parent | Cleanup git-send-email.perl:extract_valid_email (diff) | |
download | tgif-f63237a18e951b93ac46a0e594f286255e1eaaaf.tar.xz |
Merge branch 'vb/sendemail' into next
* vb/sendemail:
Cleanup git-send-email.perl:extract_valid_email
read-tree --reset: update working tree file for conflicted paths.
Documentation: Spelling fixes
Builtin git-rev-parse.
fetch: do not report "same" unless -verbose.
Diffstat (limited to 'Documentation/git-sh-setup.txt')
-rw-r--r-- | Documentation/git-sh-setup.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-sh-setup.txt b/Documentation/git-sh-setup.txt index 6742c9bfcf..79217d8a56 100644 --- a/Documentation/git-sh-setup.txt +++ b/Documentation/git-sh-setup.txt @@ -13,7 +13,7 @@ DESCRIPTION ----------- Sets up the normal git environment variables and a few helper functions -(currently just "die()"), and returns ok if it all looks like a git archive. +(currently just "die()"), and returns OK if it all looks like a git archive. So, to make the rest of the git scripts more careful and readable, use it as follows: |