Patrick Lühne writes:
> Is there an official list of the Git versions that are still actively
> supported?
Depends on your definition of "official". Distro with lts may patch
older maintenance tracks longer than the upstream releases do, and
as far as the normal end-users are c
Hi,
Is there an official list of the Git versions that are still actively
supported? According to hearsay from colleagues, the latest five release
series receive security patches. I can’t find a source for that, but
might that be correct?
There’s also the Wikipedia page on Git [1], but it
On Fri, Jan 22, 2016 at 10:52:47PM +, Ashish Yadav wrote:
> Thanks.
>
> I just wanted to know if I can upgrade straight from v1.7.1-3 to v2.7 or
> do I need to upgrade to an intermediate version.
No, there should no reason to need an intermediate version.
-Peff
--
To unsubscribe from this l
Thanks.
I just wanted to know if I can upgrade straight from v1.7.1-3 to v2.7 or
do I need to upgrade to an intermediate version.
On 1/22/16, 4:42 PM, "Matthieu Moy" wrote:
>Jeff King writes:
>
>> On Fri, Jan 22, 2016 at 05:15:23PM +, Ashish Yadav wrote:
>>
>>> I am using git v1.7.12.4 w
Jeff King writes:
> On Fri, Jan 22, 2016 at 05:15:23PM +, Ashish Yadav wrote:
>
>> I am using git v1.7.12.4 w CentOS 6.5. Can I upgrade 1.7.1-3 to 2.7?
>
> Probably. :)
Surely ;-).
I have a CentOS 6.5 with Git 2.6 on it. It was installed from source
(I'm not the one who installed it, but I
work, and you can fetch and push between servers running arbitrary git
versions.
You may want to look at the release notes in Documentation/RelNotes, as
some of the defaults have changed (especially around the v2.0 release).
-Peff
--
To unsubscribe from this list: send the line "unsubscrib
I am using git v1.7.12.4 w CentOS 6.5. Can I upgrade 1.7.1-3 to 2.7?
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
On 27/03/13 20:01, Jeff King wrote:
On Wed, Mar 27, 2013 at 07:45:21PM +, John Keeping wrote:
On Wed, Mar 27, 2013 at 02:16:24PM -0500, Jed Brown wrote:
Charlie Smurthwaite writes:
Yes, I would need to be able to do this on a bare repo for my use case.
And if it's on the server, you do
John Keeping writes:
> You could use a temporary index and do something like:
>
> rm -f TMP_INDEX
> GIT_INDEX_FILE=TMP_INDEX
> export GIT_INDEX_FILE
> git read-tree -m $base $ours $theirs &&
> git merge-index git-merge-one-file -a
>
> then inspect that with "git diff
On Wed, Mar 27, 2013 at 07:45:21PM +, John Keeping wrote:
> On Wed, Mar 27, 2013 at 02:16:24PM -0500, Jed Brown wrote:
> > Charlie Smurthwaite writes:
> >
> > > Yes, I would need to be able to do this on a bare repo for my use case.
> >
> > And if it's on the server, you don't want this to
On Wed, Mar 27, 2013 at 02:16:24PM -0500, Jed Brown wrote:
> Charlie Smurthwaite writes:
>
> > Yes, I would need to be able to do this on a bare repo for my use case.
>
> And if it's on the server, you don't want this to be observable, so
> you don't want HEAD to move around. I don't know a bet
Charlie Smurthwaite writes:
> Yes, I would need to be able to do this on a bare repo for my use case.
And if it's on the server, you don't want this to be observable, so
you don't want HEAD to move around. I don't know a better way than:
$ git clone --shared -b upstream-branch bare-repo.git
On 27/03/13 18:06, Jed Brown wrote:
Charlie Smurthwaite writes:
I am also using this to obtain a diff that would be applied if a merge
were to be run. Is there a better way to obtain this information that is
more commonly used?
You can do an actual merge using detached HEAD:
$ git checkou
Charlie Smurthwaite writes:
> I am also using this to obtain a diff that would be applied if a merge
> were to be run. Is there a better way to obtain this information that is
> more commonly used?
You can do an actual merge using detached HEAD:
$ git checkout --detach upstream-branch
$ g
On 27/03/13 17:06, Junio C Hamano wrote:
Charlie Smurthwaite writes:
I am experiencing a segmentation fault in various versions of Git using
different repositories.
...
Test Command
git merge-tree 26bb22a052fef9f74063afd4fc6fc11fe200b19f
8d6bdf012941d876b2279994e02f1bb0d5c26e7d
d5ef97ac407d945
On 27/03/13 17:06, Junio C Hamano wrote:
Charlie Smurthwaite writes:
I am experiencing a segmentation fault in various versions of Git using
different repositories.
...
Test Command
git merge-tree 26bb22a052fef9f74063afd4fc6fc11fe200b19f
8d6bdf012941d876b2279994e02f1bb0d5c26e7d
d5ef97ac407d945
Charlie Smurthwaite writes:
> I am experiencing a segmentation fault in various versions of Git using
> different repositories.
> ...
> Test Command
> git merge-tree 26bb22a052fef9f74063afd4fc6fc11fe200b19f
> 8d6bdf012941d876b2279994e02f1bb0d5c26e7d
> d5ef97ac407d945f231cd7c8fb1cfe48b3a12083
Tha
John Keeping writes:
> Looks like a simple typo in merge-tree.c::unresolved:
Thanks.
>
> -- >8 --
> merge-tree: fix typo in merge-tree.c::unresolved
>
> When calculating whether there is a d/f conflict, the calculation of
> whether both sides are directories generates an incorrect references
>
John Keeping writes:
> merge-tree: fix typo in merge-tree.c::unresolved
>
> When calculating whether there is a d/f conflict, the calculation of
> whether both sides are directories generates an incorrect references
> mask because it does not use the loop index to set the correct bit.
> Fix this
On Wed, Mar 27, 2013 at 04:53:27PM +0100, thomas wrote:
> Charlie Smurthwaite writes:
>
> > I am experiencing a segmentation fault in various versions of Git using
> > different repositories. Specifically, I have reproduced it using a
> > public repo and the latest stable Git version. Other repos
Charlie Smurthwaite writes:
> I am experiencing a segmentation fault in various versions of Git using
> different repositories. Specifically, I have reproduced it using a
> public repo and the latest stable Git version. Other repos trigger the
> error on different versions.
>
> Full info can be f
I am experiencing a segmentation fault in various versions of Git using
different repositories. Specifically, I have reproduced it using a
public repo and the latest stable Git version. Other repos trigger the
error on different versions.
Full info can be found below. Thanks,
Charlie
Test repo
22 matches
Mail list logo
