From 2213aec5195b4ed65f07d5b1b4b07220823c42b3 Mon Sep 17 00:00:00 2001 From: Thomas Ferris Nicolaisen Date: Sun, 2 Aug 2015 23:51:02 +0200 Subject: [PATCH 0001/2849] rn-6: update meta data --- rev_news/drafts/edition-6.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rev_news/drafts/edition-6.md b/rev_news/drafts/edition-6.md index 5a14abe929..7c7ec2207d 100644 --- a/rev_news/drafts/edition-6.md +++ b/rev_news/drafts/edition-6.md @@ -1,13 +1,13 @@ --- title: Git Rev News Edition 6 (XXX, 2015) layout: default -date: 2015-07-08 21:06:51 +0100 -author: chriscool +date: 2015-08-05 21:06:51 +0100 +author: tfnico categories: [news] navbar: false --- -## Git Rev News: Edition 6 (XXX, 2015) +## Git Rev News: Edition 6 (August 5h, 2015) Welcome to the sixth edition of [Git Rev News](http://git.github.io/rev_news/rev_news.html), a digest of all things Git. For our goals, the archives, the way we work, and how to contribute or to From 1eb7ac5788e6f45dfee0026df7795a16a21fe270 Mon Sep 17 00:00:00 2001 From: Thomas Ferris Nicolaisen Date: Sun, 2 Aug 2015 23:51:32 +0200 Subject: [PATCH 0002/2849] rn-6: add collected links and releases --- rev_news/drafts/edition-6.md | 36 +++++++++++++++++++++++++++++++----- 1 file changed, 31 insertions(+), 5 deletions(-) diff --git a/rev_news/drafts/edition-6.md b/rev_news/drafts/edition-6.md index 7c7ec2207d..489ce5e42a 100644 --- a/rev_news/drafts/edition-6.md +++ b/rev_news/drafts/edition-6.md @@ -200,20 +200,46 @@ Gaurav thanked Junio and Jake for their support. ## Releases +* Git 2.5 is out! We'll leave it to the project maintainer, Junio C. Hamano, to [tell us what is new](http://git-blame.blogspot.de/2015/07/git-25.html). More elaborate release notes can be found [in the source](https://github.com/git/git/blob/master/Documentation/RelNotes/2.5.0.txt). +* GitLab keeps knocking out new versions, they're recently reached [7.13.2](https://about.gitlab.com/2015/07/28/gitlab-7-dot-13-dot-2-released/) in their stable train on top of the latest [7.13](https://about.gitlab.com/2015/07/22/gitlab-7-13-released/), displaying their new logo. +* libgit2 v0.23.0 [is out](https://github.com/libgit2/libgit2/releases/tag/v0.23.0) with a wide range of improvements. +* Following the libgit2 release, Rugged was quick to follow suit with their own [v0.23.0](https://github.com/libgit2/rugged/releases/tag/v0.23.0), while objective-git reached [0.8.7](https://github.com/libgit2/objective-git/releases/tag/0.8.7), and pygit2 reached [v0.22.1](https://github.com/libgit2/pygit2/releases/tag/v0.22.1). + ## Other News -__Various__ - - __Light reading__ +* A few days ago marked [the 10th anniversary of Junio becoming the maintainer](https://plus.google.com/u/0/+JunioCHamano/posts/EchiBhdBfQa) of the Git project. Congratulations! +* GitHub, probably the biggest Git hosting provider in the world, [raised $ 250 million](http://techcrunch.com/2015/07/29/github-raises-250m-series-b-round-to-take-risks/) in order "to accelerate growth and expand its sales and engineering team" and "to allow us to think bigger and take larger risks". +* For similar sounding reasons, GitLab [raised $ 1.5 million in a seed round](https://about.gitlab.com/2015/07/09/1.5M-raised-in-seed-funding-for-gitlab-to-accelerate-growth-and-expand-operations/) for their open source hosting option. +* We were all shocked to find out that [one in every 600 websites has .git exposed](http://www.jamiembrown.com/blog/one-in-every-600-websites-has-git-exposed/), as shared by Jamie Brown. +* The notorious Git mastermind of StackOverflow, VonC, explains [how to make use of the new `git worktree add` command that arrived with Git 2.5. +* Ilmari Kontulainen of Deveo provides us with a [current rundown of options for storing large files with(out) Git](http://blog.deveo.com/storing-large-binary-files-in-git-repositories/). +* Dealing with Git Merge Revisions, or [Zen and the Art of Git Chainsaw Maintenance](http://blog.jdwyah.com/2015/07/dealing-with-git-merge-revisions.html), by Jeff Dwyer. +* Jim Moore shared a quick tip on [how to view a deleted file in Git](http://blog.mooregreatsoftware.com/2013/12/13/viewing-deleted-git-content/). +* The not so light reading title this month is 'A Case of Computational Thinking: The Subtle Effect of Hidden Dependencies on the User Experience of Version Control', [a research paper from Google](https://static.googleusercontent.com/media/research.google.com/en/us/pubs/archive/42942.pdf) on the usability of version control systems +* We'll never get tired of the awesomeness of `git bisect`, so here is Kruno Knego [giving beginners a fresh introduction](http://krunoknego.com/2015/07/14/git-bisect/). +* Apparently Magit is such a great Git UI, that it's worth switching to Emacs just to get at it. Here's Nathan Willis [explaining what Magit 2.1 is all about](http://lwn.net/Articles/649535/) (to be honest, this section was staged using Vim/fugitive, sorry). +* Another use-case for the under-used Git notes: [marking test suite successes](http://who-t.blogspot.de/2015/07/using-git-notes-for-marking-test-suite.html), by Peter Hutterer. +* Don’t Fear the Rebase: [Git Garbage Collection and You](http://blog.carbonfive.com/2015/07/01/dont-fear-the-rebase-git-garbage-collection-and-you/), Chris Svenningsen helps us roll back after losing changes. +* The most commonly used (citation needed) [git tips and tricks](http://git.io/git-tips) +* Many of us think working with patch files is hard. Alexander Ross shows [why this need not be the case](http://aross.se/2015/06/22/create-and-apply-git-patch-files.html). __Git tools and sites__ +* There aren't enough great visual Git tools around. [Git for DiffPlug](https://www.kickstarter.com/projects/diffplug/git-for-diffplug) is a Kickstarter that aims to change this. Interestingly, it's [based on JGit](http://dev.eclipse.org/mhonarc/lists/jgit-dev/msg02942.html). +* Here's an LWN article on [Gogs](http://lwn.net/Articles/650145/), which claims to be A painless self-hosted Git service. +* [mingit](https://github.com/evansendra/mingit) is an extremely minified alias for git commands with tab completion. +* [AWS CodeCommit](https://aws.amazon.com/blogs/aws/now-available-aws-codecommit/) is Amazon's fresh attempt at providing Git hosting. +* [GitCompound](https://github.com/grzesiek/git_compound) allows you to compose your project using git repositories and Ruby tasks. +* Dan Feldman from Artifactory explains [how to use Artifactory to store Git LFS resources](http://www.jfrog.com/blog/use-the-right-tool-for-the-job-git-lfs-with-artifactory/). Might this be the first non-GitHub company announcing their support for Git LFS? +* Atlassian has relaunched their Git knowledge portal under the motto [Getting Git Right](https://www.atlassian.com/git/). +* [git-bottle](https://github.com/da-x/git-bottle) proposes to be a better stash. +* [gig](https://github.com/hackrslab/gig) is a command-line tool for quickly setting up .gitignore files. See also [gitignore.io](https://www.gitignore.io/). +* ## Credits This edition of Git Rev News was curated by Christian Couder <>, -Thomas Ferris Nicolaisen <> and Nicola Paolucci <>, -with help from XXX. +Thomas Ferris Nicolaisen <> and Nicola Paolucci <>. From 7ef70ab1a1fe23cc1e7886322f09a37a40d24985 Mon Sep 17 00:00:00 2001 From: Andrew Ardill Date: Mon, 3 Aug 2015 10:12:02 +1000 Subject: [PATCH 0003/2849] Expand the section on the 2.5 release This release seems interesting enough to add a bit more content in the edition. --- rev_news/drafts/edition-6.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/rev_news/drafts/edition-6.md b/rev_news/drafts/edition-6.md index 489ce5e42a..5236bc0d27 100644 --- a/rev_news/drafts/edition-6.md +++ b/rev_news/drafts/edition-6.md @@ -200,7 +200,13 @@ Gaurav thanked Junio and Jake for their support. ## Releases -* Git 2.5 is out! We'll leave it to the project maintainer, Junio C. Hamano, to [tell us what is new](http://git-blame.blogspot.de/2015/07/git-25.html). More elaborate release notes can be found [in the source](https://github.com/git/git/blob/master/Documentation/RelNotes/2.5.0.txt). +* Git 2.5 is out! The project maintainer, Junio C. Hamano, has [shared his thoughts on the release at his blog](http://git-blame.blogspot.de/2015/07/git-25.html). Git 2.5 is packed full of new features, and includes contributions from 21 new contributors. In his post, Junio describes how `git help` has changed: + +> One interesting change is to git help. We now list commands, grouped by the situation in which you would want to use them. This came from discussion on usability, inspired by one of the talks at GitMerge conference we had in spring. + +He goes on to talk about some of his favourite new features included in the release, such as a new short hand `branch@{push}` that "denotes the remote-tracking branch that tracks the branch at the remote the branch would be pushed to", and a new option `--ws-error-highlight` that can be used with `git diff` and friends to show whitespace breakages in deleted and context lines. + +Be sure to see the post for more on the new features, or checkout the [release notes in the source](https://github.com/git/git/blob/master/Documentation/RelNotes/2.5.0.txt) for all the nitty gritty details. * GitLab keeps knocking out new versions, they're recently reached [7.13.2](https://about.gitlab.com/2015/07/28/gitlab-7-dot-13-dot-2-released/) in their stable train on top of the latest [7.13](https://about.gitlab.com/2015/07/22/gitlab-7-13-released/), displaying their new logo. * libgit2 v0.23.0 [is out](https://github.com/libgit2/libgit2/releases/tag/v0.23.0) with a wide range of improvements. * Following the libgit2 release, Rugged was quick to follow suit with their own [v0.23.0](https://github.com/libgit2/rugged/releases/tag/v0.23.0), while objective-git reached [0.8.7](https://github.com/libgit2/objective-git/releases/tag/0.8.7), and pygit2 reached [v0.22.1](https://github.com/libgit2/pygit2/releases/tag/v0.22.1). From 1def7471831849aea555b802cf6b8fb6189a94af Mon Sep 17 00:00:00 2001 From: Stefan Beller Date: Mon, 3 Aug 2015 14:02:40 -0700 Subject: [PATCH 0004/2849] correct Jeffs name --- rev_news/drafts/edition-6.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rev_news/drafts/edition-6.md b/rev_news/drafts/edition-6.md index 5236bc0d27..bcd27d16f1 100644 --- a/rev_news/drafts/edition-6.md +++ b/rev_news/drafts/edition-6.md @@ -84,7 +84,7 @@ log` should imply `--cc`: > merge patches, but "git show " does show them. And you kind of > have to know a lot about git to know the "--cc" option. -Linus, Junio and Jeff Kind tried to find a sensible way to improve on +Linus, Junio and Jeff King tried to find a sensible way to improve on this, but in the end it looks like nothing will be done as the new behavior might have some drawbacks. Junio concluded the thread with: From e5a1aa8d9f2d547a9ade761e497b7e326d013e3a Mon Sep 17 00:00:00 2001 From: Nicola Paolucci Date: Tue, 4 Aug 2015 11:57:59 +0200 Subject: [PATCH 0005/2849] Add 'Did you know' section to edition 6 --- rev_news/drafts/edition-6.md | 39 ++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/rev_news/drafts/edition-6.md b/rev_news/drafts/edition-6.md index bcd27d16f1..79f9e1d1ed 100644 --- a/rev_news/drafts/edition-6.md +++ b/rev_news/drafts/edition-6.md @@ -17,6 +17,45 @@ This edition covers what happened during the month of July 2015. ## Discussions +### Did you know? + +Did you know that the [Linux kernel](https://www.kernel.org) you clone normally +contains only a part of its entire history? If you need access to its +uninterrupted evolution since the first commit you have to "graft" a few +separate repositories together chronologically. + +Git has a local - per-repository - mechanism to change and specify explicitly +the parent of existing commits: These are called Grafts. In a repository they +are defined in a file called "`.git/info/grafts`" (check the [Git repository +layout manpage for details](http://www.kernel.org/pub/software/scm/git/docs/gitrepository-layout.html)). + +From the [Git Wiki](https://git.wiki.kernel.org/index.php/GraftPoint): + +> When Linus started using Git for maintaining his kernel tree there didn't +> exist any tools to convert the old kernel history. Later, when the old kernel +> history was imported into Git from the bkcvs gateway, grafts was created as a +> method for making it possible to tie the two different repositories together. + +To re-assemble the complete kernel history these three repositories are needed: + +- [torvalds/linux](https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git) +- [tglx/history](https://git.kernel.org/pub/scm/linux/kernel/git/tglx/history.git) +- [davej/history](https://git.kernel.org/pub/scm/linux/kernel/git/davej/history.git) + +The syntax of the Grafts file in "`.git/info/grafts`" is simple: each line +lists a commit and it's fake parent using the `SHA-1` identifiers. So to +re-assemble the full history of the Linux kernel add the following grafts to +`.git/info/grafts`: + +``` +1da177e4c3f41524e886b7f1b8a0c1fc7321cac2 e7e173af42dbf37b1d946f9ee00219cb3b2bea6a +7a2deb32924142696b8174cdf9b38cd72a11fc96 379a6be1eedb84ae0d476afbc4b4070383681178 +``` + +With these grafts, you can get a complete and continuous history of the kernel +since 0.01. Read the rest of the article on grafts and `git replace` in +Nicola's [just published piece](https://developer.atlassian.com/blog/2015/08/grafting-earlier-history-with-git/). + From 78b76d267c1641ce2f43086ab532150944239a60 Mon Sep 17 00:00:00 2001 From: Thomas Ferris Nicolaisen Date: Tue, 4 Aug 2015 12:49:14 +0200 Subject: [PATCH 0006/2849] rn-6: move git 2.5 release upwards --- rev_news/drafts/edition-6.md | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/rev_news/drafts/edition-6.md b/rev_news/drafts/edition-6.md index 79f9e1d1ed..c958e51085 100644 --- a/rev_news/drafts/edition-6.md +++ b/rev_news/drafts/edition-6.md @@ -17,6 +17,17 @@ This edition covers what happened during the month of July 2015. ## Discussions +### General + +Git 2.5 is out! The project maintainer, Junio C. Hamano, has [shared his thoughts on the release at his blog](http://git-blame.blogspot.de/2015/07/git-25.html). Git 2.5 is packed full of new features, and includes contributions from 21 new contributors. In his post, Junio describes how `git help` has changed: + +> One interesting change is to git help. We now list commands, grouped by the situation in which you would want to use them. This came from discussion on usability, inspired by one of the talks at GitMerge conference we had in spring. + +He goes on to talk about some of his favourite new features included in the release, such as a new short hand `branch@{push}` that "denotes the remote-tracking branch that tracks the branch at the remote the branch would be pushed to", and a new option `--ws-error-highlight` that can be used with `git diff` and friends to show whitespace breakages in deleted and context lines. + +Be sure to see the post for more on the new features, or checkout the [release notes in the source](https://github.com/git/git/blob/master/Documentation/RelNotes/2.5.0.txt) for all the nitty gritty details. + + ### Did you know? Did you know that the [Linux kernel](https://www.kernel.org) you clone normally @@ -56,10 +67,6 @@ With these grafts, you can get a complete and continuous history of the kernel since 0.01. Read the rest of the article on grafts and `git replace` in Nicola's [just published piece](https://developer.atlassian.com/blog/2015/08/grafting-earlier-history-with-git/). - - @@ -239,13 +246,7 @@ Gaurav thanked Junio and Jake for their support. ## Releases -* Git 2.5 is out! The project maintainer, Junio C. Hamano, has [shared his thoughts on the release at his blog](http://git-blame.blogspot.de/2015/07/git-25.html). Git 2.5 is packed full of new features, and includes contributions from 21 new contributors. In his post, Junio describes how `git help` has changed: - -> One interesting change is to git help. We now list commands, grouped by the situation in which you would want to use them. This came from discussion on usability, inspired by one of the talks at GitMerge conference we had in spring. - -He goes on to talk about some of his favourite new features included in the release, such as a new short hand `branch@{push}` that "denotes the remote-tracking branch that tracks the branch at the remote the branch would be pushed to", and a new option `--ws-error-highlight` that can be used with `git diff` and friends to show whitespace breakages in deleted and context lines. - -Be sure to see the post for more on the new features, or checkout the [release notes in the source](https://github.com/git/git/blob/master/Documentation/RelNotes/2.5.0.txt) for all the nitty gritty details. +* Git 2.5 (see above)! * GitLab keeps knocking out new versions, they're recently reached [7.13.2](https://about.gitlab.com/2015/07/28/gitlab-7-dot-13-dot-2-released/) in their stable train on top of the latest [7.13](https://about.gitlab.com/2015/07/22/gitlab-7-13-released/), displaying their new logo. * libgit2 v0.23.0 [is out](https://github.com/libgit2/libgit2/releases/tag/v0.23.0) with a wide range of improvements. * Following the libgit2 release, Rugged was quick to follow suit with their own [v0.23.0](https://github.com/libgit2/rugged/releases/tag/v0.23.0), while objective-git reached [0.8.7](https://github.com/libgit2/objective-git/releases/tag/0.8.7), and pygit2 reached [v0.22.1](https://github.com/libgit2/pygit2/releases/tag/v0.22.1). From 6e17357cc0b5b584804e7a87b461ab78c2097c32 Mon Sep 17 00:00:00 2001 From: Thomas Ferris Nicolaisen Date: Wed, 5 Aug 2015 23:14:10 +0200 Subject: [PATCH 0007/2849] ignore gem lock file from running jekyll --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 0baf015229..29949d4658 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /_site +/Gemfile.lock From 3909ea4f18eeccd2df58568f063167c0beb81f6b Mon Sep 17 00:00:00 2001 From: Thomas Ferris Nicolaisen Date: Wed, 5 Aug 2015 23:23:20 +0200 Subject: [PATCH 0008/2849] rn-6: add more links --- rev_news/drafts/edition-6.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rev_news/drafts/edition-6.md b/rev_news/drafts/edition-6.md index c958e51085..d0eb488790 100644 --- a/rev_news/drafts/edition-6.md +++ b/rev_news/drafts/edition-6.md @@ -271,10 +271,11 @@ __Light reading__ * Don’t Fear the Rebase: [Git Garbage Collection and You](http://blog.carbonfive.com/2015/07/01/dont-fear-the-rebase-git-garbage-collection-and-you/), Chris Svenningsen helps us roll back after losing changes. * The most commonly used (citation needed) [git tips and tricks](http://git.io/git-tips) * Many of us think working with patch files is hard. Alexander Ross shows [why this need not be the case](http://aross.se/2015/06/22/create-and-apply-git-patch-files.html). +* [git from scratch](http://www.gitfromscratch.com/) is a tutorial for non-programmers and command-line-avoiders who want to get into Git, using DiffPlug (see next link). __Git tools and sites__ -* There aren't enough great visual Git tools around. [Git for DiffPlug](https://www.kickstarter.com/projects/diffplug/git-for-diffplug) is a Kickstarter that aims to change this. Interestingly, it's [based on JGit](http://dev.eclipse.org/mhonarc/lists/jgit-dev/msg02942.html). +* There aren't enough great visual Git tools around. [Git for DiffPlug](https://www.kickstarter.com/projects/diffplug/git-for-diffplug) is a Kickstarter that aims to change this. Interestingly, it's [based on JGit](http://dev.eclipse.org/mhonarc/lists/jgit-dev/msg02944.html), and the creators have proposed a VCS-agnostic diff-API, [OpenDiff](https://github.com/diffplug/opendiff). * Here's an LWN article on [Gogs](http://lwn.net/Articles/650145/), which claims to be A painless self-hosted Git service. * [mingit](https://github.com/evansendra/mingit) is an extremely minified alias for git commands with tab completion. * [AWS CodeCommit](https://aws.amazon.com/blogs/aws/now-available-aws-codecommit/) is Amazon's fresh attempt at providing Git hosting. From 082b25f12c0a157f582893369bc094ffa1ba11be Mon Sep 17 00:00:00 2001 From: Thomas Ferris Nicolaisen Date: Wed, 5 Aug 2015 23:38:26 +0200 Subject: [PATCH 0009/2849] rn-6: correct meta-data --- rev_news/drafts/edition-6.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rev_news/drafts/edition-6.md b/rev_news/drafts/edition-6.md index d0eb488790..c453b964e8 100644 --- a/rev_news/drafts/edition-6.md +++ b/rev_news/drafts/edition-6.md @@ -1,13 +1,13 @@ --- -title: Git Rev News Edition 6 (XXX, 2015) +title: Git Rev News Edition 6 (August 5th, 2015) layout: default -date: 2015-08-05 21:06:51 +0100 +date: 2015-08-05 23:26:51 +0100 author: tfnico categories: [news] navbar: false --- -## Git Rev News: Edition 6 (August 5h, 2015) +## Git Rev News: Edition 6 (August 5th, 2015) Welcome to the sixth edition of [Git Rev News](http://git.github.io/rev_news/rev_news.html), a digest of all things Git. For our goals, the archives, the way we work, and how to contribute or to From 5a35ac4e858ebcc9ea4583da09d30c315be7f9f2 Mon Sep 17 00:00:00 2001 From: Thomas Ferris Nicolaisen Date: Wed, 5 Aug 2015 23:38:46 +0200 Subject: [PATCH 0010/2849] rn-6: add call to arms --- rev_news/drafts/edition-6.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/rev_news/drafts/edition-6.md b/rev_news/drafts/edition-6.md index c453b964e8..3289e18778 100644 --- a/rev_news/drafts/edition-6.md +++ b/rev_news/drafts/edition-6.md @@ -244,6 +244,19 @@ to properly check in the hook that a ref being updated is a tag: Gaurav thanked Junio and Jake for their support. +---- +Before we move on to the link section of this edition, we want to make a +"call-to-arms" for people reading the Git mailing list. We didn't +get enough material in this edition on what was really discussed on +the list the last month. In order to to be the window into the Git +community that we set out to be, we need your help. + +So please, the next time you read through an interesting discussion on +the mailing list, note down a few lines about it and +[share them with us](http://git.github.io/rev_news/rev_news.html). + +---- + ## Releases * Git 2.5 (see above)! From 3712e4798f0ea546080bcbbce7e081af149bbf5a Mon Sep 17 00:00:00 2001 From: Thomas Ferris Nicolaisen Date: Wed, 5 Aug 2015 23:40:23 +0200 Subject: [PATCH 0011/2849] rn-6: ship it --- .../drafts/edition-6.md => _posts/2015-08-05-edition-6.markdown | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename rev_news/drafts/edition-6.md => _posts/2015-08-05-edition-6.markdown (100%) diff --git a/rev_news/drafts/edition-6.md b/_posts/2015-08-05-edition-6.markdown similarity index 100% rename from rev_news/drafts/edition-6.md rename to _posts/2015-08-05-edition-6.markdown From a97c157b07e2d387398bf886e40a08ea9bcfcf51 Mon Sep 17 00:00:00 2001 From: Andrew Ardill Date: Thu, 6 Aug 2015 09:55:17 +1000 Subject: [PATCH 0012/2849] minor typo --- _posts/2015-08-05-edition-6.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_posts/2015-08-05-edition-6.markdown b/_posts/2015-08-05-edition-6.markdown index 3289e18778..7439697289 100644 --- a/_posts/2015-08-05-edition-6.markdown +++ b/_posts/2015-08-05-edition-6.markdown @@ -273,7 +273,7 @@ __Light reading__ * GitHub, probably the biggest Git hosting provider in the world, [raised $ 250 million](http://techcrunch.com/2015/07/29/github-raises-250m-series-b-round-to-take-risks/) in order "to accelerate growth and expand its sales and engineering team" and "to allow us to think bigger and take larger risks". * For similar sounding reasons, GitLab [raised $ 1.5 million in a seed round](https://about.gitlab.com/2015/07/09/1.5M-raised-in-seed-funding-for-gitlab-to-accelerate-growth-and-expand-operations/) for their open source hosting option. * We were all shocked to find out that [one in every 600 websites has .git exposed](http://www.jamiembrown.com/blog/one-in-every-600-websites-has-git-exposed/), as shared by Jamie Brown. -* The notorious Git mastermind of StackOverflow, VonC, explains [how to make use of the new `git worktree add` command that arrived with Git 2.5. +* The notorious Git mastermind of StackOverflow, VonC, explains how to make use of the new `git worktree add` command that arrived with Git 2.5. * Ilmari Kontulainen of Deveo provides us with a [current rundown of options for storing large files with(out) Git](http://blog.deveo.com/storing-large-binary-files-in-git-repositories/). * Dealing with Git Merge Revisions, or [Zen and the Art of Git Chainsaw Maintenance](http://blog.jdwyah.com/2015/07/dealing-with-git-merge-revisions.html), by Jeff Dwyer. * Jim Moore shared a quick tip on [how to view a deleted file in Git](http://blog.mooregreatsoftware.com/2013/12/13/viewing-deleted-git-content/). From 5bba6a00183c80bd858802813c45ea411b233dec Mon Sep 17 00:00:00 2001 From: Thomas Ferris Nicolaisen Date: Fri, 7 Aug 2015 00:07:10 +0200 Subject: [PATCH 0013/2849] rn-7: add empty draft --- rev_news/drafts/edition-7.md | 50 ++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 rev_news/drafts/edition-7.md diff --git a/rev_news/drafts/edition-7.md b/rev_news/drafts/edition-7.md new file mode 100644 index 0000000000..5c5229176d --- /dev/null +++ b/rev_news/drafts/edition-7.md @@ -0,0 +1,50 @@ +--- +title: Git Rev News Edition 7 (XXX, 2015) +layout: default +date: 2015-07-08 21:06:51 +0100 +author: chriscool +categories: [news] +navbar: false +--- + +## Git Rev News: Edition 7 (XXX, 2015) + +Welcome to the sixth edition of [Git Rev News](http://git.github.io/rev_news/rev_news.html), +a digest of all things Git. For our goals, the archives, the way we work, and how to contribute or to +subscribe, see [the Git Rev News page](http://git.github.io/rev_news/rev_news.html) on [git.github.io](http://git.github.io). + +This edition covers what happened during the month of July 2015. + +## Discussions + + + + + + + +## Releases + + +## Other News + +__Various__ + + +__Light reading__ + + +__Git tools and sites__ + + +## Credits + +This edition of Git Rev News was curated by Christian Couder <>, +Thomas Ferris Nicolaisen <> and Nicola Paolucci <>, +with help from XXX. From 3a44d3d5dd5e0faed5d33b69349e00ae197b129c Mon Sep 17 00:00:00 2001 From: Thomas Ferris Nicolaisen Date: Fri, 7 Aug 2015 00:07:57 +0200 Subject: [PATCH 0014/2849] rn-7: fix number --- rev_news/drafts/edition-7.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rev_news/drafts/edition-7.md b/rev_news/drafts/edition-7.md index 5c5229176d..80bda19f86 100644 --- a/rev_news/drafts/edition-7.md +++ b/rev_news/drafts/edition-7.md @@ -9,7 +9,7 @@ navbar: false ## Git Rev News: Edition 7 (XXX, 2015) -Welcome to the sixth edition of [Git Rev News](http://git.github.io/rev_news/rev_news.html), +Welcome to the 7th edition of [Git Rev News](http://git.github.io/rev_news/rev_news.html), a digest of all things Git. For our goals, the archives, the way we work, and how to contribute or to subscribe, see [the Git Rev News page](http://git.github.io/rev_news/rev_news.html) on [git.github.io](http://git.github.io). From 98e98b2cb1ad3db8b34ac83ffcf2e1e9162c2096 Mon Sep 17 00:00:00 2001 From: Thomas Ferris Nicolaisen Date: Fri, 7 Aug 2015 00:21:16 +0200 Subject: [PATCH 0015/2849] rn-6: thanks Andrew for the help Unfortunately I forgot this, but better late than never. --- _posts/2015-08-05-edition-6.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_posts/2015-08-05-edition-6.markdown b/_posts/2015-08-05-edition-6.markdown index 7439697289..54b66fc191 100644 --- a/_posts/2015-08-05-edition-6.markdown +++ b/_posts/2015-08-05-edition-6.markdown @@ -302,4 +302,4 @@ __Git tools and sites__ ## Credits This edition of Git Rev News was curated by Christian Couder <>, -Thomas Ferris Nicolaisen <> and Nicola Paolucci <>. +Thomas Ferris Nicolaisen <> and Nicola Paolucci <>, with help from Andrew Ardill. From 2f58381b1a4eed350b6f83339cc382580148e374 Mon Sep 17 00:00:00 2001 From: Thomas Ferris Nicolaisen Date: Fri, 7 Aug 2015 02:07:38 +0200 Subject: [PATCH 0016/2849] rn-6: fix missing link --- _posts/2015-08-05-edition-6.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_posts/2015-08-05-edition-6.markdown b/_posts/2015-08-05-edition-6.markdown index 54b66fc191..1b1c189ce5 100644 --- a/_posts/2015-08-05-edition-6.markdown +++ b/_posts/2015-08-05-edition-6.markdown @@ -273,7 +273,7 @@ __Light reading__ * GitHub, probably the biggest Git hosting provider in the world, [raised $ 250 million](http://techcrunch.com/2015/07/29/github-raises-250m-series-b-round-to-take-risks/) in order "to accelerate growth and expand its sales and engineering team" and "to allow us to think bigger and take larger risks". * For similar sounding reasons, GitLab [raised $ 1.5 million in a seed round](https://about.gitlab.com/2015/07/09/1.5M-raised-in-seed-funding-for-gitlab-to-accelerate-growth-and-expand-operations/) for their open source hosting option. * We were all shocked to find out that [one in every 600 websites has .git exposed](http://www.jamiembrown.com/blog/one-in-every-600-websites-has-git-exposed/), as shared by Jamie Brown. -* The notorious Git mastermind of StackOverflow, VonC, explains how to make use of the new `git worktree add` command that arrived with Git 2.5. +* The notorious Git mastermind of StackOverflow, VonC, explains [how to make use of the new `git worktree add` command](http://stackoverflow.com/a/30185564/266875) that arrived with Git 2.5. * Ilmari Kontulainen of Deveo provides us with a [current rundown of options for storing large files with(out) Git](http://blog.deveo.com/storing-large-binary-files-in-git-repositories/). * Dealing with Git Merge Revisions, or [Zen and the Art of Git Chainsaw Maintenance](http://blog.jdwyah.com/2015/07/dealing-with-git-merge-revisions.html), by Jeff Dwyer. * Jim Moore shared a quick tip on [how to view a deleted file in Git](http://blog.mooregreatsoftware.com/2013/12/13/viewing-deleted-git-content/). From a1b4acc98c3cee83198adb79937483c595305f1c Mon Sep 17 00:00:00 2001 From: dscho Date: Wed, 19 Aug 2015 12:12:22 +0200 Subject: [PATCH 0017/2849] Rev News: Git for Windows was released --- rev_news/drafts/edition-7.md | 1 + 1 file changed, 1 insertion(+) diff --git a/rev_news/drafts/edition-7.md b/rev_news/drafts/edition-7.md index 80bda19f86..9ddcb7dcab 100644 --- a/rev_news/drafts/edition-7.md +++ b/rev_news/drafts/edition-7.md @@ -31,6 +31,7 @@ This edition covers what happened during the month of July 2015. ## Releases +* Git for Windows 2.5.0 [was released](http://article.gmane.org/gmane.comp.version-control.msysgit/21805). It is the first release based on Git 2.x, the first release based on [MSys2](https://msys.github.io/) and the first release dropping the *-preview* suffix. ## Other News From ce494fb0b422d5cbb4c6df4b1d8d27276e18b904 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Mon, 31 Aug 2015 21:19:28 +0200 Subject: [PATCH 0018/2849] rn-7: setup publication date to September 9th --- rev_news/drafts/edition-7.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rev_news/drafts/edition-7.md b/rev_news/drafts/edition-7.md index 9ddcb7dcab..a39f36f6f7 100644 --- a/rev_news/drafts/edition-7.md +++ b/rev_news/drafts/edition-7.md @@ -1,19 +1,19 @@ --- -title: Git Rev News Edition 7 (XXX, 2015) +title: Git Rev News Edition 7 (September 9th, 2015) layout: default -date: 2015-07-08 21:06:51 +0100 +date: 2015-09-09 21:06:51 +0100 author: chriscool categories: [news] navbar: false --- -## Git Rev News: Edition 7 (XXX, 2015) +## Git Rev News: Edition 7 (September 9th, 2015) Welcome to the 7th edition of [Git Rev News](http://git.github.io/rev_news/rev_news.html), a digest of all things Git. For our goals, the archives, the way we work, and how to contribute or to subscribe, see [the Git Rev News page](http://git.github.io/rev_news/rev_news.html) on [git.github.io](http://git.github.io). -This edition covers what happened during the month of July 2015. +This edition covers what happened during the month of August 2015. ## Discussions From 6c846dbafcc95f22467701ea74c72c302298ea42 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Thu, 3 Sep 2015 19:35:13 +0200 Subject: [PATCH 0019/2849] rn-7: add review article about zip64 --- rev_news/drafts/edition-7.md | 40 ++++++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/rev_news/drafts/edition-7.md b/rev_news/drafts/edition-7.md index a39f36f6f7..f9f477d017 100644 --- a/rev_news/drafts/edition-7.md +++ b/rev_news/drafts/edition-7.md @@ -21,9 +21,45 @@ This edition covers what happened during the month of August 2015. ### General --> - + +* [t5004: test ZIP archives with many entries](http://thread.gmane.org/gmane.comp.version-control.git/275682/focus=276393) + +Johannes Schauer reported that git-archive does not use the zip64 +extension and therefore is unable to properly create zip archives with +more than 16k entries. + +René Scharfe agreed that there is a problem. It comes from the fact +that without the zip64 extension, the zip field for the number of +entries has only two bytes. The limit is then 65535 entries. + +René then sent a patch series to add tests for this problem and then +fix it. The first patch contains the following code, which tests that +a suitable `zipinfo` command is available on the current machine, and +sets the ZIPINFO prerequesite if this is the case: + +``` ++ZIPINFO=zipinfo ++ ++test_lazy_prereq ZIPINFO ' ++ n=$("$ZIPINFO" "$TEST_DIRECTORY"/t5004/empty.zip | sed -n "2s/.* //p") ++ test "x$n" = "x0" ++' +``` + +Eric Sunshine replied that unfortunately the above would work neither +on MacOS X where the `zipinfo` output is different, nor on FreeBSD +where `zipinfo` has been removed in favor of `unzip -Z`. + +Eric then discussed in details the possibility of using `unzip -Z` +instead of `zipinfo` to have a portable test, but it appears that this +doesn't work well on files using the zip64 extension on MacOS X and +FreeBSD . + +After further discussing this, Eric, René and Junio agreed that it was +good enough that the patch and the above `zipinfo` check work on Linux +as we don't need to test the archive generated by `git archive` on +every platform. From 9b89d16660fff085685abd4673e4343043f4635c Mon Sep 17 00:00:00 2001 From: Matthieu Moy Date: Fri, 4 Sep 2015 19:47:35 +0200 Subject: [PATCH 0022/2849] first draft of text for GSoC wrap up. This should eventually become a blog post on http://google-opensource.blogspot.fr/. --- rev_news/drafts/edition-7.md | 113 +++++++++++++++++++++++++++++++++++ 1 file changed, 113 insertions(+) diff --git a/rev_news/drafts/edition-7.md b/rev_news/drafts/edition-7.md index f9f477d017..746a531431 100644 --- a/rev_news/drafts/edition-7.md +++ b/rev_news/drafts/edition-7.md @@ -21,6 +21,119 @@ This edition covers what happened during the month of August 2015. ### General --> +### Google Summer of code Wrap Up + +Both of the Git project Google Summer of Code students, Paul Tan and +Karthik Nayak have passed the final evaluation. + + + +#### Projects in 2015 + +##### Unification of `git for-each-ref`, `git branch` and `git tag` + +**Student:** [Karthik Nayak](http://karthiknayak.github.io/), + mentored by Christian Couder and Matthieu Moy. + +With Git, branches and tags are references to a state in history. +Internally, a branch is almost the same as a tag, and both are +particular cases of the concept of references, or "ref" for short. +Still, because the use-cases are different, we had two commands with +different user-interfaces, and different implementations, plus the +command `git for-each-ref` meant to be more flexible and easier to use +in scripts. + +A lot of code was moved from the user-interface part of the code to +the core library of Git, and duplicated ref-listing and formatting +code was refactored. + +A nice side effect for the user is that features that were available +on one command but not another are now available everywhere. For +example, we had `git for-each-ref --format` but no `git branch +--format`, and had `git branch --contains` but not `git for-each-ref +--contains`. + +The biggest contribution is of course that we reduced the code +duplication and made the code internally better. + +##### Port `git am` and `git pull` from shell-script to C + +**Student:** [Paul Tan](https://github.com/pyokagan), mentored by +Stefan Beller and Johannes Schindelin. + +Git was initially implemented as a set of C commands for the core, and +a set of shell-script to provide a user-friendly interface. While +implementing some commands in shell allowed a quick prototyping, the +presence of shell-scripts raises a lot of issues. One is performance: +shell-scripts tend to create a lot of processes, and often manipulate +a lot of temporary files. Another one is portability, especially on +Windows. + +Many Git commands written as shell-scripts were later re-written as +builtin C commands. You can still see some of the initial scripts in the +[contrib/examples](https://github.com/git/git/tree/master/contrib/examples) +directory of Git's source tree. + +The second project was to port `git am` and `git pull` in C. One +difficulty is that Git has strong requirements on +backward-compatibility. + +Both commands have been completely ported, and the result merged to +the master branch. + +#### Retrospective + +Both projects were really successful (and obviously the students +"passed" in the GSoC jargon). One thing we're happy about is that for +one project, the code is already completely reviewed and merged, and +for the other the reviewing process is almost over (and the student +remains active after the pens down date). This means that the GSoC did +not just bring us initial implementations, but solid, and +well-reviewed patches. The Git codebase is better after the GSoC than +before from the maintainability point of view. + +Interestingly, both projects were essentially internal refactoring ones +(the one I mentored last year was, too). Nothing really impressive for +the end-user, but in both cases a substantial contribution to Git's +maintainability. + +I'm positively surprised that students chose these topics. They are not +the best subjects to show off with your friends ("see this new command +you love so much, *I* implemented it!"), but are necessary work to make +the codebase healthier. + +Not all our past experiences were success. We had failed GSoC for very +promising students, or projects that we considered as "pass" from the +GSoC point of view, but producing code that were never merged or +merged far later after substantial work from the mentor. We actually +took a break from GSoC and did not participate in 2013 because we +thought we were not good enough at mentoring and integrating students +at that time. + +This year, we had long private discussions during the selection period +of the GSoC: refactoring projects like these ones have relatively high +risk. The "Wow" effect when it works is not so high, but the "Uh oh" +effect if it breaks is. + +Reading the students proposals and resume is rarely sufficient to +really evaluate their skills, which makes the risk particularly hard +to evaluate. Since 2014, we've been using +[microprojects](http://git.github.io/SoC-2015-Microprojects.html) to +select students. This turned out to be very efficient, both at +identifying good (or bad) applicants, but also at giving students a +glimpse of what "contributing to Git" means. Student get an idea of +how the community is organized before starting the project. + +We're now happy we took the risk. We've gained a bunch of useful +changes to Git. We've had lively discussions with students and had fun +doing it. And hopefully, these student now feel part of the community +and the fun will continue long after the GSoC :-). + ### Reviews * [t5004: test ZIP archives with many entries](http://thread.gmane.org/gmane.comp.version-control.git/275682/focus=276393) From 51b24211834e523f6ee2ef7f7a28418d73c7d70a Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Sat, 5 Sep 2015 17:27:37 +0200 Subject: [PATCH 0023/2849] rn-7: credit Matthieu --- rev_news/drafts/edition-7.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rev_news/drafts/edition-7.md b/rev_news/drafts/edition-7.md index 68edec2097..cf8f25e170 100644 --- a/rev_news/drafts/edition-7.md +++ b/rev_news/drafts/edition-7.md @@ -21,7 +21,7 @@ This edition covers what happened during the month of August 2015. ### General --> -### Google Summer of code Wrap Up +### Google Summer of code Wrap Up (*written by Matthieu Moy*) Both of the Git project Google Summer of Code students, Paul Tan and Karthik Nayak have passed the final evaluation. @@ -237,4 +237,4 @@ __Git tools and sites__ This edition of Git Rev News was curated by Christian Couder <>, Thomas Ferris Nicolaisen <> and Nicola Paolucci <>, -with help from XXX. +with help from Matthieu Moy. From 557a90d398cd78ff9dc4046552880f83c631191f Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Sat, 5 Sep 2015 22:30:57 +0200 Subject: [PATCH 0024/2849] rn-7: add review about lmdb ref backend --- rev_news/drafts/edition-7.md | 63 ++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/rev_news/drafts/edition-7.md b/rev_news/drafts/edition-7.md index cf8f25e170..fd6873d328 100644 --- a/rev_news/drafts/edition-7.md +++ b/rev_news/drafts/edition-7.md @@ -136,6 +136,69 @@ and the fun will continue long after the GSoC :-). ### Reviews +* [refs lmdb backend](http://thread.gmane.org/gmane.comp.version-control.git/277138) + +Last June, David Turner, who is working for Twitter, sent to the list a message titled +"[RFC/Pull Request: Refs db backend](http://thread.gmane.org/gmane.comp.version-control.git/272438)" +that started with: + +> I've revived and modified Ronnie Sahlberg's work on the refs db backend. + +Ronnie Sahlberg, working for Google, had sent last year some emails about +[an experimental TDB backend](http://thread.gmane.org/gmane.comp.version-control.git/252582/) and +[pluggable backends](http://thread.gmane.org/gmane.comp.version-control.git/254829/) +he had developed to store git refs. Unfortunately his work was too experimental and had not been merged. + +This is interesting work because Git gets slower when the number of +refs in a repositories is getting really big, as its packed-refs +backend is file based and had not been designed to handle a huge +number of refs. That's why a lot of prominent Git developers, like +Jeff King, Shawn Pearce, Michael Haggerty, Stefan Beller, Duy Nguyen +and Junio Hamano were interested by David's announcement last June and +some details it contained like: + +> The db backend runs git for-each-ref about 30% faster than the files +> backend with fully-packed refs on a repo with ~120k refs. It's also +> about 4x faster than using fully-unpacked refs. In addition, and +> perhaps more importantly, it avoids case-conflict issues on OS X. + +One difference between Ronnie's and David's work is that David chose +LMDB instead of TDB for the new database backend. David explained that +with: + +> The advantage of tdb is that it's smaller (~125k). The disadvantages are +> that tdb is hard to build on OS X. It's also not in homebrew. So lmdb +> seemed simpler. + +Since June, David, helped by many reviewers like Eric Sunshine, Johan +Herland, Michael Haggerty, Jacob Keller, Duy Nguyen, Stefan Beller, +Johannes Sixt, Philip Oakley and Junio has worked on many related +improvements, that are very helpful to advance this topic. That's why +[the last version of his patch series](http://thread.gmane.org/gmane.comp.version-control.git/277138) +contains the following: + +> This series depends on at least the following topics in pu: +> dt/refs-bisection +> dt/refs-pseudo +> dt/reflog-tests +> kn/for-each-tag (...) + +It also contains the following interesting bits: + +> Also, now per-worktree refs live in the filesystem. + +(...) + +> As Michael Haggerty suggested, I'm now using struct ref_transaction as +> a base struct for the ref transaction structs. + +This shows that David's series is using very recent improvements by +other developers in the Git codebase. + +Hopefully, we can expect that, with those new ref backends, users will +be able to benefit soon from a huge amount of ground work that has +been done during the last few years. + * [t5004: test ZIP archives with many entries](http://thread.gmane.org/gmane.comp.version-control.git/275682/focus=276393) Johannes Schauer reported that git-archive does not use the zip64 From bff3503319ddab7f713de1f17f8427ad3c4f0c67 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Sun, 6 Sep 2015 18:25:41 +0200 Subject: [PATCH 0025/2849] Mention 2.5.1 releases and fix tyop in MSys2 link --- rev_news/drafts/edition-7.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/rev_news/drafts/edition-7.md b/rev_news/drafts/edition-7.md index fd6873d328..ebb2d1aa42 100644 --- a/rev_news/drafts/edition-7.md +++ b/rev_news/drafts/edition-7.md @@ -274,7 +274,9 @@ to migrate Perforce repos that contains big files. ## Releases -* Git for Windows 2.5.0 [was released](http://article.gmane.org/gmane.comp.version-control.msysgit/21805). It is the first release based on Git 2.x, the first release based on [MSys2](https://msys.github.io/) and the first release dropping the *-preview* suffix. +* Git for Windows 2.5.0 [was released](http://article.gmane.org/gmane.comp.version-control.msysgit/21805). It is the first release based on Git 2.x, the first release based on [MSys2](https://msys2.github.io/) and the first release dropping the *-preview* suffix. +* Git 2.5.1 [was released](http://thread.gmane.org/gmane.linux.kernel/2028843). +* Git for Windows 2.5.1 [was released soon after that](http://article.gmane.org/gmane.comp.version-control.git/276857). ## Other News From 40e3b9f46ce7168db73e9ccf45c7040dcdc1e72e Mon Sep 17 00:00:00 2001 From: Matthieu Moy Date: Mon, 7 Sep 2015 14:40:44 +0200 Subject: [PATCH 0026/2849] Rev News 7: git-multimail 1.2 alpha 1 --- rev_news/drafts/edition-7.md | 1 + 1 file changed, 1 insertion(+) diff --git a/rev_news/drafts/edition-7.md b/rev_news/drafts/edition-7.md index ebb2d1aa42..682ac4fa8e 100644 --- a/rev_news/drafts/edition-7.md +++ b/rev_news/drafts/edition-7.md @@ -277,6 +277,7 @@ to migrate Perforce repos that contains big files. * Git for Windows 2.5.0 [was released](http://article.gmane.org/gmane.comp.version-control.msysgit/21805). It is the first release based on Git 2.x, the first release based on [MSys2](https://msys2.github.io/) and the first release dropping the *-preview* suffix. * Git 2.5.1 [was released](http://thread.gmane.org/gmane.linux.kernel/2028843). * Git for Windows 2.5.1 [was released soon after that](http://article.gmane.org/gmane.comp.version-control.git/276857). +* git-multimail [1.2 Alpha 1 was released](https://github.com/git-multimail/git-multimail/releases/tag/1.2.a1). Please, report bugs and give feedback on new features before the final release. ## Other News From f4b130bf40050f71f8a10e7b384866953ecd115a Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Mon, 7 Sep 2015 15:24:27 +0200 Subject: [PATCH 0027/2849] rn-7: credit Dscho --- rev_news/drafts/edition-7.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rev_news/drafts/edition-7.md b/rev_news/drafts/edition-7.md index 682ac4fa8e..fa11282906 100644 --- a/rev_news/drafts/edition-7.md +++ b/rev_news/drafts/edition-7.md @@ -303,4 +303,4 @@ __Git tools and sites__ This edition of Git Rev News was curated by Christian Couder <>, Thomas Ferris Nicolaisen <> and Nicola Paolucci <>, -with help from Matthieu Moy. +with help from Matthieu Moy and Johannes Schindelin. From 7ef72c62b1b61bef0e8e1d2e2020c24c8f85bf77 Mon Sep 17 00:00:00 2001 From: Thomas Ferris Nicolaisen Date: Mon, 7 Sep 2015 21:54:16 +0200 Subject: [PATCH 0028/2849] rn: do not show date above every post Since we already include the date in each edition's title, we don't have to repeat the date in the meta section. --- _includes/news_item.html | 5 ----- 1 file changed, 5 deletions(-) diff --git a/_includes/news_item.html b/_includes/news_item.html index b5d4770f7d..a4ff6becb9 100644 --- a/_includes/news_item.html +++ b/_includes/news_item.html @@ -4,11 +4,6 @@

