Re: git overwriting local ignored files?

On 11/24/18 10:41 AM, Konstantin Khomoutov wrote: On Sat, Nov 24, 2018 at 05:57:24PM +0300, Konstantin Khomoutov wrote: On Sat, Nov 24, 2018 at 09:37:06AM -0500, David Mandelberg wrote: It seems that git is overwriting my local files on merge if they're in .gitignore. [...] The .gitignore

Re: git overwriting local ignored files?

On 11/23/18 11:22 PM, Junio C Hamano wrote: David Mandelberg writes: It seems that git is overwriting my local files on merge if they're in .gitignore. See command transcript below. I searched `git help config` and Google, but I couldn't find any way to prevent it. Am I missing something

git overwriting local ignored files?

Hi, It seems that git is overwriting my local files on merge if they're in .gitignore. See command transcript below. I searched `git help config` and Google, but I couldn't find any way to prevent it. Am I missing something? (The reason I care about ignored files is that I'm using git with a

Dear Friend, i know that this mail will come to you as a surprise as we have never met before, i am contacting you independently of my investigation and no one is informed of this communication. I nee

RE: Failed stash caused untracked changes to be lost

in the right direction I'd be happy to take a look, I can't promise I'll be able to get anything done in a timely manner (or at all) Thanks -Original Message- From: Thomas Gummerer Sent: 03 November 2018 15:35 To: Quinn, David Cc: git@vger.kernel.org Subject: Re: Failed stash caused untracked

Urgent

My Greeting, How are you today?Did you receive the letter i sent to you. Please answer me. Best Regard, Mr. David Abraham

Re: Git trademark status and policy

base" command that provides a visual interactive rebase feature. That command should probably be renamed to "cola-git-seq-editor" to make that clearer, and also to open up the possibility of installing it in bin/ in the future since it is useful on its own. The rationale for two commands is that worktree diff+commit and history inspection are our two primary use-cases. Everything else is provided as a sub-command, "git cola rebase", "git cola stash", etc. so there's not much pressure to add more top-level names, just these two. Thoughts? -- David

Re: [PATCH 1/2] mergetool: Accept -g/--[no-]gui as arguments

g the default merge tool, which should only ever happen in one of the two modes. The bit about difftool falling back to mergetool's config is a convenience so it does make sense to keep that for guitool as well. The code after this part should handle merge_tool being empty just fine, so once the `[ ... ]` vs `test` bit is updated, please feel free to add: Acked-by: David Aguilar cheers, -- David

Failed stash caused untracked changes to be lost

Issue: While running a git stash command including the '-u' flag to include untracked files, the command failed due to arguments in the incorrect order. After this untracked files the were present had been removed and permanently lost. Environment: Windows 10, Powershell w/ PoshGit State

[PATCH] doc: clarify gitcredentials path component matching

The gitcredentials documentation implied that the config file's "pattern" URL might include a path component, but did not explain that it must match exactly (potentially leaving readers with the false hope that it would support a more flexible prefix match). Signed-off-by:

git clone works in ide but not git bash CLI

Howdy, I have a conundrum: App: Spring Cloud Config Server envvars: GIT_URL and SSH_KEY IDE: Intellij 2018.2.4 Ultimate When I use the IDE to assign the SSH_KEY value all is copacetic. If I assign the envvar at the Git Bash CLI: com.jcraft.jsch.JSchException: Auth fail Any guesses? Thanks

credential..helper with partial url path

cify a URL path component but that it must match exactly). Right now the only example given is one in which 'the "pattern" URL does not care about the path component at all.' I'm testing against $ git --version git version 2.19.0 installed via homebrew on Mac OS X. Thanks, David -- David

git check-ignore ignores negated entries

If a .gitignore contains a ! entry, git check-ignore will still say the matching file is ignored if the file is not in the index. Simple case to reproduce: $ git init . $ echo "*.c" > .gitignore $ echo '!a.c' >> .gitignore $ touch a.c b.c $ git check-ignore a.c b.c a.c b.c $ git add *.c The

