There was a discussion of problematic directory/file conflicts with
virtual merge bases on the mailing list years ago at
https://public-inbox.org/git/AANLkTimwUQafGDrjxWrfU9uY1uKoFLJhxYs=vssop...@mail.gmail.com/
Part of these corresponding tests made it into this testsuite. However,
the more
I am Col. Hussein Harmush An army officer from Syria I have a very
profitable business proposition for you
Teach gc --auto to clear the repository before auto packing it to
prevent failures when removing files on Windows.
Also teach the test 'fetching with auto-gc does not lock up' to complain
when it is no longer triggering an auto packing of the repository.
Fixes
Hi Tobias,
On Wed, 4 Jul 2018, Tobias Klauser wrote:
> On 2018-07-04 at 15:09:34 +0200, Johannes Schindelin
> wrote:
>
> > Junio, this gets an ACK from me, could you apply the
> > `git-rebase--preserve-merges.sh` part selectively, please?
>
> Let me know if I should provide an updated patch
OK, Will queue this patch for next round of translation
"cette" can be only be used before a word (like in "cette bouteille" for
"this bottle"), but here "this" refers to the current step and we have
to use "ceci" in French.
Signed-off-by: Raphaël Hertzog
---
po/fr.po | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/po/fr.po
The whole bisect procedure is translated but the last message that the
user will see in the process is not translated. Let's fix this.
Also mark the "revision walk setup failed" error message for
translation. It's already used in other files so will not generate
any new string to translate.
(I'm not subscribed, please keep me in CC. Resending as suggested by Duy
Nguyen in the hope that my patches get picked this time)
Hello,
I was reviewing the output of "git bisect" with my French locale
and I saw a clear mistake in the French translation (fixed
in the first commit) and I also
On Mon, Jun 25, 2018 at 02:59:07PM -0500, Taylor Blau wrote:
> Teach 'git grep --only-matching', a new option to only print the
> matching part(s) of a line.
>
> [ ... ]
>
> diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt
> index 0de3493b80..078b4e3730 100644
> ---
Teach 'git grep --only-matching', a new option to only print the
matching part(s) of a line.
For instance, a line containing the following (taken from README.md:27):
(`man gitcvs-migration` or `git help cvs-migration` if git is
Is printed as follows:
$ git grep --line-number --column
On Wed, 2018-07-04 at 13:26 +0200, Johannes Schindelin wrote:
> On Wed, 4 Jul 2018, Paul Smith wrote:
>
> > One thing I wanted to do was provide a default ca-bundle.crt file
> > along with my local build of Git. I need my installation to be
> > relocatable and I'm using RUNTIME_PREFIX with Git
Hi Johannes
Thanks for your detailed answer.
On 2018-07-04 at 15:09:34 +0200, Johannes Schindelin
wrote:
> On Wed, 4 Jul 2018, Tobias Klauser wrote:
>
> > Part of the todo help message in git-rebase--interactive.sh and
> > git-rebase--preserve-merges.sh is unnecessarily indented, making the
>
Hi Tobias,
On Wed, 4 Jul 2018, Tobias Klauser wrote:
> Part of the todo help message in git-rebase--interactive.sh and
> git-rebase--preserve-merges.sh is unnecessarily indented, making the
> message look weird:
>
> # These lines can be re-ordered; they are executed from top to bottom.
> #
Part of the todo help message in git-rebase--interactive.sh and
git-rebase--preserve-merges.sh is unnecessarily indented, making the
message look weird:
# These lines can be re-ordered; they are executed from top to bottom.
#
# If you remove a line here THAT COMMIT WILL BE LOST.
#
#
Hi Paul,
On Wed, 4 Jul 2018, Paul Smith wrote:
> One thing I wanted to do was provide a default ca-bundle.crt file along
> with my local build of Git. I need my installation to be relocatable
> and I'm using RUNTIME_PREFIX with Git 2.18.0 (on GNU/Linux).
Understandable. We do this all the time
Hi Paul,
On Wed, 4 Jul 2018, Paul Smith wrote:
> I was excited to see the RUNTIME_PREFIX for POSIX systems patchset go
> by earlier this year. Although I didn't see any mention of it being
> included in the 2.18.0 release notes, it does appear that it was merged
> in for this release.
>
> Has
Hi Junio,
On Tue, 3 Jul 2018, Junio C Hamano wrote:
> Tiago Botelho writes:
>
> > git rev-list --first-parent --bisect-all F..E >revs &&
> > test_line_count = 9 revs &&
> > for rev in E e1 e2 e3 e4 e5 e6 e7 e8
> > do
> > grep "^$(git rev-parse $rev) " revs ||
> > {
> > echo "$rev not
On Tue, Jul 3, 2018 at 7:57 PM Joshua Nelson wrote:
> Use syntax similar to `git-checkout` to make optional for
> `ls-tree`. If is omitted, default to HEAD. Infer arguments as
> follows:
>
> 1. If args start with '--', assume to be HEAD
> 2. If exactly one arg precedes '--', treat the argument
On Tue, Jul 3, 2018 at 8:05 PM Joshua Nelson wrote:
> Is it customary to send a new patch or second patch that builds on the
> first?
It depends what you mean. If there were problems with a version of a
patch you sent, then you "re-roll", which means you re-send the patch
in its entirety as if
On Tue, Jul 3, 2018 at 7:15 PM Joshua Nelson wrote:
> On 07/03/2018 03:15 AM, Eric Sunshine wrote:
> >> + /* taken from checkout.c;
> >> +* we have a simpler case because we never create a branch
> >> */
> >
> > However, this comment doesn't belong in the code, as
Hi Junio,
On Tue, 3 Jul 2018, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > Seriously again, I sent a new iteration:
> >
> > https://public-inbox.org/git/pull.1.v3.git.gitgitgad...@gmail.com/
>
> Thanks, will take a look but it is likely that I'll run out of time
> today, so
Hi Junio,
On Tue, 3 Jul 2018, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > On Thu, 28 Jun 2018, Junio C Hamano wrote:
> >
> >> * as/safecrlf-quiet-fix (2018-06-11) 1 commit
> >> (merged to 'next' on 2018-06-13 at b163674843)
> >> + config.c: fix regression for core.safecrlf
On Wed, Jul 04, 2018 at 07:30:30AM +0900, Mike Hommey wrote:
> That being said, I'm not even sure this particular use case is worth a
> new feature. I'm not storing random stuff as gitlinks, I'm storing
> sha1s. Well, maybe a mode that makes the distinction between "git oid"
> and "external oid"
Hi Henning,
On 3 July 2018 at 14:38, Henning Schild wrote:
> Create a struct that holds the format details for the supported formats.
> At the moment that is still just "PGP". This commit prepares for the
> introduction of more formats, that might use other programs and match
> other signatures.
One thing I wanted to do was provide a default ca-bundle.crt file along
with my local build of Git. I need my installation to be relocatable
and I'm using RUNTIME_PREFIX with Git 2.18.0 (on GNU/Linux).
I can provide a system gitconfig file with a setting for http.sslCAInfo
but the problem is I
On Tue, Jul 03, 2018 at 12:55:19PM -0400, Jeff King wrote:
> I had prepared this as a squash-in for what became c12c9df527, but since
> that's now in master, it can go on top (or get dropped, but I think it
> is worth it as a style fixup).
I'm ok with the patch. I thought it was already squashed
26 matches
Mail list logo