{{ post.title }}

-
- - {{ post.date | date_to_string }} - -
{{ post.content }}
From 2de0aa4c542167bc344a222645a0b790eeaece56 Mon Sep 17 00:00:00 2001 From: Thomas Ferris Nicolaisen Date: Mon, 7 Sep 2015 21:58:00 +0200 Subject: [PATCH 0029/2849] rn: tidy up page organization - Show only the latest edition on the main RN page - Move the archive to a dedicated page --- rev_news/archive.md | 15 +++++++++++++++ rev_news/index.md | 12 +----------- rev_news/rev_news.md | 2 +- 3 files changed, 17 insertions(+), 12 deletions(-) create mode 100644 rev_news/archive.md diff --git a/rev_news/archive.md b/rev_news/archive.md new file mode 100644 index 0000000000..8a29e4082b --- /dev/null +++ b/rev_news/archive.md @@ -0,0 +1,15 @@ +--- +layout: default +title: Git Rev News Archive +--- + +Here you can see all the previous editions. See [About Git Rev News](/rev_news/rev_news.html) for ways you can subscribe. + + + diff --git a/rev_news/index.md b/rev_news/index.md index 709c91a39c..12b9af5597 100644 --- a/rev_news/index.md +++ b/rev_news/index.md @@ -1,18 +1,8 @@ --- layout: default -title: Git Rev News Archive +title: Git Rev News --- -Here you can see all the previous editions. See [Git Rev News](/rev_news/rev_news.html) for ways you can subscribe. - - - # Latest edition {% for post in site.posts limit:1 %} {% include news_item.html %} diff --git a/rev_news/rev_news.md b/rev_news/rev_news.md index c29250b7d4..b0c9aab7a7 100644 --- a/rev_news/rev_news.md +++ b/rev_news/rev_news.md @@ -1,6 +1,6 @@ --- layout: default -title: Git Rev News +title: About Git Rev News --- # About Git Rev News From cbfd2810ba4a57bdcf49c9ba56c739a5e89bd621 Mon Sep 17 00:00:00 2001 From: Thomas Ferris Nicolaisen Date: Mon, 7 Sep 2015 22:17:46 +0200 Subject: [PATCH 0030/2849] rn: headers on every page Some pages were missing their headers. --- rev_news/archive.md | 2 ++ rev_news/index.md | 1 + rev_news/news_sources.md | 2 ++ 3 files changed, 5 insertions(+) diff --git a/rev_news/archive.md b/rev_news/archive.md index 8a29e4082b..fe79c47ede 100644 --- a/rev_news/archive.md +++ b/rev_news/archive.md @@ -3,6 +3,8 @@ layout: default title: Git Rev News Archive --- +# Archive + Here you can see all the previous editions. See [About Git Rev News](/rev_news/rev_news.html) for ways you can subscribe.