Re: [RFC/GSoC] Introduction

2016-03-13 Thread Sidhant Sharma
On Monday 14 March 2016 02:49 AM, Kevin Daudt wrote: > On Mon, Mar 14, 2016 at 12:03:33AM +0530, Sidhant Sharma wrote: >> Other than this, I also tried to expand the list of potentially destructive >> commands and updated the list as follows (additions in brackets): >> >> * git rebase [ git pull

Re: [RFC/GSoC] Introduction

2016-03-13 Thread Sidhant Sharma
On Monday 14 March 2016 04:58 AM, Jacob Keller wrote: > On Sun, Mar 13, 2016 at 11:33 AM, Sidhant Sharma > wrote: >> Coincidentally, my approach too is a wrapper around git as you suggest. >> The approach is simple and straight forward, but I wasn't sure if it would be >>

Re: [PATCH v1] git-p4: fix AsciiDoc formatting

2016-03-13 Thread Junio C Hamano
Lars Schneider writes: >> diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt >> index 738cfde..140fc12 100644 >> --- a/Documentation/git-p4.txt >> +++ b/Documentation/git-p4.txt >> @@ -528,7 +528,7 @@ git-p4.largeFileSystem:: >> git config

Re: Graph sloc tool for git repos

2016-03-13 Thread Jeff King
On Sun, Mar 13, 2016 at 10:35:45PM -0400, Jeff King wrote: > Like (this is back on the "we resolved as master" version of my example, > to illustrate how the merge is shown): > > $ git log --first-parent -m --numstat --oneline > 4244c8a resolved > 1 1 file > b9bbaf9 side >

Re: Graph sloc tool for git repos

2016-03-13 Thread Jeff King
On Sat, Mar 12, 2016 at 07:00:26PM +0800, Kai Hendry wrote: > I penned a script to plot SLOC of a git project using GNUplot & I > thought the fastest way to count code fluctuations was via `git show > --numstat`. > > However that requires some awk counting of the lines: >

Re: git-secret - store your private data inside a repository

2016-03-13 Thread Robin H. Johnson
Have you seen the much older pwstore tool? https://github.com/formorer/pwstore It does have some notable features missing from git-secret and similar tools to this day. - Whitelist of trusted keys to detect addition of unexpected keys. - Specify what users/groups have access to any given file

Re: [RFC/GSoC] Introduction

2016-03-13 Thread Jacob Keller
On Sun, Mar 13, 2016 at 11:33 AM, Sidhant Sharma wrote: > Coincidentally, my approach too is a wrapper around git as you suggest. > The approach is simple and straight forward, but I wasn't sure if it would be > accepted on the list, mainly because it may not look

Re: [RFC/GSoC] Introduction

2016-03-13 Thread Kevin Daudt
On Mon, Mar 14, 2016 at 12:03:33AM +0530, Sidhant Sharma wrote: > > > > Other than this, I also tried to expand the list of potentially destructive > commands and updated the list as follows (additions in brackets): > > * git rebase [ git pull --rebase ] > * git reset --hard > * git clean -f >

[PATCH] commit: do not lose SQUASH_MSG contents

2016-03-13 Thread Sven Strickroth
When concluding a conflicted "git merge --squash", the command failed to read SQUASH_MSG that was prepared by "git merge", and showed only the "# Conflicts:" list of conflicted paths. Place the contents from SQUASH_MSG at the beginning, just like we show the commit log skeleton first when

Re: [RFC/GSoC] Introduction

2016-03-13 Thread Sidhant Sharma
On Sunday 13 March 2016 09:20 PM, Lars Schneider wrote: > Hi Sidhant, > > thanks for your interest in the 'Git Beginner' mode topic. I completely > understand your motivation for the topic as your Git learning experience > matches mine. However, please be aware that this is no easy project. The

Re: [PATCH v1] git-p4: fix AsciiDoc formatting

2016-03-13 Thread Lars Schneider
On 01 Mar 2016, at 12:05, larsxschnei...@gmail.com wrote: > From: Lars Schneider > > Noticed-by: Eric Sunshine > Signed-off-by: Lars Schneider > --- > Documentation/git-p4.txt | 2 +- > 1 file changed, 1

Re: [PATCH v2] git-p4: map a P4 user to Git author name and email address

2016-03-13 Thread Lars Schneider
On 02 Mar 2016, at 10:25, Lars Schneider wrote: > >> On 02 Mar 2016, at 06:06, Luke Diamand wrote: >> >> On 1 March 2016 at 19:15, Eric Sunshine wrote: >>> On Tue, Mar 1, 2016 at 5:49 AM, wrote:

Greetings

2016-03-13 Thread Mevrouw Estelle Amadieu
Greetings, I am Mrs Estelle Amadieu, I am 65 years old base in Cote d'Ivoire I write to relate to you of my intention to use my money 2.5 million dollars for charity work in your country. I was married to Late Chrestien Amadieu who was a contractor with the Government of Cote d'Ivoire before

Re: [RFC/GSoC] Introduction

2016-03-13 Thread Lars Schneider
Hi Sidhant, thanks for your interest in the 'Git Beginner' mode topic. I completely understand your motivation for the topic as your Git learning experience matches mine. However, please be aware that this is no easy project. The final implementation might be easy but it will require hard work

git-secret - store your private data inside a repository

2016-03-13 Thread Никита Соболев
There’s a known problem in server configuration and deploying, when you have to store your private data such as: database passwords, application secret-keys, OAuth secret keys and so on, outside of the git repository. Even if this repository is private, it is a security risk to just publish them

Draft of Git Rev News edition 13

2016-03-13 Thread Christian Couder
Hi, A draft of Git Rev News edition 13 is available here: https://github.com/git/git.github.io/blob/master/rev_news/drafts/edition-13.md Everyone is welcome to contribute in any section either by editing the above page on GitHub and sending a pull request, or by commenting on this GitHub