Re: [PATCH] README.md: format CLI commands with code syntax

2016-05-29 Thread Matthieu Moy
Benjamin Dopplinger writes: > CLI commands which are mentioned in the readme are now formatted with > the Markdown code syntax to make the documentation more readable. > > Signed-off-by: Benjamin Dopplinger > --- > README.md | 10 +- > 1 file changed, 5 insertions(+), 5 deletions(-) Lo

Re: [GSOC Update] Week 2

2016-05-29 Thread Pranit Bauva
On Mon, May 30, 2016 at 11:07 AM, Pranit Bauva wrote: > = SUMMARY == > My public git.git is available here[1]. I regularly keep pushing my work so > anyone interested can track me there. Feel free to participate in the > discussions g

[GSOC Update] Week 2

2016-05-29 Thread Pranit Bauva
= SUMMARY == My public git.git is available here[1]. I regularly keep pushing my work so anyone interested can track me there. Feel free to participate in the discussions going on PRs with my mentors. Your comments are valuable.

Re: Git reset --hard with staged changes

2016-05-29 Thread Yotam Gingold
> On May 24, 2016, at 2:20 AM, Christian Couder > wrote: > > On Mon, May 23, 2016 at 11:16 PM, Junio C Hamano wrote: >> >> >> I am not sure if that is a good addition, though. > > I am not sure either, but at least if something like that is added, > people may complain less. The present doc

[PATCH] README.md: format CLI commands with code syntax

2016-05-29 Thread Benjamin Dopplinger
CLI commands which are mentioned in the readme are now formatted with the Markdown code syntax to make the documentation more readable. Signed-off-by: Benjamin Dopplinger --- README.md | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 2087

Re: [PATCH] git-cherry-pick.txt: correct a small typo

