aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/git-commit.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-12-30 22:42:43 -0800
committerJunio C Hamano <junkio@cox.net>2006-12-30 22:42:43 -0800
commit76d4e079adba461c127641a1104772a62e38cd81 (patch)
tree7a8e335ed577aff47b5a80d8de5a6d7904813c02 /Documentation/git-commit.txt
parentmmap: set FD_CLOEXEC for file descriptors we keep open for mmap() (diff)
parentDocumentation/config.txt (and repo-config manpage): mark-up fix. (diff)
downloadgit-76d4e079adba461c127641a1104772a62e38cd81.tar.gz
git-76d4e079adba461c127641a1104772a62e38cd81.zip
Merge branch 'master' into sp/mmap
* master: Documentation/config.txt (and repo-config manpage): mark-up fix. Teach Git how to parse standard power of 2 suffixes. Use /dev/null for update hook stdin. Redirect update hook stdout to stderr. Remove unnecessary argc parameter from run_command_v. Automatically detect a bare git repository. Replace "GIT_DIR" with GIT_DIR_ENVIRONMENT. Use PATH_MAX constant for --bare. Force core.filemode to false on Cygwin. Fix formatting for urls section of fetch, pull, and push manpages Fix yet another subtle xdl_merge() bug i18n: drop "encoding" header in the output after re-coding. commit-tree: cope with different ways "utf-8" can be spelled. Move commit reencoding parameter parsing to revision.c Documentation: minor rewording for git-log and git-show pages. Documentation: i18n commit log message notes. t3900: test log --encoding=none commit re-encoding: fix confusion between no and default conversion.
Diffstat (limited to 'Documentation/git-commit.txt')
-rw-r--r--Documentation/git-commit.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index 0b74cd708e..a7adf24fa5 100644
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -223,6 +223,11 @@ should be recorded as a single commit. In fact, the command
refuses to run when given pathnames (but see `-i` option).
+DISCUSSION
+----------
+
+include::i18n.txt[]
+
ENVIRONMENT VARIABLES
---------------------
The command specified by either the VISUAL or EDITOR environment