From 75609a0d44d02878e6260a7a4bf2dda5310a9dd9 Mon Sep 17 00:00:00 2001 From: Jay Soffian Date: Wed, 15 Sep 2010 19:56:48 -0400 Subject: [PATCH 1/3] git-ls-files.txt: clarify -x/--exclude option Since b5227d8, -x/--exclude does not apply to cached files. This is easy to miss unless you read the discussion in the EXCLUDE PATTERNS section. Clarify that the option applies to untracked files and direct the reader to EXCLUDE PATTERNS. Signed-off-by: Jay Soffian Signed-off-by: Junio C Hamano --- Documentation/git-ls-files.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt index 89859153f3..c05e7a5e70 100644 --- a/Documentation/git-ls-files.txt +++ b/Documentation/git-ls-files.txt @@ -79,8 +79,9 @@ OPTIONS -x :: --exclude=:: - Skips files matching pattern. - Note that pattern is a shell wildcard pattern. + Skips untracked files matching pattern. + Note that pattern is a shell wildcard pattern. See EXCLUDE PATTERNS + below for more information. -X :: --exclude-from=:: From 4c608520ed58301de99024e47a0579b058db0a65 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 15 Sep 2010 17:34:20 -0700 Subject: [PATCH 2/3] ls-files documentation: reword for consistency Similar to descriptions of other options, state what -x does in imperative mood. Start sentences for -X and --exclude-per-directory options in capital letters. Signed-off-by: Junio C Hamano --- Documentation/git-ls-files.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt index c05e7a5e70..44b6480c0f 100644 --- a/Documentation/git-ls-files.txt +++ b/Documentation/git-ls-files.txt @@ -79,16 +79,16 @@ OPTIONS -x :: --exclude=:: - Skips untracked files matching pattern. + Skip untracked files matching pattern. Note that pattern is a shell wildcard pattern. See EXCLUDE PATTERNS below for more information. -X :: --exclude-from=:: - exclude patterns are read from ; 1 per line. + Read exclude patterns from ; 1 per line. --exclude-per-directory=:: - read additional exclude patterns that apply only to the + Read additional exclude patterns that apply only to the directory and its subdirectories in . --exclude-standard:: @@ -178,7 +178,7 @@ These exclude patterns come from these places, in order: file containing a list of patterns. Patterns are ordered in the same order they appear in the file. - 3. command line flag --exclude-per-directory= specifies + 3. The command line flag --exclude-per-directory= specifies a name of the file in each directory 'git-ls-files' examines, normally `.gitignore`. Files in deeper directories take precedence. Patterns are ordered in the From 87b50542a08ac6caa083ddc376e674424e37940a Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 18 Sep 2010 14:55:08 -0700 Subject: [PATCH 3/3] Git 1.7.3 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/1.7.3.txt | 15 ++------------- Documentation/git.txt | 5 +++++ GIT-VERSION-GEN | 2 +- 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/Documentation/RelNotes/1.7.3.txt b/Documentation/RelNotes/1.7.3.txt index b55731f23f..309c33181f 100644 --- a/Documentation/RelNotes/1.7.3.txt +++ b/Documentation/RelNotes/1.7.3.txt @@ -1,5 +1,5 @@ -Git v1.7.3 Release Notes (draft) -================================ +Git v1.7.3 Release Notes +======================== Updates since v1.7.2 -------------------- @@ -74,14 +74,3 @@ release, unless otherwise noted. * "git -c foo=bar subcmd" did not work well for subcmd that is not implemented as a built-in command. - ---- -exec >/var/tmp/1 -echo O=$(git describe master) -O=v1.7.3-rc2 -git shortlog --no-merges $O..master ^maint -exit 0 - -What did we want to do with... - -1e3d411 (Enable custom schemes for column colors in the graph API, 2010-07-13) diff --git a/Documentation/git.txt b/Documentation/git.txt index 69ef12e272..646e761789 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -44,6 +44,11 @@ unreleased) version of git, that is available from 'master' branch of the `git.git` repository. Documentation for older releases are available here: +* link:v1.7.3/git.html[documentation for release 1.7.3] + +* release notes for + link:RelNotes/1.7.3.txt[1.7.3]. + * link:v1.7.2.3/git.html[documentation for release 1.7.2.3] * release notes for diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 556cee1ca7..ac9c4dbf2f 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.7.3-rc2 +DEF_VER=v1.7.3 LF=' '