From 996869601594ffefb67238175055922340ced6f8 Mon Sep 17 00:00:00 2001 From: Stephan Beyer Date: Fri, 16 Jan 2009 21:36:06 +0100 Subject: githooks.txt: add missing word Signed-off-by: Stephan Beyer Signed-off-by: Junio C Hamano --- Documentation/githooks.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Documentation') diff --git a/Documentation/githooks.txt b/Documentation/githooks.txt index 5faaaa5fe..024abb2ff 100644 --- a/Documentation/githooks.txt +++ b/Documentation/githooks.txt @@ -86,7 +86,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 -- cgit v1.2.1 From bf474e2402e51843e8230c064da6ccfdf3a8ff54 Mon Sep 17 00:00:00 2001 From: Markus Heidelberg Date: Fri, 16 Jan 2009 22:42:33 +0100 Subject: Documentation: let asciidoc align related options Command line options can share the same paragraph of description, if they are related or synonymous. In these cases they should be written among each other, so that asciidoc can format them itself. Signed-off-by: Markus Heidelberg Signed-off-by: Junio C Hamano --- Documentation/git-diff-files.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'Documentation') diff --git a/Documentation/git-diff-files.txt b/Documentation/git-diff-files.txt index 5c8c1d95a..c52614156 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. -- cgit v1.2.1 From 9d3043cf333ee500e476a558acb234b42e43cc62 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 17 Jan 2009 23:04:35 -0800 Subject: Update draft release notes for 1.6.1.1 Signed-off-by: Junio C Hamano --- Documentation/RelNotes-1.6.1.1.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'Documentation') diff --git a/Documentation/RelNotes-1.6.1.1.txt b/Documentation/RelNotes-1.6.1.1.txt index cff0d8b98..5cd1ca9cc 100644 --- a/Documentation/RelNotes-1.6.1.1.txt +++ b/Documentation/RelNotes-1.6.1.1.txt @@ -9,9 +9,14 @@ Fixes since v1.6.1 * "git checkout $tree" did not trigger an error. +* "git commit" tried to remove COMMIT_EDITMSG from the work tree by mistake. + * "git describe --all" complained when a commit is described with a tag, which was nonsense. +* "git fsck branch" did not work as advertised; instead it behaved the same + way as "git fsck". + * "git log --pretty=format:%s" did not handle a multi-line subject the same way as built-in log listers (i.e. shortlog, --pretty=oneline, etc.) @@ -38,7 +43,7 @@ Other documentation updates. --- exec >/var/tmp/1 -O=v1.6.1-47-g914186a +O=v1.6.1-60-g78f111e echo O=$(git describe maint) git shortlog --no-merges $O..maint -- cgit v1.2.1