All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] completion: add --graph to log command completion
@ 2008-06-19 21:15 Dan McGee
  2008-06-19 21:58 ` Shawn O. Pearce
  0 siblings, 1 reply; 7+ messages in thread
From: Dan McGee @ 2008-06-19 21:15 UTC (permalink / raw)
  To: spearce; +Cc: git, Dan McGee

Signed-off-by: Dan McGee <dpmcgee@gmail.com>
---
 contrib/completion/git-completion.bash |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 2141b6b..0eb8df0 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -761,6 +761,7 @@ _git_log ()
 			--pretty= --name-status --name-only --raw
 			--not --all
 			--left-right --cherry-pick
+			--graph
 			"
 		return
 		;;
-- 
1.5.6

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

* Re: [PATCH] completion: add --graph to log command completion
  2008-06-19 21:15 [PATCH] completion: add --graph to log command completion Dan McGee
@ 2008-06-19 21:58 ` Shawn O. Pearce
  2008-06-19 22:40   ` Teemu Likonen
  0 siblings, 1 reply; 7+ messages in thread
From: Shawn O. Pearce @ 2008-06-19 21:58 UTC (permalink / raw)
  To: Dan McGee; +Cc: git

Dan McGee <dpmcgee@gmail.com> wrote:
> Signed-off-by: Dan McGee <dpmcgee@gmail.com>

Acked-by: Shawn O. Pearce <spearce@spearce.org>

First change for 1.5.6.1?  With --graph in 1.5.6 we really should
have included this as part of 1.5.6.  Oh well.  1.5.6.1 perhaps
Junio?

> ---
>  contrib/completion/git-completion.bash |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
> index 2141b6b..0eb8df0 100755
> --- a/contrib/completion/git-completion.bash
> +++ b/contrib/completion/git-completion.bash
> @@ -761,6 +761,7 @@ _git_log ()
>  			--pretty= --name-status --name-only --raw
>  			--not --all
>  			--left-right --cherry-pick
> +			--graph
>  			"
>  		return
>  		;;
> -- 
> 1.5.6

-- 
Shawn.

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

* Re: [PATCH] completion: add --graph to log command completion
  2008-06-19 21:58 ` Shawn O. Pearce
@ 2008-06-19 22:40   ` Teemu Likonen
  2008-06-19 22:55     ` Shawn O. Pearce
  0 siblings, 1 reply; 7+ messages in thread
From: Teemu Likonen @ 2008-06-19 22:40 UTC (permalink / raw)
  To: Shawn O. Pearce; +Cc: Dan McGee, git, gitster

Shawn O. Pearce wrote (2008-06-19 17:58 -0400):

> Dan McGee <dpmcgee@gmail.com> wrote:
> > Signed-off-by: Dan McGee <dpmcgee@gmail.com>
> 
> Acked-by: Shawn O. Pearce <spearce@spearce.org>
> 
> First change for 1.5.6.1?  With --graph in 1.5.6 we really should have
> included this as part of 1.5.6.  Oh well.  1.5.6.1 perhaps Junio?

Liked-by: me

I think I have already sent twice a patch with --graph completion. I use
bash completions quite a lot and here's my current additions to "git
log":


---snip---
bash: Add more option completions for 'git log'

Options added: --graph --walk-reflogs --stat --numstat --shortstat
--decorate --diff-filter= --color-words

Signed-off-by: Teemu Likonen <tlikonen@iki.fi>
---
 contrib/completion/git-completion.bash |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 506b40c..e78ca8e 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -761,6 +761,9 @@ _git_log ()
 			--pretty= --name-status --name-only --raw
 			--not --all
 			--left-right --cherry-pick
+			--stat --numstat --shortstat
+			--decorate --diff-filter=
+			--color-words --walk-reflogs --graph
 			"
 		return
 		;;
-- 
1.5.6.2.g3c3a

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

* Re: [PATCH] completion: add --graph to log command completion
  2008-06-19 22:40   ` Teemu Likonen
@ 2008-06-19 22:55     ` Shawn O. Pearce
  2008-06-19 23:06       ` Dan McGee
  2008-06-20  6:31       ` Teemu Likonen
  0 siblings, 2 replies; 7+ messages in thread
From: Shawn O. Pearce @ 2008-06-19 22:55 UTC (permalink / raw)
  To: Teemu Likonen; +Cc: Dan McGee, git, gitster

Teemu Likonen <tlikonen@iki.fi> wrote:
> I think I have already sent twice a patch with --graph completion.

I didn't Ack them because at the time --graph wasn't even in next
yet I think.  Then I got busy and forgot.  And --graph slipped
through into the 1.5.6 release without your bash completion patches.
Sorry.

