Re: [PATCH] Documentation/git-commit: reword the --amend explanation

2013-04-05 Thread Carlos Martín Nieto
On Thu, 2013-04-04 at 10:04 -0700, Junio C Hamano wrote: > Carlos Martín Nieto writes: > > > On Wed, 2013-04-03 at 23:25 +0100, Philip Oakley wrote: > > > >> + Replace the tip of the current branch with a fresh commit. > >> [or updated commit, or new commit, or ...] > > > > Ack, we should lead w

Re: [PATCH] Documentation/git-commit: reword the --amend explanation

2013-04-04 Thread Junio C Hamano
Carlos Martín Nieto writes: > On Wed, 2013-04-03 at 23:25 +0100, Philip Oakley wrote: > >> + Replace the tip of the current branch with a fresh commit. >> [or updated commit, or new commit, or ...] > > Ack, we should lead with the goal, I'd go for the > > "Replace the tip of the current bran

Re: [PATCH] Documentation/git-commit: reword the --amend explanation

2013-04-04 Thread Carlos Martín Nieto
On Wed, 2013-04-03 at 23:25 +0100, Philip Oakley wrote: > Sent: Wednesday, April 03, 2013 9:04 PM > > Junio C Hamano writes: > > > >> Yes, and since then we gained --no-edit option and such, so "editor > >> starts off" also needs to be rethought, no? The original wording > >> with "seeded" may ha

Re: [PATCH] Documentation/git-commit: reword the --amend explanation

2013-04-03 Thread Philip Oakley
Sent: Wednesday, April 03, 2013 9:04 PM Junio C Hamano writes: Yes, and since then we gained --no-edit option and such, so "editor starts off" also needs to be rethought, no? The original wording with "seeded" may have a better chance of survival, I suspect, but still needs some adjustment.

Re: [PATCH] Documentation/git-commit: reword the --amend explanation

2013-04-03 Thread Junio C Hamano
Junio C Hamano writes: > Yes, and since then we gained --no-edit option and such, so "editor > starts off" also needs to be rethought, no? The original wording > with "seeded" may have a better chance of survival, I suspect, but > still needs some adjustment. So here is my attempt. We still ne

Re: [PATCH] Documentation/git-commit: reword the --amend explanation

2013-04-03 Thread Junio C Hamano
Carlos Martín Nieto writes: > The explanation for 'git commit --amend' talks about preparing a tree > object, which shouldn't be how user-facing documentation talks about > commit. > > Reword it to say it works as usual, but replaces the current commit. > --- Sign-off? > The current text is fro

[PATCH] Documentation/git-commit: reword the --amend explanation

2013-04-03 Thread Carlos Martín Nieto
The explanation for 'git commit --amend' talks about preparing a tree object, which shouldn't be how user-facing documentation talks about commit. Reword it to say it works as usual, but replaces the current commit. --- The current text is from 2006, which I guess explains the wording. Document