git@vger.kernel.org mailing list mirror (one of many)
 help / Atom feed
* [PATCH] Fix a typo in line 117 of git-gui/lib/sshkeys.tcl.
       [not found] <n>
@ 2011-10-30 17:18 ` Dejan Ribič
  2011-10-30 23:57   ` Erik Faye-Lund
  2017-10-11 18:06 ` [PATCH 1/1] git-stash.txt: correct "git stash" behavior with no arguments Takahito Ogawa
                   ` (2 subsequent siblings)
  3 siblings, 1 reply; 13+ messages in thread
From: Dejan Ribič @ 2011-10-30 17:18 UTC (permalink / raw)
  To: Git ML; +Cc: Dejan Ribič

"succeded" changed to "succeeded".

Reference Launchpad bug #879427.

modified:   git-gui/lib/sshkey.tcl

Signed-off-by: Dejan Ribič <dejan.ribic@gmail.com>
---
 git-gui/lib/sshkey.tcl |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/git-gui/lib/sshkey.tcl b/git-gui/lib/sshkey.tcl
index 5f75bc9..aa6457b 100644
--- a/git-gui/lib/sshkey.tcl
+++ b/git-gui/lib/sshkey.tcl
@@ -117,7 +117,7 @@ proc read_sshkey_output {fd w} {
 	} else {
 		set finfo [find_ssh_key]
 		if {$finfo eq {}} {
-			set sshkey_title [mc "Generation succeded, but no keys found."]
+			set sshkey_title [mc "Generation succeeded, but no keys found."]
 			$w.contents insert end $sshkey_output
 		} else {
 			set sshkey_title [mc "Your key is in: %s" [lindex $finfo 0]]
-- 
1.7.5.4

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PATCH] Fix a typo in line 117 of git-gui/lib/sshkeys.tcl.
  2011-10-30 17:18 ` [PATCH] Fix a typo in line 117 of git-gui/lib/sshkeys.tcl Dejan Ribič
@ 2011-10-30 23:57   ` Erik Faye-Lund
  2011-10-31  8:56     ` Pat Thoyts
  0 siblings, 1 reply; 13+ messages in thread
From: Erik Faye-Lund @ 2011-10-30 23:57 UTC (permalink / raw)
  To: Dejan Ribič; +Cc: Git ML

Thanks for re-posting inline and with a sign-off. But there's still a
few minor nits:

2011/10/30 Dejan Ribič <dejan.ribic@gmail.com>:
> "succeded" changed to "succeeded".

We write commit messages in imperative mood, so this should be
something like 'change "succeded" to "succeeded"' instead. This is
documented in Documentation/SubmittingPatches.

> modified:   git-gui/lib/sshkey.tcl

We don't normally include a list of changed files in the commit
message; the diffstat already provides that information.

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PATCH] Fix a typo in line 117 of git-gui/lib/sshkeys.tcl.
  2011-10-30 23:57   ` Erik Faye-Lund
@ 2011-10-31  8:56     ` Pat Thoyts
  0 siblings, 0 replies; 13+ messages in thread
From: Pat Thoyts @ 2011-10-31  8:56 UTC (permalink / raw)
  To: kusmabite; +Cc: Dejan Ribič, Git ML

Erik Faye-Lund <kusmabite@gmail.com> writes:

>Thanks for re-posting inline and with a sign-off. But there's still a
>few minor nits:
>
>2011/10/30 Dejan Ribič <dejan.ribic@gmail.com>:
>> "succeded" changed to "succeeded".
>
>We write commit messages in imperative mood, so this should be
>something like 'change "succeded" to "succeeded"' instead. This is
>documented in Documentation/SubmittingPatches.
>
>> modified:   git-gui/lib/sshkey.tcl
>
>We don't normally include a list of changed files in the commit
>message; the diffstat already provides that information.
>

The change is fine so I've applied this to the git-gui repository with a
fixed commit message. Thank you.

git-gui is hosted separately and merged into git-core at intervals so
the development version of git-gui is in fact hosted at 
git://repo.or.cz/git-gui.git although patches against the git-core
version seldom pose a problem to apply and are gratefully received.
(git am -p2 usually fixes them).

-- 
Pat Thoyts                            http://www.patthoyts.tk/
PGP fingerprint 2C 6E 98 07 2C 59 C8 97  10 CE 11 E6 04 E0 B9 DD

^ permalink raw reply	[flat|nested] 13+ messages in thread

* [PATCH 1/1] git-stash.txt: correct "git stash" behavior with no arguments
       [not found] <y>
@ 2017-10-11 18:03 ` Takahito Ogawa
  2017-10-12  0:53   ` Junio C Hamano
  0 siblings, 1 reply; 13+ messages in thread
From: Takahito Ogawa @ 2017-10-11 18:03 UTC (permalink / raw)
  To: git; +Cc: Takahito Ogawa

"git stash" behavior without any arguments was changed in
1ada5020b ("stash: use stash_push for no verb form", 2017-02-28).
This is equivalent to "git stash push" but document says
"git stash save".

Correct it.

Signed-off-by: Takahito Ogawa <takahito.ogawa@datagrid.co.jp>
---
 Documentation/git-stash.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt
index 00f95fee1..63642c145 100644
--- a/Documentation/git-stash.txt
+++ b/Documentation/git-stash.txt
@@ -33,7 +33,7 @@ and reverts the working directory to match the `HEAD` commit.
 The modifications stashed away by this command can be listed with
 `git stash list`, inspected with `git stash show`, and restored
 (potentially on top of a different commit) with `git stash apply`.
-Calling `git stash` without any arguments is equivalent to `git stash save`.
+Calling `git stash` without any arguments is equivalent to `git stash push`.
 A stash is by default listed as "WIP on 'branchname' ...", but
 you can give a more descriptive message on the command line when
 you create one.
-- 
2.13.1


^ permalink raw reply	[flat|nested] 13+ messages in thread

* [PATCH 1/1] git-stash.txt: correct "git stash" behavior with no arguments
       [not found] <n>
  2011-10-30 17:18 ` [PATCH] Fix a typo in line 117 of git-gui/lib/sshkeys.tcl Dejan Ribič
@ 2017-10-11 18:06 ` Takahito Ogawa
  2017-10-11 18:37 ` Takahito Ogawa
  2017-10-11 20:01 ` Takahito Ogawa
  3 siblings, 0 replies; 13+ messages in thread
From: Takahito Ogawa @ 2017-10-11 18:06 UTC (permalink / raw)
  To: git; +Cc: Takahito Ogawa

"git stash" behavior without any arguments was changed in
1ada5020b ("stash: use stash_push for no verb form", 2017-02-28).
This is equivalent to "git stash push" but document says
"git stash save".

Correct it.

Signed-off-by: Takahito Ogawa <takahito.ogawa@datagrid.co.jp>
---
 Documentation/git-stash.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt
index 00f95fee1..63642c145 100644
--- a/Documentation/git-stash.txt
+++ b/Documentation/git-stash.txt
@@ -33,7 +33,7 @@ and reverts the working directory to match the `HEAD` commit.
 The modifications stashed away by this command can be listed with
 `git stash list`, inspected with `git stash show`, and restored
 (potentially on top of a different commit) with `git stash apply`.
-Calling `git stash` without any arguments is equivalent to `git stash save`.
+Calling `git stash` without any arguments is equivalent to `git stash push`.
 A stash is by default listed as "WIP on 'branchname' ...", but
 you can give a more descriptive message on the command line when
 you create one.
-- 
2.13.1


^ permalink raw reply	[flat|nested] 13+ messages in thread

* [PATCH 1/1] git-stash.txt: correct "git stash" behavior with no arguments
       [not found] <n>
  2011-10-30 17:18 ` [PATCH] Fix a typo in line 117 of git-gui/lib/sshkeys.tcl Dejan Ribič
  2017-10-11 18:06 ` [PATCH 1/1] git-stash.txt: correct "git stash" behavior with no arguments Takahito Ogawa
@ 2017-10-11 18:37 ` Takahito Ogawa
  2017-10-11 19:09   ` Thomas Gummerer
  2017-10-11 20:01 ` Takahito Ogawa
  3 siblings, 1 reply; 13+ messages in thread
From: Takahito Ogawa @ 2017-10-11 18:37 UTC (permalink / raw)
  To: git; +Cc: Takahito Ogawa

"git stash" behavior without any arguments was changed in
1ada5020b ("stash: use stash_push for no verb form", 2017-02-28).
This is equivalent to "git stash push" but documents says
"git stash save".

Correct it.

Signed-off-by: Takahito Ogawa <aiueogawa217@gmail.com>
---
 Documentation/git-stash.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt
index 00f95fee1..63642c145 100644
--- a/Documentation/git-stash.txt
+++ b/Documentation/git-stash.txt
@@ -33,7 +33,7 @@ and reverts the working directory to match the `HEAD` commit.
 The modifications stashed away by this command can be listed with
 `git stash list`, inspected with `git stash show`, and restored
 (potentially on top of a different commit) with `git stash apply`.
-Calling `git stash` without any arguments is equivalent to `git stash save`.
+Calling `git stash` without any arguments is equivalent to `git stash push`.
 A stash is by default listed as "WIP on 'branchname' ...", but
 you can give a more descriptive message on the command line when
 you create one.
-- 
2.13.1


^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PATCH 1/1] git-stash.txt: correct "git stash" behavior with no arguments
  2017-10-11 18:37 ` Takahito Ogawa
@ 2017-10-11 19:09   ` Thomas Gummerer
  2017-10-11 19:12     ` Thomas Gummerer
  0 siblings, 1 reply; 13+ messages in thread
From: Thomas Gummerer @ 2017-10-11 19:09 UTC (permalink / raw)
  To: Takahito Ogawa; +Cc: git

On 10/12, Takahito Ogawa wrote:
> "git stash" behavior without any arguments was changed in
> 1ada5020b ("stash: use stash_push for no verb form", 2017-02-28).
> This is equivalent to "git stash push" but documents says
> "git stash save".
> 
> Correct it.

Thanks for fixing this!  I recently sent a patch that would advertise
git stash push more in general, which would also fix this occurrence [1], 
but it didn't seem like it got much interest.  However this is
obviously correct, and should definitely be fixed, while the other
places can still mention 'git stash save'.

For what it's worth this is

Reviewed-by: Thomas Gummerer <t.gummerer@gmail.com>


> Signed-off-by: Takahito Ogawa <aiueogawa217@gmail.com>
> ---
>  Documentation/git-stash.txt | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt
> index 00f95fee1..63642c145 100644
> --- a/Documentation/git-stash.txt
> +++ b/Documentation/git-stash.txt
> @@ -33,7 +33,7 @@ and reverts the working directory to match the `HEAD` commit.
>  The modifications stashed away by this command can be listed with
>  `git stash list`, inspected with `git stash show`, and restored
>  (potentially on top of a different commit) with `git stash apply`.
> -Calling `git stash` without any arguments is equivalent to `git stash save`.
> +Calling `git stash` without any arguments is equivalent to `git stash push`.
>  A stash is by default listed as "WIP on 'branchname' ...", but
>  you can give a more descriptive message on the command line when
>  you create one.
> -- 
> 2.13.1
> 

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PATCH 1/1] git-stash.txt: correct "git stash" behavior with no arguments
  2017-10-11 19:09   ` Thomas Gummerer