Re: Git trademark status and policy

branding uses similar orange/red palettes -- to convey cohesiveness. I would prefer to keep the visual identity as-is (including the logo). Can we continue to use the derivative logo for the time being until a replacement is produced? Alternatively, can we keep the logo as-is? cheers, [1] https://git-cola.github.io/ [2] https://github.com/git-cola/git-cola -- David

Re: Git for games working group

core documentation talks about various large-file-centric features in isolation, but it'd be good to have a single user-centric document (not unlike gitworkflows) to document best practices for dealing with large files, repos, game assets, etc. That alone would help dispel the myth that Git is unsuitable for large repos, large files, and binary content. -- David

Re: Feature request: be able to pass arguments to difftool command

heck for $V (or any other) variable. While environment variables aren't great, this does seem like the right place to use them. Another option -- we already eval the configured command, so if the user includes a variable ($ARGS) in their custom configuration then they can specify extra flags today without needing to change the tool. ex: [difftool "ccdiff"] cmd = ccdiff $ARGS \"$LOCAL\" \"$REMOTE\" ARGS='-v2 -m' git difftool HEAD~1..HEAD Are these alternatives short and simple enough? -- David

Using Git for applications other than code development

circuit designs, circuit PCB designs etc.? Thanks! David Dynex Semiconductor Limited. Registered in England and Wales: No 3824626 Registered Office: Doddington Road, Lincoln, LN6 3LF, United Kingdom This e-mail and any attachments are confidential and may

Re: [PATCH v1 00/25] RFC: structured logging

Please make an option for git to write these logs to syslog, not just a local file. Every modern syslog daemon has lots of tools to be able to deal with json messages well. David Lang

gitweb and Levenshtein

Howdy, I want to hack the getweb_make_index.perl script to create a string search using: https://github.com/git/git/blob/master/levenshtein.c. How do i reference the compiled code? I would like to call this routine using Java and maybe Perl. Please advise. Thanks. Regards,

git log --shortstat doesn't respect -c (but --stat does)

This seems inconsistent: $ git log --oneline --stat 91ccfb85176 -c 91ccfb8517 Merge branch 'sb/diff-color-move' diff.c | 28 +++- t/t4015-diff-whitespace.sh | 9 + 2 files changed, 24 insertions(+), 13 deletions(-) d1114d87c7 Merge branch

Re: GDPR compliance best practices?

the Git commit history once it has been recorded. End Quote I'll point out that not only did the Github lawyers need to sign off on this stance, but the Microsoft lawyers would have looked at it as well as part of their purchase of Github. David Lang

Re: Hash algorithm analysis

it really make a human visible difference? David Lang

Re: GDPR compliance best practices?

On Fri, 8 Jun 2018, Peter Backes wrote: On Fri, Jun 08, 2018 at 12:42:54AM -0700, David Lang wrote: Wrong, if you have to delete info, you are not allowed to keep a private copy. Yes you are allowed. See Art. 17 (3) lit e GDPR. There is _nothing_ in the GDPR about publishing information

Re: GDPR compliance best practices?

On Fri, 8 Jun 2018, Peter Backes wrote: you are the one arguing that the GDPR prohibits Git from storing and revealing this license granting data, not me. It prohibits publishing, and only after a request to be forgotten. It does not prohibit storing your private copy. Wrong, if you have to

Re: GDPR compliance best practices?

On Fri, 8 Jun 2018, Peter Backes wrote: On Thu, Jun 07, 2018 at 03:38:49PM -0700, David Lang wrote: Again: The GDPR certainly allows you to keep a proof of copyright privately if you have it. However, it does not allow you to keep publishing it if someone exercises his right to be forgotten

Re: GDPR compliance best practices?

to keep it internally and use it. David Lang There is simply no justification for publishing against the explicit will of the subject, except for the rare circumstances where there are overriding legitimate grounds for doing so. I hardly see those for the average author entry in your everyday

