{"thread":{"id":"13188","subject":"[PATCH] bash: Add completion for git diff --base --ours --theirs","startedAt":"2008-04-20T19:32:47Z","lastAt":"2008-04-22T00:04:26Z","messageCount":2,"participants":["Teemu Likonen","Shawn O. Pearce"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"74826","messageId":"20080420193247.GA21023@mithlond.arda.local","threadId":"13188","inReplyTo":null,"subject":"[PATCH] bash: Add completion for git diff --base --ours --theirs","fromName":"Teemu Likonen","fromEmail":"tlikonen@iki.fi","sentAt":"2008-04-20T19:32:47Z","receivedAt":"2008-04-20T19:32:47Z","isPatch":true,"sender":{"key":"tlikonen@iki.fi","avatar":null},"body":"Signed-off-by: Teemu Likonen <tlikonen@iki.fi>\n---\n\nI guess these options should be documented in git-diff.txt too but I'm\nhesitant to do it because my understanding of merge stages isn't quite\nenough.\n\n\n contrib/completion/git-completion.bash |    1 +\n 1 files changed, 1 insertions(+), 0 deletions(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex 4d81963..6949cac 100755\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -641,6 +641,7 @@ _git_diff ()\n \t\t\t--ignore-all-space --exit-code --quiet --ext-diff\n \t\t\t--no-ext-diff\n \t\t\t--no-prefix --src-prefix= --dst-prefix=\n+\t\t\t--base --ours --theirs\n \t\t\t\"\n \t\treturn\n \t\t;;\n-- \n1.5.5.84.g295c\n"},{"id":"74891","messageId":"20080422000426.GR29771@spearce.org","threadId":"13188","inReplyTo":"20080420193247.GA21023@mithlond.arda.local","subject":"Re: [PATCH] bash: Add completion for git diff --base --ours --theirs","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2008-04-22T00:04:26Z","receivedAt":"2008-04-22T00:04:26Z","isPatch":true,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Teemu Likonen <tlikonen@iki.fi> wrote:\n> diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\n> index 4d81963..6949cac 100755\n> --- a/contrib/completion/git-completion.bash\n> +++ b/contrib/completion/git-completion.bash\n> @@ -641,6 +641,7 @@ _git_diff ()\n>  \t\t\t--ignore-all-space --exit-code --quiet --ext-diff\n>  \t\t\t--no-ext-diff\n>  \t\t\t--no-prefix --src-prefix= --dst-prefix=\n> +\t\t\t--base --ours --theirs\n>  \t\t\t\"\n>  \t\treturn\n>  \t\t;;\n\nHmmph.  I must not be paying enough attention to the mailing list.\nI didn't know these were supported on git-diff.  Oh, wow, Linus\nadded these, and he never documents things.  No wonder they are\nundocumented.  :)\n\nAnyway.  Acked-by: Shawn O. Pearce <spearce@spearce.org>\n\nBut documentation would be nice too.  However I can see why you\nwouldn't want to contribute that; its easy enough to insert these\nflags into the completion, but its another matter to explain what\nthey are actually doing for you.\n\n-- \nShawn.\n"}]}