aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-07-03 03:14:32 -0700
committerJunio C Hamano <junkio@cox.net>2006-07-03 03:16:52 -0700
commitf23c75a8eca5eeabf9aaf303ee7e14a94da42ddc (patch)
treee8379d2e091dcdabb623ebbe8b7a1ee53be308a9 /Documentation
parent160b7983034cdd24ea1bf6ef7a2532a2296461c6 (diff)
parent8fced61cbc32f0c4b81a3dcecfeb40b7d96339ce (diff)
downloadgit-f23c75a8eca5eeabf9aaf303ee7e14a94da42ddc.tar.gz
git-f23c75a8eca5eeabf9aaf303ee7e14a94da42ddc.tar.xz
Merge branch 'master' into js/merge-base
This is to pull in the object-hash clean-up from the master branch.
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-commit.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index 0fe66f2d0..517a86b23 100644
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -15,9 +15,9 @@ SYNOPSIS
DESCRIPTION
-----------
Updates the index file for given paths, or all modified files if
-'-a' is specified, and makes a commit object. The command
-VISUAL and EDITOR environment variables to edit the commit log
-message.
+'-a' is specified, and makes a commit object. The command specified
+by either the VISUAL or EDITOR environment variables are used to edit
+the commit log message.
Several environment variable are used during commits. They are
documented in gitlink:git-commit-tree[1].