Re: GDPR compliance best practices?

, this looks like a very reasonable statement to me. But I am not a lawyer. I will also say that I think it would be very reasonable for projects to not accept code from someone who doesn't give them any way to contact them later in case there is a question about authorship or licensing. David Lang

git push requires a worktree?

I am doing a funny thing where I do git -C .git/modules/morx push fleem:fleem. This is failing in the case where I have a sparse checkout and the worktree directory "morx" (which is where .git/modules/morx/config's core.worktree points) doesn't exist. I don't know why git push cares about the

Re: Implementing reftable in Git

ly. > And since it's too expensive to run the whole test suite with both > reference storage schemes, it seems to me that the reference storage > scheme that is used while running the scheme-neutral tests should be > easy to choose at runtime. I ran the whole suite with both schemes duri

Re: [PATCH 2/5] refs.c: do not die if locking fails in `write_pseudoref()`

On May 6, 2018 9:56:31 AM MDT, "Martin Ågren" <martin.ag...@gmail.com> wrote: >On 6 May 2018 at 17:48, David Turner <nova...@novalis.org> wrote: >> On Sun, 2018-05-06 at 16:10 +0200, Martin Ågren wrote: >>> While at it, make the lock non-static. > &

Re: [PATCH 3/5] refs.c: drop dead code checking lock status in `delete_pseudoref()`

Same concern here about staticness. On Sun, 2018-05-06 at 16:10 +0200, Martin Ågren wrote: > After taking the lock we check whether we got it and die otherwise. > But > since we take the lock using `LOCK_DIE_ON_ERROR`, we would already > have > died. > > Unlike in the previous patch, this

Re: [PATCH 2/5] refs.c: do not die if locking fails in `write_pseudoref()`

Re making the lock static, I wonder about the following case: if (read_ref(pseudoref, _old_oid)) die("could not read ref '%s'", pseudoref); I think this calls exit(), and then atexit tries to clean up the lock files. But since lock is no longer static,

Re: [PATCH] refs: handle null-oid for pseudorefs

LGTM. (This is the current best address to reach me, but do not expect fast responses over the next few days as I'm out of town) On Sun, 2018-05-06 at 15:35 +0200, Martin Ågren wrote: > According to the documentation on `git update-ref`, it is possible to > "specify 40 '0' or an empty string

Git send-email not sending email patches as subsequent replies

is what I did... [PATCH 1/2] Clean up and tests [PATCH 2/2] Implementation [PATCH v2 0/3] Here is a reroll [PATCH v2 1/3] Clean up [PATCH v2 2/3] New tests [PATCH v2 3/3] Implementation What am I missing? Thanks, David

Re: [PATCH] mergetools: add support for guiffy

t; > + else > + "$merge_tool_path" -m "$LOCAL" \ > + "$REMOTE" "$MERGED" > + fi > +} > + > +exit_code_trustable () { > + true > +} > -- > 2.15.1.windows.2 I tested this on Linux and it works great. Thanks Bill. Acked-by: David Aguilar <dav...@gmail.com> cheers, -- David

git log --oneline cannot display dates

When using the git log command with the --oneline switch, you cannot add the --date= switch to see the dates. The only workaround is to create an alias and use the --pretty-format which doesn't provide the ability to colour the branch and tag information (as far as i can tell). regards David

Possible bug in git log with date ranges

0 2017 +0100) Updated code to a Container parameter in AddIssue(). - DGH2112 regards David Hoyle

Re: [PATCH 1/1] Fix typo in merge-strategies documentation

