Jiang Xin writes:
> Please pull the following git l10n updates for Git 2.20.0.
>
> The following changes since commit 8a0ba68f6dab2c8b1f297a0d46b710bb9af3237a:
>
> Git 2.20-rc2 (2018-12-01 21:44:56 +0900)
>
> are available in the Git repository at:
>
> g...@github.com:git-l10n/git-po.git tags
Hi Junio,
Please pull the following git l10n updates for Git 2.20.0.
The following changes since commit 8a0ba68f6dab2c8b1f297a0d46b710bb9af3237a:
Git 2.20-rc2 (2018-12-01 21:44:56 +0900)
are available in the Git repository at:
g...@github.com:git-l10n/git-po.git tags/l10n-2.20.0-rnd3
for
Josh Steadmon writes:
> diff --git a/t/t5318-commit-graph.sh b/t/t5318-commit-graph.sh
> index 5fe21db99f..5b6b44b78e 100755
> --- a/t/t5318-commit-graph.sh
> +++ b/t/t5318-commit-graph.sh
> @@ -366,24 +366,30 @@ GRAPH_OCTOPUS_DATA_OFFSET=$(($GRAPH_COMMIT_DATA_OFFSET
> + \
> GRAPH_BYTE_OCTOPUS=
"Robert P. J. Day" writes:
> Current "man git-add" emphasizes single letter interactive
> shortcut commands with "[]".
Not for me. These prefixes are instead painted in colors.
Stefan Beller writes:
> Currently when git-fetch is asked to recurse into submodules, it dispatches
> a plain "git-fetch -C " (with some submodule related options
> such as prefix and recusing strategy, but) without any information of the
> remote or the tip that should be fetched.
>
> But this d
Junio C Hamano writes:
> AFAIK, "prune" is also used to describe unreachable loose objects,
s/describe/& the act of culling/
> but that use is fairly isolated and have little risk of being
> confusing too much. Are there other uses to make you consider it
> "highly overloaded"?
Junio C Hamano writes:
> Jonathan Tan writes:
>
>> When fetching into a repository, a connectivity check is first made by
>> check_exist_and_connected() in builtin/fetch.c that runs:
>> ...
>> Another way to accomplish this effect would be to modify parse_object()
>> to use the commit graph if p
Duy Nguyen writes:
> Without --mixed, you're using the first form
>
> git reset [-q] [] [--] ...
>
> which accepts pathspec. If it's not clear, of course patches are welcome.
Yup. The deprecation is about spelling with "--mixed" when invoking
the "restore these paths out of tree-ish (or HEA
tbo...@web.de writes:
> - The "DOS" moniker is still used for 2 reasons:
> Windows inherited the "drive letter" concept from DOS,
> and everybody (tm) familar with the code and the path handling
> in Git is used to that wording.
Yeah, for the same reason as win32 can refer to their API that
Matthew DeVore writes:
> In the codebase, "prune" is a highly overloaded term, and it caused me a
> lot of trouble to figure out what it meant when it was used in the
> context of path limiting. Stop using the word "prune" when we really
> mean "path limiting."
path limiting is also used for two
Christian Weiske writes:
> When running "git add -p" on git version 2.19.2 and "diff.noprefix" set
> to true, it still shows the "a/" and "b/" prefixes.
>
> This issue has been reported in 2016 already[1], but is still there in
> 2.19.2.
It is very likely because it is a non-issue.
The reason
Jonathan Tan writes:
> When fetching into a repository, a connectivity check is first made by
> check_exist_and_connected() in builtin/fetch.c that runs:
> ...
> Another way to accomplish this effect would be to modify parse_object()
> to use the commit graph if possible; however, I did not want
Elijah Newren writes:
> On Fri, Dec 7, 2018 at 9:51 AM Johannes Sixt wrote:
>>
>> From: Elijah Newren
>>
>> In commit 6aba117d5cf7 ("am: avoid directory rename detection when
>> calling recursive merge machinery", 2018-08-29), the git-rebase manpage
>> probably should have also been updated to
Jonathan Tan writes:
>> > The git command line expects Git servers to follow a specific order of
>>
>> "Command line"? It sounds like you are talking about the order of
>> command line arguments and options, but apparently that is not what
>> you are doing. Is it "The git over-the-wire protoco
Stefan Beller writes:
> As f178c13fda (Revert "Merge branch 'sb/submodule-core-worktree'",
> 2018-09-07) was produced shortly before a release, nobody asked for
> a regression test to be included. Add a regression test that makes sure
> that the invocation of `git submodule update` on old setups
>You can feed a set of revisions to git-blame with the "-S" option, but I
>don't offhand know how it handles diffs (I think it would have to still
>diff each commit against its parent, since history is non-linear, and a
>list is inherently linear). You might want to experiment with that.
>Other th
Delete a misplaced word introduced by caafecfcf1 (rebase
--rebase-merges: adjust man page for octopus support, 2018-03-09).
Signed-off-by: Kyle Meyer
---
Documentation/git-rebase.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/git-rebase.txt b/Documentation/
On Sat, Dec 8, 2018 at 6:37 PM Robert P. J. Day wrote:
>
> On Sat, 8 Dec 2018, Duy Nguyen wrote:
>
> > On Sat, Dec 8, 2018 at 6:32 PM Robert P. J. Day
> > wrote:
> > >
> > > On Sat, 8 Dec 2018, Duy Nguyen wrote:
> > >
> > > > On Sat, Dec 8, 2018 at 5:08 PM Robert P. J. Day
> > > > wrote:
> > >
On Sat, 8 Dec 2018, Duy Nguyen wrote:
> On Sat, Dec 8, 2018 at 6:32 PM Robert P. J. Day wrote:
> >
> > On Sat, 8 Dec 2018, Duy Nguyen wrote:
> >
> > > On Sat, Dec 8, 2018 at 5:08 PM Robert P. J. Day
> > > wrote:
> > > >
> > > >
> > > > from "man git-reset":
> > > >
> > > > SYNOPSIS
> > > >
On Sat, 8 Dec 2018, Duy Nguyen wrote:
> On Sat, Dec 8, 2018 at 6:32 PM Robert P. J. Day wrote:
> >
> > On Sat, 8 Dec 2018, Duy Nguyen wrote:
> >
> > > On Sat, Dec 8, 2018 at 5:08 PM Robert P. J. Day
> > > wrote:
> > > >
> > > >
> > > > from "man git-reset":
> > > >
> > > > SYNOPSIS
> > > >
On Sat, Dec 8, 2018 at 6:32 PM Robert P. J. Day wrote:
>
> On Sat, 8 Dec 2018, Duy Nguyen wrote:
>
> > On Sat, Dec 8, 2018 at 5:08 PM Robert P. J. Day
> > wrote:
> > >
> > >
> > > from "man git-reset":
> > >
> > > SYNOPSIS
> > > git reset [-q] [] [--] ...
> > > git reset (--patch | -p) []
On Sat, 8 Dec 2018, Duy Nguyen wrote:
> On Sat, Dec 8, 2018 at 5:08 PM Robert P. J. Day wrote:
> >
> >
> > from "man git-reset":
> >
> > SYNOPSIS
> > git reset [-q] [] [--] ...
> > git reset (--patch | -p) [] [--] [...]
> > git reset [--soft | --mixed [-N] | --hard | --merge | --keep] [-q
On Sat, Dec 8, 2018 at 5:08 PM Robert P. J. Day wrote:
>
>
> from "man git-reset":
>
> SYNOPSIS
> git reset [-q] [] [--] ...
> git reset (--patch | -p) [] [--] [...]
> git reset [--soft | --mixed [-N] | --hard | --merge | --keep] [-q]
> []
>
> oddly, the third form says nothing about poss
Adds a new "key=X" option to "%(trailers)" which will cause it to only
print trailer lines which match any of the specified keys.
Signed-off-by: Anders Waldenborg
---
Documentation/pretty-formats.txt | 8 +
pretty.c | 47 ++---
t/t4205-log-pre
No functional change intended.
This change may not seem useful on its own, but upcoming commits will do
memory allocation in there, and a single return path makes deallocation
easier.
Signed-off-by: Anders Waldenborg
---
pretty.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --
Updated since v3:
* multiple 'key=' matches any
* allow overriding implicit 'only' when using key
* minor grammar and spelling fixes
* documentation restructuring
* Helper functions for parsing options
Anders Waldenborg (7):
doc: group pretty-format.txt placeholders descriptions
pretty: a
Expanding '%n' and '%xNN' is generic functionality, so extract that from
the pretty.c formatter into a callback that can be reused.
No functional change intended
Signed-off-by: Anders Waldenborg
---
pretty.c | 16 +---
strbuf.c | 21 +
strbuf.h | 8
3 f
With the new "key=" option to %(trailers) it often makes little sense to
show the key, as it by definition already is knows which trailer is
printed there. This new "valueonly" option makes it omit the key when
printing trailers.
E.g.:
$ git show -s --pretty='%s%n%(trailers:key=Signed-off-by,valu
The placeholders can be grouped into three kinds:
* literals
* affecting formatting of later placeholders
* expanding to information in commit
Also change the list to a definition list (using '::')
Signed-off-by: Anders Waldenborg
---
Documentation/pretty-formats.txt | 235 --
In addition to old %(trailers:only) it is now allowed to write
%(trailers:only=yes)
By itself this only gives (the not quite so useful) possibility to have
users change their mind in the middle of a formatting
string (%(trailers:only=true,only=false)). However, it gives users the
opportunity to ov
By default trailer lines are terminated by linebreaks ('\n'). By
specifying the new 'separator' option they will instead be separated by
user provided string and have separator semantics rather than terminator
semantics. The separator string can contain the literal formatting codes
%n and %xNN allo
On Sat, Dec 8, 2018 at 9:11 AM wrote:
> Changes since V2:
latest patch still fixes original issue - thanks
> - Settled on a better name:
> The common code is in compat/win32/path-utils.c/h
> [...]
> - The "DOS" moniker is still used for 2 reasons:
> Windows inherited the "drive letter" conc
On Sun, 2 Dec 2018, Duy Nguyen wrote:
> On Sun, Dec 2, 2018 at 6:05 PM Robert P. J. Day wrote:
> > > Patch update>> 2
> > > staged unstaged path
> > > * 1:unchanged+1/-0 README.md
> > > * 2:unchanged+1/-0 contrib/README
> > > 3:unchanged
from "man git-reset":
SYNOPSIS
git reset [-q] [] [--] ...
git reset (--patch | -p) [] [--] [...]
git reset [--soft | --mixed [-N] | --hard | --merge | --keep] [-q] []
oddly, the third form says nothing about possible "", even
though i'm pretty sure they're valid in that third case (at l
Relates (but orthogonal) to my other thread
[wishlist] git submodule update --reset-hard
ATM, it possible to specify per submodule update strategy via
configuration variable submodule.SUBMODULE.update where SUBMODULE is the name
of the corresponding submodule. But I see no way to specify defau
From: Torsten Bögershausen
A regression for cygwin users was introduced with commit 05b458c,
"real_path: resolve symlinks by hand".
In the the commit message we read:
The current implementation of real_path uses chdir() in order to resolve
symlinks. Unfortunately this isn't thread-safe a
Current "man git-add" emphasizes single letter interactive
shortcut commands with "[]".
Signed-off-by: Robert P. J. Day
---
diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt
index 45652fe4a6..ad9bd7c7a6 100644
--- a/Documentation/git-add.txt
+++ b/Documentation/git-add.txt
@@
On Sat, Dec 08 2018, Junio C Hamano wrote:
> Stefan Beller writes:
>
>> On Fri, Dec 7, 2018 at 1:40 PM Jonathan Nieder wrote:
>>>
>>> Brandon Williams wrote:
>>>
>>> > Signed-off-by: Brandon Williams
>>> > ---
>>> > .mailmap | 1 +
>>> > 1 file changed, 1 insertion(+)
>>>
>>> I can confirm t
On Sat, Dec 8, 2018 at 7:09 AM Junio C Hamano wrote:
> If this were "Jonathan asked Brandon if we want to record an address
> we can reach him in our .mailmap file and sent a patch to add one",
Not sure about Jonathan, but I did.
> then the story is different, and I tend to agree with you that s
39 matches
Mail list logo