> ---snip---
> bash: Add more option completions for 'git log'
> 
> Options added: --graph --walk-reflogs --stat --numstat --shortstat
> --decorate --diff-filter= --color-words
> 
> Signed-off-by: Teemu Likonen <tlikonen@iki.fi>
> ---

This conflicts with the patch you are replying to, but it makes
sense to do these options as well.

Acked-by: Shawn O. Pearce <spearce@spearce.org>

assuming the semantic (or merge) conflict on --graph is worked out.
;-)

>  contrib/completion/git-completion.bash |    3 +++
>  1 files changed, 3 insertions(+), 0 deletions(-)
> 
> diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
> index 506b40c..e78ca8e 100755
> --- a/contrib/completion/git-completion.bash
> +++ b/contrib/completion/git-completion.bash
> @@ -761,6 +761,9 @@ _git_log ()
>  			--pretty= --name-status --name-only --raw
>  			--not --all
>  			--left-right --cherry-pick
> +			--stat --numstat --shortstat
> +			--decorate --diff-filter=
> +			--color-words --walk-reflogs --graph
>  			"
>  		return
>  		;;
> -- 
> 1.5.6.2.g3c3a
> 

-- 
Shawn.

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

* Re: [PATCH] completion: add --graph to log command completion
  2008-06-19 22:55     ` Shawn O. Pearce
@ 2008-06-19 23:06       ` Dan McGee
  2008-06-20  6:31       ` Teemu Likonen
  1 sibling, 0 replies; 7+ messages in thread
From: Dan McGee @ 2008-06-19 23:06 UTC (permalink / raw)
  To: Shawn O. Pearce; +Cc: Teemu Likonen, git, gitster

On Thu, Jun 19, 2008 at 5:55 PM, Shawn O. Pearce <spearce@spearce.org> wrote:
> This conflicts with the patch you are replying to, but it makes
> sense to do these options as well.
>
> Acked-by: Shawn O. Pearce <spearce@spearce.org>

It is more complete than mine though, so you can keep my name out of
the log this time.

Acked-by: Dan McGee <dpmcgee@gmail.com>

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

* Re: [PATCH] completion: add --graph to log command completion
  2008-06-19 22:55     ` Shawn O. Pearce
  2008-06-19 23:06       ` Dan McGee
@ 2008-06-20  6:31       ` Teemu Likonen
  2008-06-20 13:02         ` [PATCH v2] bash: Add more option completions for 'git log' Teemu Likonen
  1 sibling, 1 reply; 7+ messages in thread
From: Teemu Likonen @ 2008-06-20  6:31 UTC (permalink / raw)
  To: Shawn O. Pearce; +Cc: Dan McGee, git, gitster

Shawn O. Pearce wrote (2008-06-19 18:55 -0400):

> Teemu Likonen <tlikonen@iki.fi> wrote:
> > I think I have already sent twice a patch with --graph completion.
> 
> I didn't Ack them because at the time --graph wasn't even in next yet
> I think.  Then I got busy and forgot.  And --graph slipped through
> into the 1.5.6 release without your bash completion patches. Sorry.

No problems. I should have sent a ping to the list after the log --graph
settled to the master branch. But... I forgot.

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

* [PATCH v2] bash: Add more option completions for 'git log'
  2008-06-20  6:31       ` Teemu Likonen
@ 2008-06-20 13:02         ` Teemu Likonen
  0 siblings, 0 replies; 7+ messages in thread
From: Teemu Likonen @ 2008-06-20 13:02 UTC (permalink / raw)
  To: Shawn O. Pearce; +Cc: Dan McGee, git, gitster

Options added: --walk-reflogs --stat --numstat --shortstat
--decorate --diff-filter= --color-words

Signed-off-by: Teemu Likonen <tlikonen@iki.fi>
---

Here's a non-conflicting version.


 contrib/completion/git-completion.bash |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 72575cf..f108ede 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -762,6 +762,9 @@ _git_log ()
 			--not --all
 			--left-right --cherry-pick
 			--graph
+			--stat --numstat --shortstat
+			--decorate --diff-filter=
+			--color-words --walk-reflogs
 			"
 		return
 		;;
-- 
1.5.6.2.g3c3a

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

end of thread, other threads:[~2008-06-20 13:03 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-06-19 21:15 [PATCH] completion: add --graph to log command completion Dan McGee
2008-06-19 21:58 ` Shawn O. Pearce
2008-06-19 22:40   ` Teemu Likonen
2008-06-19 22:55     ` Shawn O. Pearce
2008-06-19 23:06       ` Dan McGee
2008-06-20  6:31       ` Teemu Likonen
2008-06-20 13:02         ` [PATCH v2] bash: Add more option completions for 'git log' Teemu Likonen

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.