diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-12-29 01:18:34 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-12-29 01:18:34 -0800 |
| commit | 373654ee0f568fdeab891c621d6a1ac6b0c15d3a (patch) | |
| tree | 874b0b65f053953d102e53830492002c12275ecd /Documentation | |
| parent | 9c6c304d6a01b72d7ce20722b80ca62e01fe8356 (diff) | |
| parent | 936b7057e8401665a2d106e8de018561db6333fe (diff) | |
| download | git-373654ee0f568fdeab891c621d6a1ac6b0c15d3a.tar.gz git-373654ee0f568fdeab891c621d6a1ac6b0c15d3a.tar.xz | |
Merge branch 'maint'
* maint:
Prepare for v1.6.1.1 maintenance release
Documentation/diff-options.txt: unify options
gitweb: Fix export check in git_get_projects_list
Conflicts:
RelNotes
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/RelNotes-1.6.1.1.txt | 23 | ||||
| -rw-r--r-- | Documentation/diff-options.txt | 18 |
2 files changed, 27 insertions, 14 deletions
diff --git a/Documentation/RelNotes-1.6.1.1.txt b/Documentation/RelNotes-1.6.1.1.txt new file mode 100644 index 000000000..10b38e6ec --- /dev/null +++ b/Documentation/RelNotes-1.6.1.1.txt @@ -0,0 +1,23 @@ +GIT v1.6.1.1 Release Notes +========================== + +Fixes since v1.6.1 +------------------ + +* "git describe --all" complained when a commit is described with a tag, + which was nonsense. + +* "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.) + +* "git daemon", and "git merge-file" are more careful when freopen fails + and barf, instead of going on and writing to unopened filehandle. + +Other documentation fixes. + +--- +exec >/var/tmp/1 +O=v1.6.1-15-ga9e67c8 +echo O=$(git describe maint) +git shortlog --no-merges $O..maint + diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index c62b45cdb..b432d2518 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -19,16 +19,12 @@ endif::git-format-patch[] ifndef::git-format-patch[] -p:: +-u:: Generate patch (see section on generating patches). {git-diff? This is the default.} endif::git-format-patch[] --u:: - Synonym for "-p". - -U<n>:: - Shorthand for "--unified=<n>". - --unified=<n>:: Generate diffs with <n> lines of context instead of the usual three. Implies "-p". @@ -190,31 +186,25 @@ endif::git-format-patch[] can name which subdirectory to make the output relative to by giving a <path> as an argument. +-a:: --text:: Treat all files as text. --a:: - Shorthand for "--text". - --ignore-space-at-eol:: Ignore changes in whitespace at EOL. +-b:: --ignore-space-change:: Ignore changes in amount of whitespace. This ignores whitespace at line end, and considers all other sequences of one or more whitespace characters to be equivalent. --b:: - Shorthand for "--ignore-space-change". - +-w:: --ignore-all-space:: Ignore whitespace when comparing lines. This ignores differences even if one line has whitespace where the other line has none. --w:: - Shorthand for "--ignore-all-space". - --exit-code:: Make the program exit with codes similar to diff(1). That is, it exits with 1 if there were differences and |