@ 2017-10-11 19:12     ` Thomas Gummerer
  0 siblings, 0 replies; 13+ messages in thread
From: Thomas Gummerer @ 2017-10-11 19:12 UTC (permalink / raw)
  To: Takahito Ogawa; +Cc: git

On 10/11, Thomas Gummerer wrote:
> On 10/12, Takahito Ogawa wrote:
> > "git stash" behavior without any arguments was changed in
> > 1ada5020b ("stash: use stash_push for no verb form", 2017-02-28).
> > This is equivalent to "git stash push" but documents says
> > "git stash save".
> > 
> > Correct it.
> 
> Thanks for fixing this!  I recently sent a patch that would advertise
> git stash push more in general, which would also fix this occurrence [1], 
> but it didn't seem like it got much interest.  However this is
> obviously correct, and should definitely be fixed, while the other
> places can still mention 'git stash save'.
> 
> For what it's worth this is
> 
> Reviewed-by: Thomas Gummerer <t.gummerer@gmail.com>

And I forgot to include the link, sorry.  Here it is:

[1]: https://public-inbox.org/git/20171005200049.GF30301@hank/

> 
> > Signed-off-by: Takahito Ogawa <aiueogawa217@gmail.com>
> > ---
> >  Documentation/git-stash.txt | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt
> > index 00f95fee1..63642c145 100644
> > --- a/Documentation/git-stash.txt
> > +++ b/Documentation/git-stash.txt
> > @@ -33,7 +33,7 @@ and reverts the working directory to match the `HEAD` commit.
> >  The modifications stashed away by this command can be listed with
> >  `git stash list`, inspected with `git stash show`, and restored
> >  (potentially on top of a different commit) with `git stash apply`.
> > -Calling `git stash` without any arguments is equivalent to `git stash save`.
> > +Calling `git stash` without any arguments is equivalent to `git stash push`.
> >  A stash is by default listed as "WIP on 'branchname' ...", but
> >  you can give a more descriptive message on the command line when
> >  you create one.
> > -- 
> > 2.13.1
> > 

^ permalink raw reply	[flat|nested] 13+ messages in thread

* [PATCH 1/1] git-stash.txt: correct "git stash" behavior with no arguments
       [not found] <n>
                   ` (2 preceding siblings ...)
  2017-10-11 18:37 ` Takahito Ogawa
@ 2017-10-11 20:01 ` Takahito Ogawa
  3 siblings, 0 replies; 13+ messages in thread
