diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-01-17 22:39:49 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-17 22:39:49 -0800 |
| commit | 78f111e12de40e2d9aa8d0774acc287f79862b13 (patch) | |
| tree | 1c7f08c0e2ee31b86a2bfa1c010f5d7bddc3d0fb /Documentation | |
| parent | t5540: clarify that http-push does not handle packed-refs on the remote (diff) | |
| parent | builtin-fsck: fix off by one head count (diff) | |
| download | tgif-78f111e12de40e2d9aa8d0774acc287f79862b13.tar.xz | |
Merge branch 'maint-1.6.0' into maint
* maint-1.6.0:
builtin-fsck: fix off by one head count
Documentation: let asciidoc align related options
githooks.txt: add missing word
builtin-commit.c: do not remove COMMIT_EDITMSG
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-diff-files.txt | 5 | ||||
| -rw-r--r-- | Documentation/githooks.txt | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/Documentation/git-diff-files.txt b/Documentation/git-diff-files.txt index 5c8c1d95a8..c526141564 100644 --- a/Documentation/git-diff-files.txt +++ b/Documentation/git-diff-files.txt @@ -21,7 +21,10 @@ OPTIONS ------- include::diff-options.txt[] --1 -2 -3 or --base --ours --theirs, and -0:: +-1 --base:: +-2 --ours:: +-3 --theirs:: +-0:: Diff against the "base" version, "our branch" or "their branch" respectively. With these options, diffs for merged entries are not shown. diff --git a/Documentation/githooks.txt b/Documentation/githooks.txt index cfdae1efa2..28a8abcf52 100644 --- a/Documentation/githooks.txt +++ b/Documentation/githooks.txt @@ -90,7 +90,7 @@ This hook is invoked by 'git-commit' right after preparing the default log message, and before the editor is started. It takes one to three parameters. The first is the name of the file -that the commit log message. The second is the source of the commit +that contains the commit log message. The second is the source of the commit message, and can be: `message` (if a `-m` or `-F` option was given); `template` (if a `-t` option was given or the configuration option `commit.template` is set); `merge` (if the |