From bdbefc100ceba66a70f540dfe2b1b09b0869f7ab Mon Sep 17 00:00:00 2001
From: Hemmo Nieminen hemmo.niemi...@iki.fi
Date: Wed, 16 Oct 2013 11:28:50 +0300
Subject: [PATCH] graph: Fix log's graph's colors when merging branches.
The log's graph's colors were off sometimes when merging several
On Thu, Oct 17, 2013 at 09:52:09AM +0300, Hemmo Nieminen wrote:
The log's graph's colors were off sometimes when merging several
branches. For example in the graph depicted below, the '-.' part
following the asterisk was colored with incorrect colors. This was
caused by the fact that the
On rename detection like command git diff -M ..., rename is detected
based on file similarities. This file similarities are calculated based
on the contents of file. And, if the similarities of contents are the
same, filename is taken into account.
But, the similarity of filename is calculated
Am 16.10.2013 23:43, schrieb Junio C Hamano:
* kb/fast-hashmap (2013-09-25) 6 commits
- fixup! diffcore-rename.c: simplify finding exact renames
- diffcore-rename.c: use new hash map implementation
- diffcore-rename.c: simplify finding exact renames
- diffcore-rename.c: move code around
Junio C Hamano gits...@pobox.com writes:
Did anything further happen to this discussion? Is v3 the version
with agreement among the list members I just should pick up?
v3
( http://thread.gmane.org/gmane.comp.version-control.git/235409/focus=235408 )
is the last version I sent, and I got no
W dniu 2013-10-16 23:38, Junio C Hamano pisze:
Felipe Contrerasfelipe.contre...@gmail.com writes:
[...]
I recall that I wanted to see this change happen myself long time
ago, and suspect that there may have been some reason that prevented
us from doing so. I might have found that AsciiDoc
On Thu, Oct 17, 2013 at 1:13 PM, Jakub Narębski jna...@gmail.com wrote:
Felipe Contrerasfelipe.contre...@gmail.com writes:
diff --git a/Documentation/git-checkout.txt
b/Documentation/git-checkout.txt
index ca118ac..8d98383 100644
--- a/Documentation/git-checkout.txt
+++
освободится от невыносимого зрения очевидно http://www.tayga.pro/tmp/pbfdx.htm
On rename detection like command git diff -M ..., rename is detected
based on file similarities. This file similarities are calculated based
on the contents of file. And, if the similarities of contents are the
same, filename is taken into account.
But, the similarity of filename is calculated
Jeff King p...@peff.net writes:
On Wed, Oct 16, 2013 at 09:41:16AM -0600, Martin Fick wrote:
I have nightmares about this sort of thing every now and
then, and we even experience some corruption here and there
that needs to be fixed (mainly missing objects when we toy
with different git
Am 16.10.2013 00:22, schrieb pro-logic:
I also get fairly slow performance out of the checkout / reset
operations on windows.
This discussion got me trying to work out what's taking so long on
windows. To help I used killcache [1] to flush the HDD cache and
Very Sleepy [2] to profile the
Hi,
On 09:13 Thu 17 Oct, John Keeping wrote:
It took me a minute to spot the problem when I tested this, but you're
right that there is a bug and I agree that the patch below is the right
fix.
Perhaps a better commit message will help others looking at this, maybe
something like this?
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
This is the only plumbing command that is controlled by
core.preferredPackVersion so far.
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
Documentation/technical/protocol-capabilities.txt | 4
builtin/receive-pack.c
Ваши языковые навыки поразят Вас самих
http://kuhny.com.ua/components/com_contact/ndavv.htm
NЇВцьrИyњшиbВXЌЖЧЇvи^)оК{.nЧ+З иЇЖЁмЈ}ЉВЦ
zкj:+vЈОЋъчzZ+Ъ+zfЃЂЗhЇ~лiџћрzЙ ЎwЅЂИ?ЈшкЂ)пЂf
Good day friend,
Its a year now since we won the EuroMillions Lottery of £148,656,000 pounds
sterling. To verify, you can watch our YouTube video here
http://www.youtube.com/watch?v=4lgIpsIe3a4
Recently,my wife Gillian suggested that we commence an end of year charity
event by giving out
Matthieu Moy matthieu@imag.fr writes:
diff --git a/builtin/checkout.c b/builtin/checkout.c
index 0f57397..9edd9c3 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -863,6 +863,13 @@ static const char *unique_tracking_name(const char
*name, unsigned char *sha1)
return
Jens Lehmann wrote:
In commit 0656781fa git mv learned to update the submodule path in the
.gitmodules file when moving a submodule in the work tree. But since that
commit update_path_in_gitmodules() gets called no matter if we moved a
submodule or a regular file, which is wrong and leads to
From: Junio C Hamano gits...@pobox.com
wor...@alum.mit.edu (Dale R. Worley) writes:
In general, Git commands on a repository with a detached worktree can
be executed by cd'ing into the directory containing the .git
directory, ...
Eh? News to me; it might happened to have appeared
Yoshioka Tsuneo yoshiokatsu...@gmail.com writes:
git diff -M --stat can detect rename and show renamed file name like
foofoofoo = barbarbar.
Before this commit, this output is shortened always by omitting left most
part like ...foo = barbarbar. So, if the destination filename is too long,
Jakub Narębski jna...@gmail.com writes:
W dniu 2013-10-16 23:38, Junio C Hamano pisze:
I recall that I wanted to see this change happen myself long time
ago,...
In short, I personally do prefer to see dashless form at the top of
the manpage, if it does not break other things, and there may
From: Jonathan Nieder jrnie...@gmail.com
Philip Oakley wrote:
Would this be a good time to suggest a specific wording should be
proposed (or a reminder of what was proposed repeated) for the
documentation of this option. It will be the documentation that
users will refer to when they need to
Felipe Contreras felipe.contre...@gmail.com writes:
Junio, can you make an exception and reply to this thread? The change
to move away from the term the index has been suggested many times
since many years ago, it is an extremely important change to users,
and all the Git developers agree it
Felipe Contreras felipe.contre...@gmail.com writes:
Junio C Hamano wrote:
Jeff King p...@peff.net writes:
It seems[1] that some
people define ci as commit -a, and some people define st as
status -s or even status -sb.
These option variants aside.
Just like thinking that committing
Yoshioka Tsuneo yoshiokatsu...@gmail.com writes:
Before this commit, this output is shortened always by omitting left most
part like ...foo = barbarbar. So, if the destination filename is too long,
source filename putting left or arrow can be totally omitted like
...barbarbar, without
Felipe Contreras felipe.contre...@gmail.com writes:
Junio C Hamano wrote:
Such a review comment and the discussion that follows it after a
patch is posted is an essential part of the collaborative
development process in this community and it has helped the quality
of our end product. We
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
I have a commit I am trying to cherry pick that removes a number of
files. It seems to generate conflicts for those files that have been
modified on this branch since the common ancestor. Since they are
being removed, I don't care about what changes
wor...@alum.mit.edu (Dale R. Worley) writes:
I must admit I've never seen the design (and I personally doubt that
the design has ever been written down). But at least the following
commands work correctly on a detached worktree if the current
directory contains the .git directory, because I
From: Junio C Hamano gits...@pobox.com
Philip Oakley philipoak...@iee.org writes:
... and the detection process for 'toplevel' may not work
properly when in a separated work-tree environment.
Without GIT_WORK_TREE exported to point at the top-level, there is
nothing that lets us detect it,
Karsten Blees karsten.bl...@gmail.com writes:
Am 16.10.2013 23:43, schrieb Junio C Hamano:
* kb/fast-hashmap (2013-09-25) 6 commits
- fixup! diffcore-rename.c: simplify finding exact renames
- diffcore-rename.c: use new hash map implementation
- diffcore-rename.c: simplify finding exact
Matthieu Moy matthieu@grenoble-inp.fr writes:
v3
( http://thread.gmane.org/gmane.comp.version-control.git/235409/focus=235408 )
is the last version I sent, and I got no feedback on it, so I guess it's
ready for you to pick.
Thanks; done with s/pick/nitpick/ ;-).
--
To unsubscribe from
Philip Oakley philipoak...@iee.org writes:
From: Junio C Hamano gits...@pobox.com
Philip Oakley philipoak...@iee.org writes:
... and the detection process for 'toplevel' may not work
properly when in a separated work-tree environment.
Without GIT_WORK_TREE exported to point at the
Junio C Hamano gits...@pobox.com writes:
Karsten Blees karsten.bl...@gmail.com writes:
Am 16.10.2013 23:43, schrieb Junio C Hamano:
* kb/fast-hashmap (2013-09-25) 6 commits
- fixup! diffcore-rename.c: simplify finding exact renames
- diffcore-rename.c: use new hash map implementation
-
From: Junio C Hamano gits...@pobox.com
Philip Oakley philipoak...@iee.org writes:
From: Junio C Hamano gits...@pobox.com
Philip Oakley philipoak...@iee.org writes:
... and the detection process for 'toplevel' may not work
properly when in a separated work-tree environment.
Without
Phillip Susi ps...@ubuntu.com writes:
I have a commit I am trying to cherry pick that removes a number of
files. It seems to generate conflicts for those files that have been
modified on this branch since the common ancestor.
Correct.
Without inspecting them, you would not know what you
Jonathan Nieder wrote:
Philip Oakley wrote:
Would this be a good time to suggest a specific wording should be
proposed (or a reminder of what was proposed repeated) for the
documentation of this option. It will be the documentation that
users will refer to when they need to know, rather
Junio C Hamano wrote:
Felipe Contreras felipe.contre...@gmail.com writes:
Junio C Hamano wrote:
Jeff King p...@peff.net writes:
It seems[1] that some
people define ci as commit -a, and some people define st as
status -s or even status -sb.
These option variants aside.
Junio C Hamano wrote:
Felipe Contreras felipe.contre...@gmail.com writes:
Junio C Hamano wrote:
Such a review comment and the discussion that follows it after a
patch is posted is an essential part of the collaborative
development process in this community and it has helped the quality
git diff -M --stat can detect rename and show renamed file name like
foofoofoo = barbarbar.
Before this commit, this output is shortened always by omitting left most
part like ...foo = barbarbar. So, if the destination filename is too long,
source filename putting left or arrow can be totally
Hello Junio
Thank you very much for the reviewing.
I try to fix the issues, and posted the updated patch as [PATCH v7].
I am not sure if distributing the burden of truncation equally to
three parts so that the resulting pieces are of similar lengths is
really a good idea. Between these two
Brandon Casey bca...@nvidia.com writes:
From: Brandon Casey draf...@gmail.com
The setting of denyDeleteCurrent applies to both bare and non-bare
repositories. Correct the description on this point, and expand it to
provide some background justification for the current behavior and
describe
Junio C Hamano wrote:
Felipe Contreras felipe.contre...@gmail.com writes:
Junio, can you make an exception and reply to this thread? The change
to move away from the term the index has been suggested many times
since many years ago, it is an extremely important change to users,
and all
From: Philip Oakley philipoak...@iee.org
From: Junio C Hamano gits...@pobox.com
Philip Oakley philipoak...@iee.org writes:
From: Junio C Hamano gits...@pobox.com
Philip Oakley philipoak...@iee.org writes:
... and the detection process for 'toplevel' may not work
properly when in a
Yoshioka Tsuneo yoshiokatsu...@gmail.com writes:
In the [PATCH v7], I changed to keep filename part of suffix to handle
above case, but not always keep directory part because I feel totally
keeping all part of long suffix including directory name may cause output
like:
…{… =
Philip Oakley wrote:
A bit more looking gave that the cd_to_toplevel () in git-sh-setup.sh
directly uses `git rev-parse --show-toplevel`, which simply returns
work_tree (static char *work_tree; in environment.c, with comment /*
This is set by setup_git_dir_gently() and/or git_default_config()
On Thu, Oct 17, 2013 at 3:23 PM, Junio C Hamano gits...@pobox.com wrote:
Brandon Casey bca...@nvidia.com writes:
From: Brandon Casey draf...@gmail.com
The setting of denyDeleteCurrent applies to both bare and non-bare
repositories. Correct the description on this point, and expand it to
Am 17.10.2013 23:07, schrieb Junio C Hamano:
Junio C Hamano gits...@pobox.com writes:
Karsten Blees karsten.bl...@gmail.com writes:
Am 16.10.2013 23:43, schrieb Junio C Hamano:
* kb/fast-hashmap (2013-09-25) 6 commits
- fixup! diffcore-rename.c: simplify finding exact renames
-
Hi, Junio
The following changes since commit 1d25dd416f08f39042d23340db380f28abb81962:
Update draft release notes to 1.8.5 (2013-10-16 12:27:45 -0700)
are available in the git repository at:
git://github.com/git-l10n/git-po master
Jean-Noel Avila (1):
l10n: fr.po: 2135/2135 messages
47 matches
Mail list logo