From: Takahito Ogawa @ 2017-10-11 20:01 UTC (permalink / raw)
  To: gitster; +Cc: git, Takahito Ogawa

"git stash" behavior without any arguments was changed in
1ada5020b ("stash: use stash_push for no verb form", 2017-02-28).
This is equivalent to "git stash push" but documents says
"git stash save".

Correct it.

Reviewed-by: Thomas Gummerer <t.gummerer@gmail.com>
Signed-off-by: Takahito Ogawa <aiueogawa217@gmail.com>
---
 Documentation/git-stash.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt
index 00f95fee1..63642c145 100644
--- a/Documentation/git-stash.txt
+++ b/Documentation/git-stash.txt
@@ -33,7 +33,7 @@ and reverts the working directory to match the `HEAD` commit.
 The modifications stashed away by this command can be listed with
 `git stash list`, inspected with `git stash show`, and restored
 (potentially on top of a different commit) with `git stash apply`.
-Calling `git stash` without any arguments is equivalent to `git stash save`.
+Calling `git stash` without any arguments is equivalent to `git stash push`.
 A stash is by default listed as "WIP on 'branchname' ...", but
 you can give a more descriptive message on the command line when
 you create one.
-- 
2.13.1


^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PATCH 1/1] git-stash.txt: correct "git stash" behavior with no arguments
  2017-10-11 18:03 ` Takahito Ogawa
@ 2017-10-12  0:53   ` Junio C Hamano
       [not found]     ` <CAC2Jkr+ZDUxd9JcKvVwZqCHVW+Bpp2CbdyehwgKV_Ru-Uqxo8A@mail.gmail.com>
  0 siblings, 1 reply; 13+ messages in thread
From: Junio C Hamano @ 2017-10-12  0:53 UTC (permalink / raw)
  To: Takahito Ogawa; +Cc: git, Takahito Ogawa

Takahito Ogawa <aiueogawa217@gmail.com> writes:

> @@ -33,7 +33,7 @@ and reverts the working directory to match the `HEAD` commit.
>  The modifications stashed away by this command can be listed with
>  `git stash list`, inspected with `git stash show`, and restored
>  (potentially on top of a different commit) with `git stash apply`.
> -Calling `git stash` without any arguments is equivalent to `git stash save`.
> +Calling `git stash` without any arguments is equivalent to `git stash push`.

Hmph.  Is there any difference between

	git stash save
	git stash push

without any other argument?  Aren't they equivalent to

	git stash

without any argument, which is what this sentence explains?


^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PATCH 1/1] git-stash.txt: correct "git stash" behavior with no arguments
       [not found]     ` <CAC2Jkr+ZDUxd9JcKvVwZqCHVW+Bpp2CbdyehwgKV_Ru-Uqxo8A@mail.gmail.com>
