global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-21 06:00:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into next

Browse Source 
* master:
  Git 1.7.3
  ls-files documentation: reword for consistency
  git-ls-files.txt: clarify -x/--exclude option
This commit is contained in:
Junio C Hamano
2010-09-18 14:55:29 -07:00
parent df51bf2791 87b50542a0
commit 7bba3ddda6
4 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Documentation/RelNotes/1.7.3.txt
View File

@@ -1,5 +1,5 @@
Git v1.7.3 Release Notes (draft) Git v1.7.3 Release Notes
================================ ========================
Updates since v1.7.2 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 * "git -c foo=bar subcmd" did not work well for subcmd that is not
implemented as a built-in command. 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)

11
Documentation/git-ls-files.txt
View File

@@ -79,15 +79,16 @@ OPTIONS
-x <pattern>:: -x <pattern>::
--exclude=<pattern>:: --exclude=<pattern>::
Skips files matching pattern. Skip untracked files matching pattern.
Note that pattern is a shell wildcard pattern. Note that pattern is a shell wildcard pattern. See EXCLUDE PATTERNS
below for more information.
-X <file>:: -X <file>::
--exclude-from=<file>:: --exclude-from=<file>::
exclude patterns are read from <file>; 1 per line. Read exclude patterns from <file>; 1 per line.
--exclude-per-directory=<file>:: --exclude-per-directory=<file>::
read additional exclude patterns that apply only to the Read additional exclude patterns that apply only to the
directory and its subdirectories in <file>. directory and its subdirectories in <file>.
--exclude-standard:: --exclude-standard::
@@ -192,7 +193,7 @@ These exclude patterns come from these places, in order:
file containing a list of patterns. Patterns are ordered file containing a list of patterns. Patterns are ordered
in the same order they appear in the file. in the same order they appear in the file.
3. command line flag --exclude-per-directory=<name> specifies 3. The command line flag --exclude-per-directory=<name> specifies
a name of the file in each directory 'git ls-files' a name of the file in each directory 'git ls-files'
examines, normally `.gitignore`. Files in deeper examines, normally `.gitignore`. Files in deeper
directories take precedence. Patterns are ordered in the directories take precedence. Patterns are ordered in the

5
Documentation/git.txt
View File

@@ -44,6 +44,11 @@ unreleased) version of git, that is available from 'master'
branch of the `git.git` repository. branch of the `git.git` repository.
Documentation for older releases are available here: 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] * link:v1.7.2.3/git.html[documentation for release 1.7.2.3]
* release notes for * release notes for

2
GIT-VERSION-GEN
View File

@@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
GVF=GIT-VERSION-FILE GVF=GIT-VERSION-FILE
DEF_VER=v1.7.3-rc2 DEF_VER=v1.7.3
LF=' LF='
' '