2016-05-29 Thread Junio C Hamano
Pablo Santiago Blum de Aguiar writes: > Most of the document mentions `behavior` instead of the British > variation, `behaviour`. This change makes it consistent. > > Signed-off-by: Pablo Santiago Blum de Aguiar > --- Thanks. This line comes from an ancient 4bee9584 (cherry-pick: add --allow-e

RFC: new git-transplant subcommand for non-interactively moving commits between branches

2016-05-29 Thread Adam Spiers
On Fri, May 27, 2016 at 03:08:11PM +0100, Adam Spiers wrote: > Hi all, > > I finally got around to implementing a new git subcommand which I've > wanted for quite a while. I've called it git-splice. [snipped] > Next steps, and the future > -- > > Obviously, I'd welcome th

Re: [PATCH 1/2] Do not output whitespace on blank lines

2016-05-29 Thread Junio C Hamano
René Scharfe writes: > Am 29.05.2016 um 17:36 schrieb Dave Nicolson: >> --- > > git diff marks context lines (in unified diff format) with a preceding > space character. Your intent is to remove that marker for empty > context lines, right? Why? How much smaller do diffs get by that > (assumin

Re: [PATCH v2 00/22] i18n and test updates

2016-05-29 Thread Junio C Hamano
Vasco Almeida writes: > Às 17:11 de 27-05-2016, Junio C Hamano escreveu: >> Vasco Almeida writes: >> >>> Marks several messages for translation and updates tests to pass under >>> GETTEXT_POISON. Some tests were updated to fit previous i18n marks, others >>> were updated to fit marks made by th

Re: [PATCH v2 1/8] t4051: rewrite, add more tests

2016-05-29 Thread Junio C Hamano
René Scharfe writes: > +commit_and_tag () { > + message=$1 && > + shift && > + git add $@ && Lack of dq around $@ makes me wonder if there is something funny going on (looking at the callers, there isn't, so we'd better quote it to avoid wasting time, I think). > + test_tick &&

Re: [RFC-PATCH v2 1/2] send-email: quote-email populates the fields

2016-05-29 Thread Tom Russello
On 05/28/16 16:35, Matthieu Moy wrote: >> +--quote-email=:: >> +Reply to the given email and automatically populate the "To:", "Cc:" and >> +"In-Reply-To:" fields. > > I think this is a bit too technical for a user documentation. To: and > Cc: is OK, but people need not know about "In-Reply

Re: [RFC/PATCH] pull: set-upstream implementation

2016-05-29 Thread Erwan Mathoniere
On 25/05/2016 20:09, Junio C Hamano wrote: > Erwan Mathoniere writes: >> Difficulties: >> - I can't figure out what remote branch sould be tracked >> in that case: `git pull -u origin :master` > > What does the command do without "-u"? After some research, I think it creates a new bran

[PATCH] git-cherry-pick.txt: correct a small typo

2016-05-29 Thread Pablo Santiago Blum de Aguiar
Most of the document mentions `behavior` instead of the British variation, `behaviour`. This change makes it consistent. Signed-off-by: Pablo Santiago Blum de Aguiar --- Documentation/git-cherry-pick.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-cherry

[PATCH] Documentation: GPG capitalization

2016-05-29 Thread Dave Nicolson
When "GPG" is used in a sentence it is now consistently capitalized. When referring to the binary it is left as "gpg". Signed-off-by: David Nicolson --- Documentation/git-mktag.txt | 2 +- Documentation/git-tag.txt | 2 +- Documentation/git-verify-commit.txt | 4 ++-- 3 files

Re: [WIP-PATCH 0/2] send-email: refactor the email parser loop

2016-05-29 Thread Matthieu Moy
Samuel GROOT writes: > Should we take what Eric suggested (see below) as standard output? > >> Since the headers are already shown after those lines, it's >> redundant to have the entire line. And we could add >> trailers after the headers (with a blank line to delimit): >> >> # existing hea

Re: [WIP-PATCH 1/2] send-email: create email parser subroutine

2016-05-29 Thread Matthieu Moy
Samuel GROOT writes: > So should we merge parse_email and parse_header in one unique > subroutine? At least on the user (i.e. caller of the API) side, one function is probably enough. -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send the line "unsubscribe

Re: [PATCH 1/2] Do not output whitespace on blank lines

2016-05-29 Thread René Scharfe
Am 29.05.2016 um 17:36 schrieb Dave Nicolson: --- git diff marks context lines (in unified diff format) with a preceding space character. Your intent is to remove that marker for empty context lines, right? Why? How much smaller do diffs get by that (assuming output size reduction is one

Re: [WIP-PATCH 0/2] send-email: refactor the email parser loop

2016-05-29 Thread Samuel GROOT
On 05/28/2016 05:04 PM, Matthieu Moy wrote: Eric Wong writes: Samuel GROOT wrote: (mbox) Adding cc: A from line 'Cc: A, One' (mbox) Adding cc: One from line 'Cc: A, One' Though `git send-email` now outputs something like: (mbox) Adding cc: A from line 'Cc: A' (mbox) Addi

Re: [WIP-PATCH 1/2] send-email: create email parser subroutine

2016-05-29 Thread Samuel GROOT
On 05/29/2016 01:33 AM, Eric Wong wrote: Matthieu Moy wrote: Samuel GROOT writes: Parsing and processing in send-email is done in the same loop. To make the code more maintainable, we create two subroutines: - `parse_email` to separate header and body - `parse_header` to retrieve data from

Re: [PATCH 1/2] Do not output whitespace on blank lines

2016-05-29 Thread Thomas Gummerer
On 05/29, Dave Nicolson wrote: > --- The commit message should describe why you think this is a good change. Without the commit message I don't see how this is a improvement. It is also missing your Sign-off (see Documentation/SubmittingPatches section 5). The test changes you sent in Patch 2/2

Re: [PATCH v3 2/3] perf: make the tests work in worktrees

2016-05-29 Thread René Scharfe
Am 13.05.2016 um 15:25 schrieb Johannes Schindelin: > This patch makes perf-lib.sh more robust so that it can run correctly > even inside a worktree. For example, it assumed that $GIT_DIR/objects is > the objects directory (which is not the case for worktrees) and it used > the commondir file verba

[PATCH 1/2] Do not output whitespace on blank lines

2016-05-29 Thread Dave Nicolson
--- diff.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/diff.c b/diff.c index d3734d3..459b36a 100644 --- a/diff.c +++ b/diff.c @@ -471,7 +471,7 @@ static void emit_line_0(struct diff_options *o, const char *set, const char *res has_trailing_carriage_return

[PATCH 2/2] Fix tests

2016-05-29 Thread Dave Nicolson
--- t/lib-diff-alternative.sh| 4 ++-- t/t4029-diff-trailing-space.sh | 2 +- t/t4034-diff-words.sh| 2 +- t/t4051-diff-function-context.sh | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/t/lib-diff-alternative.sh b/t/lib-diff-alternative.sh index 8

Re: [RFC-PATCH v2 2/2] send-email: quote-email quotes the message body

2016-05-29 Thread Tom Russello
On 05/28/16 17:01, Matthieu Moy wrote: >> Currently, `send-email` without `--compose` implies `--annotate`. > > I don't get it. Did you mean s/without/with/? Even if so, this is not > exactly true: "git send-email --compose -1" will open the editor only > for the cover-letter, while adding --annota