@ 2017-10-12  3:52       ` 小川恭史
  2017-10-12  3:54         ` 小川恭史
  0 siblings, 1 reply; 13+ messages in thread
From: 小川恭史 @ 2017-10-12  3:52 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: git, Takahito Ogawa

As you point,

    git stash

without any argument is equivalent to both of

    git stash save
    git stash push

. The original sentence is correct.

2017-10-12 12:31 GMT+09:00 小川恭史 <aiueogawa217@gmail.com>:
> As you point,
>
>     git stash
>
> without any argument is equivalent to both of
> git stash save and
>
>
> 2017-10-12 9:53 GMT+09:00 Junio C Hamano <gitster@pobox.com>:
>> Takahito Ogawa <aiueogawa217@gmail.com> writes:
>>
>>> @@ -33,7 +33,7 @@ and reverts the working directory to match the `HEAD`
>>> commit.
>>>  The modifications stashed away by this command can be listed with
>>>  `git stash list`, inspected with `git stash show`, and restored
>>>  (potentially on top of a different commit) with `git stash apply`.
>>> -Calling `git stash` without any arguments is equivalent to `git stash
>>> save`.
>>> +Calling `git stash` without any arguments is equivalent to `git stash
>>> push`.
>>
>> Hmph.  Is there any difference between
>>
>>         git stash save
>>         git stash push
>>
>> without any other argument?  Aren't they equivalent to
>>
>>         git stash
>>
>> without any argument, which is what this sentence explains?
>>
>

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PATCH 1/1] git-stash.txt: correct "git stash" behavior with no arguments
  2017-10-12  3:52       ` 小川恭史
@ 2017-10-12  3:54         ` 小川恭史
  2017-10-12  9:56           ` Junio C Hamano
  0 siblings, 1 reply; 13+ messages in thread
From: 小川恭史 @ 2017-10-12  3:54 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: git, Takahito Ogawa

As you point,

    git stash

without any argument is equivalent to both of

    git stash save
    git stash push

. The original sentence is correct.

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PATCH 1/1] git-stash.txt: correct "git stash" behavior with no arguments
  2017-10-12  3:54         ` 小川恭史