On Tue, Mar 20, 2018 at 1:51 AM, Junio C Hamano wrote: > > I somehow had to stare at the patch for a few minutes, view it in > two Emacs buffers and run M-x compare-windows before I finally spot > the single-byte typofix. > > Will queue with a retitle. [resending as plain

[PATCH 0/1] Fix typo in merge-strategies documentation

From: David Pursehouse <dpurseho...@collab.net> Fixes a minor typo in the merge-strategies documentation. David Pursehouse (1): Fix typo in merge-strategies documentation Documentation/merge-strategies.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.16.2

[PATCH 1/1] Fix typo in merge-strategies documentation

From: David Pursehouse <dpurseho...@collab.net> Signed-off-by: David Pursehouse <dpurseho...@collab.net> --- Documentation/merge-strategies.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategi

Reply

arrival to meet you in your country. Waiting to hear from you. Sincerely yours, Barrister Tamale David

Re: [PATCH v1] name-hash: properly fold directory names in adjust_dirname_case()

On Wed, 2018-02-07 at 19:41 -0500, Ben Peart wrote: > Correct the pointer arithmetic in adjust_dirname_case() so that it > calls > find_dir_entry() with the correct string length. Previously passing > in > "dir1/foo" would pass a length of 6 instead of the correct 4. This > resulted in >

Re: [PATCH] doc: Modify git-add doc to say "staging area"

ects managed by git also have an index, but few have a staging area. Also, the phrase "staging area" is already in use, so this is not a new term (e.g., git-staging). --- David A.Wheeler

Re: [PATCH] doc: Modify git-add doc to say "staging area"

not sure what seeing it all at once would do for anybody. Are there one or two other files that you would like to see transformed to see as an example? If you're just looking for a sense of it, that should be enough. --- David A.Wheeler

Re: [PATCH] doc: Modify git-add doc to say "staging area"

he list of paths that are of interest. If the phrase "staging area" is consistently used *instead* of index, there's no problem. E.g., "git clean consults the staging area" conveys exactly the same information as "git clean consults the index" when index == staging area. The term "index" has too many *other* meanings. --- David A. Wheeler

Re: [PATCH] doc: Modify git-add doc to say "staging area"

area". I think "staging area" is the better term. It focuses on its purpose, and it is also less confusing ("index" and "cache" have other meanings in many of the repos managed by git). --- David A.Wheeler

[PATCH] doc: Modify git-add doc to say "staging area"

tly use the phrase "staging area", which is higher-level and should be less confusing for new users. Signed-off-by: David A. Wheeler <dwhee...@dwheeler.com> --- Documentation/git-add.txt | 104 -- 1 file changed, 54 insertions(+), 50 deletions(-)

Re: submodule modify/delete wrong message

On Mon, 2017-12-11 at 12:27 -0800, Stefan Beller wrote: > On Mon, Dec 4, 2017 at 1:39 PM, David Turner <nova...@novalis.org> > wrote: > > When merging with a submodule modify/delete conflict (i.e. I've > > deleted > > the submodule, and I'm merging in a branch t

submodule modify/delete wrong message

When merging with a submodule modify/delete conflict (i.e. I've deleted the submodule, and I'm merging in a branch that modified it), git lies about what it is doing: "CONFLICT (modify/delete): submodule deleted in HEAD and modified in submodules. Version submodules of submodule left in tree at

Re: git reset of addition of a submodule?

On Thu, 2017-11-30 at 12:05 -0500, David Turner wrote: > git submodule add https://my-git-repo blort > git commit -m 'add a submodule' > git reset HEAD^ blort > > The reset deletes the gitlink, but does not delete the entry in > .gitmodules.  On one hand, this is exactly w

git reset of addition of a submodule?

git submodule add https://my-git-repo blort git commit -m 'add a submodule' git reset HEAD^ blort The reset deletes the gitlink, but does not delete the entry in .gitmodules. On one hand, this is exactly what the user asked for -- they wanted the path 'blort' to be changed in the index, and

COMPENSATION SCAM VICTIM'S $5,000 EVERYDAY,

compliance. Sincerely, Mr. David Hassn, Western Union Money Transfer Department TELEPHONE NUMBER:+1 (207)536-9017.

clarify documentation of leading "**" in gitignore(5) man page

I've long been confused by something in the man page for gitignore. I think it's unclear and I'd like to propose a change. The passage is this (source at https://git.kernel.org/pub/scm/git/git-manpages.git/tree/man5/gitignore.5): Two consecutive asterisks ("**") in patterns matched against

N/A

Claim Donation

N/A

Claim Donation

Re: hot to get file sizes in git log output

On Fri, 20 Oct 2017, David Lang wrote: On Fri, 20 Oct 2017, Eric Sunshine wrote: I'm not exactly sure what you mean by size, but if you want to show how many lines were added and removed by a given commit for each file, you can use the "--stat" option to produce a diffstat.

Re: hot to get file sizes in git log output

ch commit isn't very meaningful to the commit itself, but a stat of how much was removed might be more accurate to what you're looking for. That's a good suggestion, and hopefully could help David answer his original question. I took the request to mean "walk through history, and for each file that a

hot to get file sizes in git log output

I'm needing to scan through git history looking for the file sizes (looking for when a particular file shrunk drastically) I'm not seeing an option in git log or git whatchanged that gives me the file size, am I overlooking something? David Lang

[PATCH v2] doc: list filter-branch subdirectory-filter first

From: David Glasser <glas...@davidglasser.net> The docs claim that filters are applied in the listed order, so subdirectory-filter should come first. For consistency, apply the same order to the SYNOPSIS and the script's usage, as well as the switch while parsing arguments. Add missing -

Adding a target prefix to git filter-branch --subdirectory-filter

git filter-branch --subdirectory-filter is really useful and easy to use. It's a commonly used step as part of moving a directory from one repo to another. It lets you move a subdirectory to the root of the repo. I've found that, when moving directories between repos, I often want to do a task

[PATCH] doc: list filter-branch subdirectory-filter first

From: David Glasser <glas...@davidglasser.net> The docs claim that filters are applied in the listed order, so subdirectory-filter should come first. --- Documentation/git-filter-branch.txt | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Documentation/git-

Weird behavior/bug for git clean in untracked directory

, David

RE: [PATCH v7 06/12] ls-files: Add support in ls-files to display the fsmonitor valid bit

> -Original Message- > From: Ben Peart [mailto:peart...@gmail.com] > Sent: Tuesday, September 19, 2017 4:45 PM > To: David Turner <david.tur...@twosigma.com>; 'Ben Peart' > <benpe...@microsoft.com> > Cc: ava...@gmail.com; christian.cou...@gmail.co

RE: [PATCH v7 06/12] ls-files: Add support in ls-files to display the fsmonitor valid bit

> -Original Message- > From: Ben Peart [mailto:benpe...@microsoft.com] > Sent: Tuesday, September 19, 2017 3:28 PM > To: benpe...@microsoft.com > Cc: David Turner <david.tur...@twosigma.com>; ava...@gmail.com; > christian.cou...@gmail.com; git@vger.kerne

RE: [PATCH v6 10/12] fsmonitor: add test cases for fsmonitor extension

I think my comment here might have gotten lost, and I don't want it to because it's something I'm really worried about: > -Original Message- > From: David Turner > Sent: Friday, September 15, 2017 6:00 PM > To: 'Ben Peart' <benpe...@microsoft.com> > Cc: ava...@gma

RE: [PATCH v6 04/12] fsmonitor: teach git to optionally utilize a file system monitor to speed up detecting new or changed files.

> -Original Message- > From: Ben Peart [mailto:peart...@gmail.com] > Sent: Monday, September 18, 2017 9:07 AM > To: David Turner <david.tur...@twosigma.com>; 'Ben Peart' > <benpe...@microsoft.com> > Cc: ava...@gmail.com; christian.cou...@gmail.com; git@vger.k

RE: [PATCH v6 10/12] fsmonitor: add test cases for fsmonitor extension

> -Original Message- > +dirty_repo () { > + : >untracked && > + : >dir1/untracked && > + : >dir2/untracked && > + echo 1 >modified && > + echo 2 >dir1/modified && > + echo 3 >dir2/modified && > + echo 4 >new && > + echo 5 >dir1/new && > + echo 6

RE: [PATCH v6 12/12] fsmonitor: add a performance test

> -Original Message- > + # Choose integration script based on existance of Watchman. Spelling: existence

RE: [PATCH v6 04/12] fsmonitor: teach git to optionally utilize a file system monitor to speed up detecting new or changed files.

> -Original Message- > From: Ben Peart [mailto:benpe...@microsoft.com] > Sent: Friday, September 15, 2017 3:21 PM > To: benpe...@microsoft.com > Cc: David Turner <david.tur...@twosigma.com>; ava...@gmail.com; > christian.cou...@gmail.com; git@vger.kerne

RE: [PATCH v6 06/12] ls-files: Add support in ls-files to display the fsmonitor valid bit

> -Original Message- > From: Ben Peart [mailto:benpe...@microsoft.com] > Sent: Friday, September 15, 2017 3:21 PM > To: benpe...@microsoft.com > Cc: David Turner <david.tur...@twosigma.com>; ava...@gmail.com; > christian.cou...@gmail.com; git@vger.kerne

RE: [PATCH v6 05/12] fsmonitor: add documentation for the fsmonitor extension.

> -Original Message- > From: Ben Peart [mailto:benpe...@microsoft.com] > Sent: Friday, September 15, 2017 3:21 PM > To: benpe...@microsoft.com > Cc: David Turner <david.tur...@twosigma.com>; ava...@gmail.com; > christian.cou...@gmail.com; git@vger.kerne

Hello

Hello , This is to inform you that this bank has appointed a New managing Director and on this note informing you about your withheld fund $950,000 Dollars been held by pass administration. As the New appointed manager, collaboration with Benin republic government and governor central bank

Re: Produce contents of index with existing directory as cache

Ah, does it not? Perhaps add a "git clean -d -f" as well. On Wed, Aug 30, 2017 at 9:18 AM, Florian Weimer <fwei...@redhat.com> wrote: > On 08/30/2017 04:15 PM, David Lloyd wrote: >> git reset --hard ? > > That doesn't remove unstaged files. > > Florian -- - DML

Re: Produce contents of index with existing directory as cache

git reset --hard ? On Wed, Aug 30, 2017 at 9:11 AM, Florian Weimer wrote: > Is there a variant of “git checkout-index” which will produce the > existing index contents, like “git checkout-index” would do with an > empty directory, but can reuse an existing directory tree, to

Re: Bug?: git archive exclude pathspec and gitattributes export-ignore

On Mon, 14 Aug 2017, René Scharfe wrote: > Am 13.08.2017 um 06:53 schrieb David Adam: > > I think I have a bug in git (tested 2.11.0 on Debian 8, 2.14.1 on OS X and > > 2.14.1.145.gb3622a4 on OS X). > > > > Given a repository with an export-ignore d

RE: reftable [v5]: new ref storage format

> -Original Message- > From: Howard Chu [mailto:h...@symas.com] > Sent: Monday, August 14, 2017 8:31 AM > To: spea...@spearce.org > Cc: David Turner <david.tur...@twosigma.com>; ava...@gmail.com; > ben.a...@acegi.com.au; dborow...@google.com; git@vger.kernel.org; &

Bug?: git archive exclude pathspec and gitattributes export-ignore

file and git exits with -1 as the return status. As shown: > git init foo && cd foo Initialized empty Git repository in /Users/david/src/foo/.git/ > mkdir a b > touch {a,b}/somefile > echo "/a export-ignore" >> .gitattributes > git a

Re: [PATCH] t4062: stop using repetition in regex

match if the 4097th byte (and possibly later > ones) is 0. We need to make sure we check for end-of-line after > the 4096th byte, not later. > > Sorry, Dscho, I thought we could take a shortcut here, but -- as > you wrote all along -- we can't. > > So how about this? > > -

RE: reftable [v5]: new ref storage format

> -Original Message- > From: Shawn Pearce [mailto:spea...@spearce.org] > In git-core, I'm worried about the caveats related to locking. Git tries to > work > nicely on NFS, and it seems LMDB wouldn't. Git also runs fine on a read-only > filesystem, and LMDB gets a little weird about that.

git-fast-export doesn't support mergetag header

It looks to me like git-fast-export doesn't export the mergetag header on a commit. Is this intentional, or an oversight?

[RFC] Moving main git-subtree development. to GitHub

ove into contrib. I would like to maintain that visibilty. Does this mode of operation work for the larger git community? Are there suggestions of how to make this work as smoothly as possible? Thank you for your feedback and support of git-subtree! -David

Re: Should I store large text files on Git LFS?

this is not the case with binary files, hence the need for LFS). well, it wouldn't be 4G because text compresses well, but if the file changes drastically from version to version (say a quarterly report), the diff won't help. David Lang

Re: Should I store large text files on Git LFS?

will affect the repository in the same way that binaries do. Not quite the same way that binaries do, because text files compress well. but close. David Lang

RE: [PATCH v5 7/7] fsmonitor: add a performance test

> -Original Message- > From: Junio C Hamano [mailto:jch2...@gmail.com] On Behalf Of Junio C > Hamano > Sent: Friday, July 7, 2017 2:35 PM > To: Ben Peart <peart...@gmail.com> > Cc: git@vger.kernel.org; benpe...@microsoft.com; pclo...@gmail.com; > johannes.schi

[PATCH v3] mergetools/meld: improve compatibiilty with Meld on macOS X

usseb/meld [2] https://github.com/yousseb/meld/blob/master/osx/Meld [3] https://github.com/yousseb/meld/issues/42 Reported-by: Matthew Groth <mgrot...@gmail.com> Helped-by: Samuel Lijin <sxli...@gmail.com> Signed-off-by: David Aguilar <dav...@gmail.com> --- I cloned the meld rep

[PATCH v2] mergetools/meld: improve backwards-compatibiilty when using "--output"

Meld 3.16.0 requires a "=" in the --output argument, as it uses a simple hand-rolled command-line parser. Newer versions of Meld (3.16.4, and possibly earlier) use optparse, which accepts either "--output " or "--output=". Use "--output=" for better comp

Re: [PATCH] mergetools/meld: improve backwards-compatibiilty when using "--output"

On Sun, Jun 18, 2017 at 05:11:48AM -0400, Samuel Lijin wrote: > On Sun, Jun 18, 2017 at 3:46 AM, David Aguilar <dav...@gmail.com> wrote: > > On Sat, Jun 17, 2017 at 10:11:36AM -0400, Samuel Lijin wrote: > >> On Sat, Jun 17, 2017 at 6:24 AM, David Aguilar <dav...@gm

Re: [PATCH] mergetools/meld: improve backwards-compatibiilty when using "--output"

On Sat, Jun 17, 2017 at 10:11:36AM -0400, Samuel Lijin wrote: > On Sat, Jun 17, 2017 at 6:24 AM, David Aguilar <dav...@gmail.com> wrote: > > Meld 3.16.0 requires a "=" in the --output argument, as it uses > > a simple hand-rolled command-line parser. > &g

[PATCH] mergetools/meld: improve backwards-compatibiilty when using "--output"

Meld 3.16.0 requires a "=" in the --output argument, as it uses a simple hand-rolled command-line parser. Newer versions of Meld (3.16.4, and possibly earlier) use optpaarse, which accepts either "--output " or "--output=". Use "--output=" for better comp

bug? fetching from empty unnamed remote repos

$ git init empty-1 $ git init empty-2 $ cd empty-1 $ git fetch ../empty-2 fatal: Couldn't find remote ref HEAD fatal: The remote end hung up unexpectedly But: $ git init empty-1 $ git init empty-2 $ cd empty-1 $ git remote add other ../empty-2 $ git fetch other # this works I haven't spent a

Re: What does this output of git supposed to mean ?

On 6 June 2017 at 11:52, Junio C Hamano wrote: > Samuel Lijin writes: > >> For what it's worth, I've never quite understood the "Initial commit" >> message, because the repository is in a state where there are no >> commits yet, not when HEAD is pointing to

RE: [WIP/PATCH 7/6] perf: add a performance test for core.fsmonitor

nel.org > Cc: Junio C Hamano <gits...@pobox.com>; Ben Peart > <peart...@gmail.com>; Nguyễn Thái Ngọc Duy <pclo...@gmail.com>; > Johannes Schindelin <johannes.schinde...@gmx.de>; David Turner > <david.tur...@twosigma.com>; Jeff King <p...@peff.net>; Ch

RE: [PATCH 0/1] Preserve the untracked cache across checkout, reset --hard, etc

> -Original Message- > From: Ben Peart [mailto:peart...@gmail.com] > Sent: Thursday, May 18, 2017 12:58 PM > To: Junio C Hamano <gits...@pobox.com>; David Turner > <david.tur...@twosigma.com> > Cc: 'Christian Couder' <christian.cou...@gmail.com>; Joh

RE: [PATCH v1 2/5] Teach git to optionally utilize a file system monitor to speed up detecting new or changed files.

> -Original Message- > From: Ben Peart [mailto:peart...@gmail.com] > Sent: Monday, May 15, 2017 3:14 PM > To: git@vger.kernel.org > Cc: gits...@pobox.com; benpe...@microsoft.com; pclo...@gmail.com; > johannes.schinde...@gmx.de; David Turner <david.tur...@twosigma.

RE: [PATCH v1 5/5] Add a sample query-fsmonitor hook script that integrates with the cross platform Watchman file watching service.

> -Original Message- > From: Ben Peart [mailto:peart...@gmail.com] > Sent: Monday, May 15, 2017 3:14 PM > To: git@vger.kernel.org > Cc: gits...@pobox.com; benpe...@microsoft.com; pclo...@gmail.com; > johannes.schinde...@gmx.de; David Turner <david.tur...@twosigma.

RE: git worktrees must exist even if locked

not break the use of Git with worktrees that live elsewhere nor commands that don't require a repository. > -Original Message- > From: taylor, david > Sent: Wednesday, May 10, 2017 4:25 PM > To: git@vger.kernel.org > Subject: git worktrees must exist even if locked > >

git worktrees must exist even if locked

The Git documentation in describing worktrees says that one reason why you might want to lock a worktree is to prevent it from being pruned if it is on a removable media that isn't currently mounted. So, my expectation was that if the worktree is inaccessible (and locked), Git would pretend that

RE: [PATCH 0/1] Preserve the untracked cache across checkout, reset --hard, etc

Can you actually keep the email address as my Twopensource one? I want to make sure that Twitter, my employer at the time, gets credit for this work (just as I want to make sure that my current employer, Two Sigma, gets credit for my current work). Please feel free to add Signed-off-by: David

[PATCH] small memory leak fix

Hi this is my first submission, a memory leak found in the maint branch (might be in master as well). Kind regards. 0001-memory-leaks-fixes-for-remote-lists.patch Description: Binary data

RE: [PATCH] worktree add: add --lock option

> From: Duy Nguyen [mailto:pclo...@gmail.com] > Sent: Friday, April 14, 2017 9:01 AM > To: Junio C Hamano > Cc: Git Mailing List; taylor, david > Subject: Re: [PATCH] worktree add: add --lock option > > On Fri, Apr 14, 2017 at 5:50 AM, Junio C Hamano <gits...@pobox.com&g

  1   2   3   4   5   6   7   8   9   10   >