mirror of
https://github.com/git/git
synced 2024-10-02 14:45:21 +00:00
Merge branch 'maint'
* maint: Prepare for 1.5.1.5 Release Notes gitweb: Add a few comments about %feature hash git-am: Clean up the asciidoc documentation Documentation: format-patch has no --mbox option builtin-log.c: Fix typo in comment Fix git-clone buglet for remote case.
This commit is contained in:
Junio C Hamano
commit
3545193735
37
Documentation/RelNotes-1.5.1.5.txt
Normal file
37
Documentation/RelNotes-1.5.1.5.txt
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
GIT v1.5.1.5 Release Notes (draft)
|
||||
==========================
|
||||
|
||||
Fixes since v1.5.1.4
|
||||
--------------------
|
||||
|
||||
* Bugfixes
|
||||
|
||||
- git-svn was reported to segfault for many people on list and
|
||||
#git; hopefully this has been fixed.
|
||||
|
||||
- "git-svn clone" does not try to minimize the URL
|
||||
(i.e. connect to higher level hierarchy) by default, as this
|
||||
can prevent clone to fail if only part of the repository
|
||||
(e.g. 'trunk') is open to public.
|
||||
|
||||
- "git checkout branch^0" did not detach the head when you are
|
||||
already on 'branch'; backported the fix from the 'master'.
|
||||
|
||||
- "git-config section.var" did not correctly work when
|
||||
existing configuration file had both [section] and [section "name"]
|
||||
next to each other.
|
||||
|
||||
- "git clone ../other-directory" was fooled if the current
|
||||
directory $PWD points at is a symbolic link.
|
||||
|
||||
- (build) tree_entry_extract() function was both static inline
|
||||
and extern, which caused trouble compiling with Forte12
|
||||
compilers on Sun.
|
||||
|
||||
- Many documentation fixes.
|
||||
|
||||
--
|
||||
exec >/var/tmp/1
|
||||
O=v1.5.1.4-26-gb4b20b2
|
||||
echo O=`git describe refs/heads/maint`
|
||||
git shortlog --no-merges $O..refs/heads/maint
|
||||
|
|
@ -9,9 +9,10 @@ git-am - Apply a series of patches from a mailbox
|
|||
SYNOPSIS
|
||||
--------
|
||||
[verse]
|
||||
'git-am' [--signoff] [--dotest=<dir>] [--utf8 | --no-utf8] [--binary] [--3way]
|
||||
[--interactive] [--whitespace=<option>] [-C<n>] [-p<n>]
|
||||
<mbox>...
|
||||
'git-am' [--signoff] [--dotest=<dir>] [--keep] [--utf8 | --no-utf8]
|
||||
[--3way] [--interactive] [--binary]
|
||||
[--whitespace=<option>] [-C<n>] [-p<n>]
|
||||
<mbox>...
|
||||
'git-am' [--skip | --resolved]
|
||||
|
||||
DESCRIPTION
|
||||
|
|
@ -40,7 +41,7 @@ OPTIONS
|
|||
-u, --utf8::
|
||||
Pass `-u` flag to `git-mailinfo` (see gitlink:git-mailinfo[1]).
|
||||
The proposed commit log message taken from the e-mail
|
||||
are re-coded into UTF-8 encoding (configuration variable
|
||||
is re-coded into UTF-8 encoding (configuration variable
|
||||
`i18n.commitencoding` can be used to specify project's
|
||||
preferred encoding if it is not UTF-8).
|
||||
+
|
||||
|
|
@ -51,31 +52,33 @@ default. You could use `--no-utf8` to override this.
|
|||
Pass `-n` flag to `git-mailinfo` (see
|
||||
gitlink:git-mailinfo[1]).
|
||||
|
||||
-b, --binary::
|
||||
Pass `--allow-binary-replacement` flag to `git-apply`
|
||||
(see gitlink:git-apply[1]).
|
||||
|
||||
-3, --3way::
|
||||
When the patch does not apply cleanly, fall back on
|
||||
3-way merge, if the patch records the identity of blobs
|
||||
it is supposed to apply to, and we have those blobs
|
||||
locally.
|
||||
available locally.
|
||||
|
||||
-b, --binary::
|
||||
Pass `--allow-binary-replacement` flag to `git-apply`
|
||||
(see gitlink:git-apply[1]).
|
||||
|
||||
--whitespace=<option>::
|
||||
This flag is passed to the `git-apply` (see gitlink:git-apply[1])
|
||||
program that applies
|
||||
the patch.
|
||||
|
||||
-C<n>, -p<n>::
|
||||
These flags are passed to the `git-apply` (see gitlink:git-apply[1])
|
||||
program that applies
|
||||
the patch.
|
||||
|
||||
-i, --interactive::
|
||||
Run interactively.
|
||||
|
||||
--skip::
|
||||
Skip the current patch. This is only meaningful when
|
||||
restarting an aborted patch.
|
||||
|
||||
--whitespace=<option>::
|
||||
This flag is passed to the `git-apply` program that applies
|
||||
the patch.
|
||||
|
||||
-C<n>, -p<n>::
|
||||
These flags are passed to the `git-apply` program that applies
|
||||
the patch.
|
||||
|
||||
-i, --interactive::
|
||||
Run interactively, just like git-applymbox.
|
||||
|
||||
-r, --resolved::
|
||||
After a patch failure (e.g. attempting to apply
|
||||
conflicting patch), the user has applied it by hand and
|
||||
|
|
@ -126,7 +129,7 @@ to crunch. Upon seeing the first patch that does not apply, it
|
|||
aborts in the middle, just like 'git-applymbox' does. You can
|
||||
recover from this in one of two ways:
|
||||
|
||||
. skip the current one by re-running the command with '--skip'
|
||||
. skip the current patch by re-running the command with '--skip'
|
||||
option.
|
||||
|
||||
. hand resolve the conflict in the working directory, and update
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ OPTIONS
|
|||
whitespaces, (3) '[' up to ']', typically '[PATCH]', and
|
||||
then prepends "[PATCH] ". This flag forbids this
|
||||
munging, and is most useful when used to read back 'git
|
||||
format-patch --mbox' output.
|
||||
format-patch -k' output.
|
||||
|
||||
-m::
|
||||
Patches are applied with `git-apply` command, and unless
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ OPTIONS
|
|||
whitespaces, (3) '[' up to ']', typically '[PATCH]', and
|
||||
then prepends "[PATCH] ". This flag forbids this
|
||||
munging, and is most useful when used to read back 'git
|
||||
format-patch --mbox' output.
|
||||
format-patch -k' output.
|
||||
|
||||
-u::
|
||||
The commit log message, author name and author email are
|
||||
|
|
|
|||
|
|
@ -454,7 +454,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
|
|||
|
||||
/*
|
||||
* Parse the arguments before setup_revisions(), or something
|
||||
* like "git fmt-patch -o a123 HEAD^.." may fail; a123 is
|
||||
* like "git format-patch -o a123 HEAD^.." may fail; a123 is
|
||||
* possibly a valid SHA1.
|
||||
*/
|
||||
for (i = 1, j = 1; i < argc; i++) {
|
||||
|
|
|
|||
|
|
@ -22,10 +22,10 @@ get_repo_base() {
|
|||
cd "`/bin/pwd`" &&
|
||||
cd "$1" &&
|
||||
{
|
||||
cd .git 2>/dev/null
|
||||
cd .git
|
||||
pwd
|
||||
}
|
||||
)
|
||||
) 2>/dev/null
|
||||
}
|
||||
|
||||
if [ -n "$GIT_SSL_NO_VERIFY" ]; then
|
||||
|
|
|
|||
|
|
@ -102,10 +102,13 @@ BEGIN
|
|||
# 'override' => allow-override (boolean),
|
||||
# 'default' => [ default options...] (array reference)}
|
||||
#
|
||||
# if feature is overridable (it means that allow-override has true value,
|
||||
# if feature is overridable (it means that allow-override has true value),
|
||||
# then feature-sub will be called with default options as parameters;
|
||||
# return value of feature-sub indicates if to enable specified feature
|
||||
#
|
||||
# if there is no 'sub' key (no feature-sub), then feature cannot be
|
||||
# overriden
|
||||
#
|
||||
# use gitweb_check_feature(<feature>) to check if <feature> is enabled
|
||||
|
||||
# Enable the 'blame' blob view, showing the last commit that modified
|
||||
|
|
@ -138,6 +141,7 @@ BEGIN
|
|||
|
||||
# Enable text search, which will list the commits which match author,
|
||||
# committer or commit text to a given string. Enabled by default.
|
||||
# Project specific override is not supported.
|
||||
'search' => {
|
||||
'override' => 0,
|
||||
'default' => [1]},
|
||||
|
|
|
|||
Loading…
Reference in a new issue