@ 2017-10-12  9:56           ` Junio C Hamano
  0 siblings, 0 replies; 13+ messages in thread
From: Junio C Hamano @ 2017-10-12  9:56 UTC (permalink / raw)
  To: 小川恭史; +Cc: git, Takahito Ogawa

小川恭史 <aiueogawa217@gmail.com> writes:

> As you point,
>
>     git stash
>
> without any argument is equivalent to both of
>
>     git stash save
>     git stash push
>
> . The original sentence is correct.

OK.  

Note that I was merely reacting to "Correct it." in your
justification for the change, which made it sound like 'save' was
incorrect.

As a part of a move to deprecate 'save' and nudge users towards
'push', the change does make sense.  I just wanted to make sure the
change and its motivation are presented with honesty ;-).


^ permalink raw reply	[flat|nested] 13+ messages in thread

end of thread, back to index

Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
     [not found] <n>
2011-10-30 17:18 ` [PATCH] Fix a typo in line 117 of git-gui/lib/sshkeys.tcl Dejan Ribič
2011-10-30 23:57   ` Erik Faye-Lund
2011-10-31  8:56     ` Pat Thoyts
2017-10-11 18:06 ` [PATCH 1/1] git-stash.txt: correct "git stash" behavior with no arguments Takahito Ogawa
2017-10-11 18:37 ` Takahito Ogawa
2017-10-11 19:09   ` Thomas Gummerer
2017-10-11 19:12     ` Thomas Gummerer
2017-10-11 20:01 ` Takahito Ogawa
     [not found] <y>
2017-10-11 18:03 ` Takahito Ogawa
2017-10-12  0:53   ` Junio C Hamano
     [not found]     ` <CAC2Jkr+ZDUxd9JcKvVwZqCHVW+Bpp2CbdyehwgKV_Ru-Uqxo8A@mail.gmail.com>
2017-10-12  3:52       ` 小川恭史
2017-10-12  3:54         ` 小川恭史
2017-10-12  9:56           ` Junio C Hamano

git@vger.kernel.org mailing list mirror (one of many)

Archives are clonable:
	git clone --mirror https://public-inbox.org/git
	git clone --mirror http://ou63pmih66umazou.onion/git
	git clone --mirror http://czquwvybam4bgbro.onion/git
	git clone --mirror http://hjrcffqmbrq6wope.onion/git

Newsgroups are available over NNTP:
	nntp://news.public-inbox.org/inbox.comp.version-control.git
	nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git
	nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git
	nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git
	nntp://news.gmane.org/gmane.comp.version-control.git

 note: .onion URLs require Tor: https://www.torproject.org/
       or Tor2web: https://www.tor2web.org/

AGPL code for this site: git clone https://public-inbox.org/ public-inbox