On Mon, 2019-10-21 at 18:00 +0200, SZEDER Gábor wrote:
> Add the missing condition to trie_find() so it will never invoke the
> match function with a non-existing value. check_common() will then
> no
> longer have to check that it got a non-NULL value, so remove that
> condition.
...
>
> /
On Sun, 15 Sep 2019 at 07:24, Pratyush Yadav wrote:
> On 15/09/19 01:57AM, David wrote:
> > I can't say it strongly enough. Please do not change stage/unstage
> > to require double-click. This would be most unwelcome here, unless it
> > comes with a configuration
On Sun, 15 Sep 2019 at 05:08, Pratyush Yadav wrote:
> On 15/09/19 02:07AM, David wrote:
> > On Sat, 14 Sep 2019 at 06:51, Bert Wesarg
> > wrote:
> > > I consider adding a second way as not not acceptable. I also consider
> > > double-click on a file in a
On Sat, 14 Sep 2019 at 06:51, Bert Wesarg wrote:
> On Fri, Sep 13, 2019 at 4:32 PM Pratyush Yadav wrote:
> > On 13/09/19 12:24PM, Allan Ford wrote:
>
> I miss a general problem description: Whats wrong with the
> single-click on the icon to begin with?
No problem here, but see my other message f
On Sat, 14 Sep 2019 at 08:07, Marc Branchaud wrote:
> On 2019-09-13 10:32 a.m., Pratyush Yadav wrote:
> > On 13/09/19 12:24PM, Allan Ford wrote:
> >> Not a bug, but a suggestion consideration for “Git Gui”
> >> Can a double click on the file name in the “unstaged” area move the
> >> item to “sta
o adjacent visually in the UI
so there's a visual and muscle memory pairing there between the Status
and Commit widgets.
The JKL hotkeys are nice to have in addition to the numeric hotkeys
because they're so convenient. In some cases (like when the diff widget
is focused) we allow Alt-{J,K} to jump down/up (next/prev) between the
files in the status widget, otherwise regular {J,K} can be used if it
has focus.
Thanks for at least trying to keep some parity with git-cola's hotkeys.
It's not completely possible in all situations, but it's good to at
least share notes on how we use the GUI.
--
David
ured value, which is what the user
would likely expect even though the visual wrapping is smaller.
We also special-case trailers like "Signed-off-by:" and other common
trailers since user names can get long, and users sometimes use things
like "See-also:" and paste a long URL that we don't want to wrap.
Lastly, we have a convenient session-only checkbox to temporarily disable
wrapping for a commit that does not persist across restarts. The idea
is that sometimes you might use the GUI for a one-off commit where you
want to disable the wrapping for whatever reason, but don't want to
change your configuration.
--
David
On Tue, 3 Sep 2019 at 22:45, Pratyush Yadav wrote:
>
> Can you try doing a Shift+Tab? For me on Linux, if I hit Shift+Tab, it
> immediately takes me to the "Amend last commit" option. Then I can press
> space to select it and Tab again to get back to the commit message.
Hi Pratyush Yadav,
Yes, w
On Tue, 3 Sep 2019 at 04:11, Bert Wesarg wrote:
> On Mon, Sep 2, 2019 at 6:25 PM Birger Skogeng Pedersen
> wrote:
> > On Sat, Aug 31, 2019 at 12:51 PM Birger Skogeng Pedersen
> > wrote:
> > > In my pursuit to fully utilize git-gui with only using a keyboard, I
> > > suggest that there is a ho
Signed-off-by: David Turner
---
Documentation/gitremote-helpers.txt | 10 +++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/Documentation/gitremote-helpers.txt
b/Documentation/gitremote-helpers.txt
index 43f80c8068..a5c3c04371 100644
--- a/Documentation/gitremote
> -Original Message-
> From: Junio C Hamano
> Sent: Friday, August 30, 2019 1:35 PM
> To: David Turner
> Cc: Martin Ågren ; Git Mailing List
>
> Subject: Re: [PATCH] clarify documentation for remote helpers
>
> David Turner writes:
>
> > I was co
> -Original Message-
> From: Martin Ågren
> Sent: Friday, August 30, 2019 10:09 AM
> To: David Turner
> Cc: Git Mailing List
> Subject: Re: [PATCH v2] clarify documentation for remote helpers
>
> On Fri, 30 Aug 2019 at 16:00, David Turner wrote:
> >
&
Signed-off-by: David Turner
---
Documentation/gitremote-helpers.txt | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Documentation/gitremote-helpers.txt
b/Documentation/gitremote-helpers.txt
index 43f80c8068..f4a165387f 100644
--- a/Documentation/gitremote-helpers.txt
y that it's the full path.
> -Original Message-
> From: Martin Ågren
> Sent: Friday, August 30, 2019 12:03 AM
> To: David Turner
> Cc: Git Mailing List
> Subject: Re: [PATCH] clarify documentation for remote helpers
>
> On Thu, 29 Aug 2019 at 23:06, David Turner wrote:
&
Signed-off-by: David Turner
---
This doesn't address the connectivity-ok problem, which I continue to
worry is a real bug. But it would have saved me a few minutes of
debugging.
Documentation/gitremote-helpers.txt | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --
Quoth the git-remote-helpers man page:
"If option check-connectivity is requested, the helper must output
connectivity-ok if the clone is self-contained and connected."
I tried doing that in a helper, but I still got a connectivity check.
Looking at the code, it looks like this only works if I su
On Sat, Aug 24, 2019 at 08:57:22AM +0200, Bert Wesarg wrote:
> On Sat, Aug 24, 2019 at 1:43 AM David Aguilar wrote:
> > On the other hand, if I had to actually move my hand over to a mouse or
> > trackpad and actually "click" on something then I would be super
> >
itfall for a user who might run
git-gui in a different configuration (and becomes surprised when revert
doesn't prompt and suddenly loses their work).
Do we really need an option, or do we need better usability instead?
My opinion is that the latter is the real need.
That's my $.02 from having used this feature in practice since 2013.
--
David
p
with and the test cases still pass. Also, on my system tar2sqfs now accepts
git-archive tar balls which it didn't before applying the patch, so I
would go with this.
Thanks,
David
[0]
https://www.freebsd.org/cgi/man.cgi?query=tar&sektion=5&manpath=FreeBSD+12.0-RELEASE&
Dear Dinwoodie,
Please,I want to negotiate with you a transaction on inheritance
related matters in the value of $17 Million based on the same surname
you have with my late client Engineer Victor Dinwoodie
Barrister Tam David
--
Dear Friend,
I am Mrs Clara David. am sending you this brief letter to solicit your
partnership to transfer $18.5 million US Dollars.I shall send you more
information and procedures when I receive positive response from you.
please send me a message in my Email box (mrsclarad...@gmail.com
Hi all
Interesting discussion.
Though it's a pretty distant memory now, this "forgot to commit"
scenario was really frequent for me when I started using git. Then I'd
run commit and forget that it's split (from an outsider's perspective)
into add and then commit. I like the design of git, trees,
that the latest git version is from february, but I can
try anyway :)
Cheers,
David
rge.guitool merge.tool"
else
keys="merge.tool"
fi
else
if gui_mode
then
keys="diff.guitool merge.guitool diff.tool merge.tool"
else
keys="diff.tool merge.tool"
fi
fi
.. and then just have a single loop over $keys.
--
David
rge_tool=$(get_configured_merge_tool $GIT_MERGETOOL_GUI)
> # Try to guess an appropriate merge tool if no tool has been set.
> if test -z "$merge_tool"
> then
> merge_tool=$(guess_merge_tool) || exit
> + not_guessed=false
> fi
> echo "$merge_tool"
> + test "$not_guessed" = true
> }
--
David
ic idea of
creating small commits through partial staging.
- It has a keyboard-centric interface with vim-style navigation hotkeys.
- Git Cola is Free software and has the same license as Git.
- Python + Qt is easy to hack
https://github.com/git-cola/git-cola
https://git-cola.github.io/downloads.html
--
David
the selection, or current hunk, to match the index
https://github.com/git-cola/git-cola
https://git-cola.github.io/downloads.html
--
David
remote -n1 --tags --sort=v:refname origin "v*"
That would save from having to receive a large list of tags from the remote,
only one of which I care about.
~David
OFFICE OF THE PRESIDENCY
FEDERAL REPUBLIC OF NIGERIA.
FCT -ABUJA
PAYMENT NOTIFICATION
PAYMENT 2019:
Attn:Beneficiary,
We the entire members of Federal House of Senate,The office of
Presidency,Directors of Nigerian National Petroleum Corporation,on
behalf of the Federal Republic of Nigerian u
u segfault with the patch and don't segfault with the patch, there
is not much of a point in declaring this "somebody else's problem", is
there? It has to be fixed anyway in order to make the patch get in.
Or am I fundamentally misunderstanding something here?
--
David Kastrup
Teach difftool and mergetool about the Sublime Merge "smerge" command.
Signed-off-by: David Aguilar
---
git-mergetool--lib.sh | 1 +
mergetools/smerge | 12
2 files changed, 13 insertions(+)
create mode 100644 mergetools/smerge
diff --git a/git-mergetool--li
Signed-off-by: David Aguilar
---
contrib/completion/git-completion.bash | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/contrib/completion/git-completion.bash
b/contrib/completion/git-completion.bash
index 976e4a6548..b6d69bcaeb 100644
--- a/contrib/completion/git
(i.e., all of their non-unique lines). The trick
> is finding in each blob those ones that _are_ unique. :)
>
> But if we spend 36% of our time in hashing the blobs, then that implies
> that we could gain back 18% by caching and reusing the work from a
> previous diff (as David notes,
Junio C Hamano writes:
> David Kastrup writes:
>
>> When a parent blob already has chunks queued up for blaming, dropping
>> the blob at the end of one blame step will cause it to get reloaded
>> right away, doubling the amount of I/O and unpacking when proces
that should incur additional memory pressure mostly when processing the
merges from old branches.
Signed-off-by: David Kastrup
---
blame.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/blame.c b/blame.c
index 5c07dec190..c11c516921 100644
--- a/blame.c
+++ b/blame.c
Duy Nguyen writes:
> On Tue, Apr 2, 2019 at 5:30 PM David Kastrup wrote:
>>
>> Duy Nguyen writes:
>>
>> > On Tue, Apr 2, 2019 at 7:52 AM Matheus Tavares
>> > wrote:
>> >> I downloaded chromium to give it a try and got (on a m
#x27;ve proposed a trivial change in 2014 that could have cut down typical
blame times significantly but nobody was interested in testing and
committing it, and it is conceivable that in limited-memory situations
it might warrant some accounting/mitigation for weird histories (not
that ther
On Thu, 7 Mar 2019 at 09:00, Mike Hommey wrote:
> On Wed, Mar 06, 2019 at 03:14:11PM +0100, Johannes Schindelin wrote:
> >
> > just wanted to express my gratitude for your idea to introduce the `break`
> > command in `git rebase -i`'s todo list. I use it *all* the time now.
>
> +1. Before that, I
Dear Friend,
I am Mrs Clara David. am sending you this brief letter to solicit your
partnership to transfer $18.5 million US Dollars.I shall send you more
information and procedures when I receive positive response from you.
please send me a message in my Email box (mrsclarad...@gmail.com)
as i
Dear Friend,
I am Mrs Clara David. am sending you this brief letter to solicit your
partnership to transfer $18.5 million US Dollars.I shall send you more
information and procedures when I receive positive response from you.
please send me a message in my Email box (mrsclarad...@gmail.com)
as i
Dear Friend,
I am Mrs Clara David. am sending you this brief letter to solicit your
partnership to transfer $18.5 million US Dollars.I shall send you more
information and procedures when I receive positive response from you.
please send me a message in my Email box (mrsclarad...@gmail.com)
as i
Good day , my name is David William , i sent you a mail and there was
no response , please confirm that you did get this mail for more
details.
Regards.
David William
Dear Friend,
I am Mrs Clara David. am sending you this brief letter to solicit your
partnership to transfer $18.5 million US Dollars.I shall send you more
information and procedures when I receive positive response from you.
please send me a message in my Email box (mrsclarada...@gmail.com)
as i
Dear Friend,
I am Mrs Clara David. am sending you this brief letter to solicit your
partnership to transfer $18.5 million US Dollars.I shall send you more
information and procedures when I receive positive response from you.
please send me a message in my Email box (mrsclarada...@gmail.com)
as i
"1 file changed..." line]
>
> This patch teaches combine-diff to treats the two formats
> identically.
>
> Reported-by: David Turner
> Signed-off-by: Jeff King
> ---
> combine-diff.c | 1 +
> t/t4013-diff-various.sh
Thanks for adding the test.
On Fri, 2019-01-18 at 22:26 +, Eric Wong wrote:
> David Turner wrote:
> > Let's try this version.
>
> Thanks!
>
> Tested-by: Eric Wong
>
> Not sure if t1512 would be the best place to put the test, but
> having a repo with
Let's try this version.
On Fri, 2019-01-18 at 10:45 +, Eric Wong wrote:
> David Turner wrote:
> > It appears that get_oid_with_context calls into get_short_oid for
> > that
> > case, and get_short_oid returns SHORT_NAME_AMBIGUOUS, which is
> > -2. We
&g
01-18 at 03:38 +, Eric Wong wrote:
> Hi David,
>
> Perhaps I'm confused, the cat-file manpage seems to indicate
> "dangling" only gets printed if I use "--follow-symlinks".
>
> However, I'm not using "--follow-symlinks" and I get
>
When a submodule is renamed, git log gives incorrect output:
commit 350ebece9bce8d9c495f9a51e6f5529749c5c3cc (HEAD -> master)
Author:
David Turner
Date: Wed Jan 2 17:09:56 2019 -0500
move
diff --git a/.gitmodules b/.gitmodules
index da1a767..f4baf2a 100644
--- a/.gitmodules
++
On Sat, 22 Dec 2018 at 10:04, Brian Johnson wrote:
>
> Is it possible (or could a flag be added) to have show-branch only
> show the branch hierarchy at the top and not print out the commit
> list?
Does
git show-branch --list
do what you want?
have downloaded the latest Windows git and killing as many apps and
pids possible after Windows restart the installation goes south
nonetheless.
Please advise.
On 2018-12-21 09:55, Johannes Schindelin wrote:
Hi,
On Thu, 20 Dec 2018, David Brown wrote:
- [ ] I was not able to find an
[open](
- [ ] I was not able to find an
[open](https://github.com/git-for-windows/git/issues?q=is%3Aopen) or
[closed](https://github.com/git-for-windows/git/issues?q=is%3Aclosed)
issue matching what I'm seeing
### Setup
- Which version of Git for Windows are you using? Is it 32-bit or
64-bit?
$
On December 17, 2018 5:57:50 PM EST, "Ævar Arnfjörð Bjarmason"
wrote:
>
>On Mon, Dec 17 2018, David Turner wrote:
>
>> Overall, I like this. One nit:
>
>Thanks for the review!
>
>> On December 17, 2018 5:16:25 PM EST, "Ævar Arnfjörð Bjarmason&quo
Overall, I like this. One nit:
On December 17, 2018 5:16:25 PM EST, "Ævar Arnfjörð Bjarmason"
wrote:
>--- a/upload-pack.c
>+++ b/upload-pack.c
>@@ -54,7 +54,8 @@ static int no_progress, daemon_mode;
> #define ALLOW_REACHABLE_SHA1 02
>/* Allow request of any sha1. Implies ALLOW_TIP_SHA1 and
>ALL
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 .giti
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
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
y to point me 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
My Greeting, How are you today?Did you receive the letter i sent to
you. Please answer me.
Best Regard,
Mr. David Abraham
a
includes a GIT_SEQUENCE_EDITOR-compatible "git-xbase" 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
ith
getting 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
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 be
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
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 an
mention it (i.e. that
you may specify 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
inst
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 follo
's unique features.
It's probably the same reason why the git-lfs 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
elp is documentation about suggested
workflows. Git's 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
git difftool
... and let the inner script check 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
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 be
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
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,
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 'js/
a from 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 does it really make a human visible difference?
David Lang
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
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
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
lace, they want 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 i
recently, 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 lic
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 w
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 during my testing, and
On May 6, 2018 9:56:31 AM MDT, "Martin Ågren" wrote:
>On 6 May 2018 at 17:48, David Turner wrote:
>> On Sun, 2018-05-06 at 16:10 +0200, Martin Ågren wrote:
>>> While at it, make the lock non-static.
>
>> Re making the lock static, I wonder about the fol
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 functio
Re making the lock static, I wonder about the following case:
if (read_ref(pseudoref, &actual_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 sta
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
PATCH 0/2] Here 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
quot;$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
cheers,
--
David
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
bcd - (Sun Oct 22 12:02:50 2017 +0100) Updated code to a
Container parameter in AddIssue(). - DGH2112
regards
David Hoyle
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 text]
Thanks, and sorry
From: David Pursehouse
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
From: David Pursehouse
Signed-off-by: David Pursehouse
---
Documentation/merge-strategies.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/merge-strategies.txt
b/Documentation/merge-strategies.txt
index fd5d748d1..4a58aad4b 100644
--- a/Documentation/merge
arrival to meet you in your country.
Waiting to hear from you.
Sincerely yours,
Barrister Tamale David
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
> find_dir
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
e 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
.
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
ot;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
1 - 100 of 3022 matches
Mail list logo