{"thread":{"id":"28614","subject":"[PATCH 1/3] completion: unite --reuse-message and --reedit-message handling","startedAt":"2011-10-06T18:40:29Z","lastAt":"2011-10-08T01:09:34Z","messageCount":7,"participants":["Teemu Matilainen","Junio C Hamano","SZEDER Gábor"],"isPatch":true,"patchVersion":1,"patchTotal":3},"messages":[{"id":"177092","messageId":"1317926431-609-1-git-send-email-teemu.matilainen@iki.fi","threadId":"28614","inReplyTo":null,"subject":"[PATCH 1/3] completion: unite --reuse-message and --reedit-message handling","fromName":"Teemu Matilainen","fromEmail":"teemu.matilainen@iki.fi","sentAt":"2011-10-06T18:40:29Z","receivedAt":"2011-10-06T18:40:29Z","isPatch":true,"sender":{"key":"teemu.matilainen@iki.fi","avatar":"https://avatars.githubusercontent.com/u/79116?v=4"},"body":"Signed-off-by: Teemu Matilainen <teemu.matilainen@iki.fi>\n---\n contrib/completion/git-completion.bash |    8 ++------\n 1 files changed, 2 insertions(+), 6 deletions(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex 8648a36..656297d 100755\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1259,12 +1259,8 @@ _git_commit ()\n \t\t\t\" \"\" \"${cur##--cleanup=}\"\n \t\treturn\n \t\t;;\n-\t--reuse-message=*)\n-\t\t__gitcomp \"$(__git_refs)\" \"\" \"${cur##--reuse-message=}\"\n-\t\treturn\n-\t\t;;\n-\t--reedit-message=*)\n-\t\t__gitcomp \"$(__git_refs)\" \"\" \"${cur##--reedit-message=}\"\n+\t--reuse-message=*|--reedit-message=*)\n+\t\t__gitcomp \"$(__git_refs)\" \"\" \"${cur#*=}\"\n \t\treturn\n \t\t;;\n \t--untracked-files=*)\n-- \n1.7.7.138.g7f41b6\n"},{"id":"177093","messageId":"1317926431-609-2-git-send-email-teemu.matilainen@iki.fi","threadId":"28614","inReplyTo":"1317926431-609-1-git-send-email-teemu.matilainen@iki.fi","subject":"[PATCH 2/3] completion: commit --fixup and --squash","fromName":"Teemu Matilainen","fromEmail":"teemu.matilainen@iki.fi","sentAt":"2011-10-06T18:40:30Z","receivedAt":"2011-10-06T18:40:30Z","isPatch":true,"sender":{"key":"teemu.matilainen@iki.fi","avatar":"https://avatars.githubusercontent.com/u/79116?v=4"},"body":"Signed-off-by: Teemu Matilainen <teemu.matilainen@iki.fi>\n---\n contrib/completion/git-completion.bash |    5 +++--\n 1 files changed, 3 insertions(+), 2 deletions(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex 656297d..847e6e9 100755\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1259,7 +1259,8 @@ _git_commit ()\n \t\t\t\" \"\" \"${cur##--cleanup=}\"\n \t\treturn\n \t\t;;\n-\t--reuse-message=*|--reedit-message=*)\n+\t--reuse-message=*|--reedit-message=*|\\\n+\t--fixup=*|--squash=*)\n \t\t__gitcomp \"$(__git_refs)\" \"\" \"${cur#*=}\"\n \t\treturn\n \t\t;;\n@@ -1274,7 +1275,7 @@ _git_commit ()\n \t\t\t--dry-run --reuse-message= --reedit-message=\n \t\t\t--reset-author --file= --message= --template=\n \t\t\t--cleanup= --untracked-files --untracked-files=\n-\t\t\t--verbose --quiet\n+\t\t\t--verbose --quiet --fixup= --squash=\n \t\t\t\"\n \t\treturn\n \tesac\n-- \n1.7.7.138.g7f41b6\n"},{"id":"177094","messageId":"1317926431-609-3-git-send-email-teemu.matilainen@iki.fi","threadId":"28614","inReplyTo":"1317926431-609-1-git-send-email-teemu.matilainen@iki.fi","subject":"[PATCH 3/3] completion: push --set-upstream","fromName":"Teemu Matilainen","fromEmail":"teemu.matilainen@iki.fi","sentAt":"2011-10-06T18:40:31Z","receivedAt":"2011-10-06T18:40:31Z","isPatch":true,"sender":{"key":"teemu.matilainen@iki.fi","avatar":"https://avatars.githubusercontent.com/u/79116?v=4"},"body":"Signed-off-by: Teemu Matilainen <teemu.matilainen@iki.fi>\n---\n contrib/completion/git-completion.bash |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex 847e6e9..344119b 100755\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1730,7 +1730,7 @@ _git_push ()\n \t--*)\n \t\t__gitcomp \"\n \t\t\t--all --mirror --tags --dry-run --force --verbose\n-\t\t\t--receive-pack= --repo=\n+\t\t\t--receive-pack= --repo= --set-upstream\n \t\t\"\n \t\treturn\n \t\t;;\n-- \n1.7.7.138.g7f41b6\n"},{"id":"177124","messageId":"7vd3e9yap7.fsf@alter.siamese.dyndns.org","threadId":"28614","inReplyTo":"1317926431-609-1-git-send-email-teemu.matilainen@iki.fi","subject":"Re: [PATCH 1/3] completion: unite --reuse-message and --reedit-message handling","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2011-10-06T23:14:28Z","receivedAt":"2011-10-06T23:14:28Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"All three patches make sense to me. Thanks.\n"},{"id":"177206","messageId":"20111008010432.GA11561@goldbirke","threadId":"28614","inReplyTo":"7vd3e9yap7.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH 1/3] completion: unite --reuse-message and --reedit-message handling","fromName":"SZEDER Gábor","fromEmail":"szeder@ira.uka.de","sentAt":"2011-10-08T01:04:32Z","receivedAt":"2011-10-08T01:04:32Z","isPatch":true,"sender":{"key":"szeder.dev@gmail.com","avatar":"https://avatars.githubusercontent.com/u/116324?v=4"},"body":"Hi,\n\nOn Thu, Oct 06, 2011 at 04:14:28PM -0700, Junio C Hamano wrote:\n> All three patches make sense to me. Thanks.\n\nThis is a good cleanup/deduplication; there are a few places where\nsimilar cleanup can be done.  Since this conflicted with one of my\nmore intrusive WIP branches, I figured it's better to clean up those\nfirst, too.\n\n\nBest,\nGábor\n"},{"id":"177207","messageId":"20111008010634.GB11561@goldbirke","threadId":"28614","inReplyTo":"20111008010432.GA11561@goldbirke","subject":"[PATCH 1/2] completion: unite --reuse-message and --reedit-message for 'notes'","fromName":"SZEDER Gábor","fromEmail":"szeder@ira.uka.de","sentAt":"2011-10-08T01:06:34Z","receivedAt":"2011-10-08T01:06:34Z","isPatch":true,"sender":{"key":"szeder.dev@gmail.com","avatar":"https://avatars.githubusercontent.com/u/116324?v=4"},"body":"Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>\n---\n contrib/completion/git-completion.bash |    6 ++----\n 1 files changed, 2 insertions(+), 4 deletions(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex 847e6e9a..98282435 100755\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1668,11 +1668,9 @@ _git_notes ()\n \t\t\t;;\n \t\tesac\n \t\t;;\n-\tadd,--reuse-message=*|append,--reuse-message=*)\n-\t\t__gitcomp \"$(__git_refs)\" \"\" \"${cur##--reuse-message=}\"\n-\t\t;;\n+\tadd,--reuse-message=*|append,--reuse-message=*|\\\n \tadd,--reedit-message=*|append,--reedit-message=*)\n-\t\t__gitcomp \"$(__git_refs)\" \"\" \"${cur##--reedit-message=}\"\n+\t\t__gitcomp \"$(__git_refs)\" \"\" \"${cur#*=}\"\n \t\t;;\n \tadd,--*|append,--*)\n \t\t__gitcomp '--file= --message= --reedit-message=\n-- \n1.7.7.187.ga41de\n"},{"id":"177208","messageId":"20111008010934.GC11561@goldbirke","threadId":"28614","inReplyTo":"20111008010432.GA11561@goldbirke","subject":"[PATCH 2/2] completion: unite --format and --pretty for 'log' and 'show'","fromName":"SZEDER Gábor","fromEmail":"szeder@ira.uka.de","sentAt":"2011-10-08T01:09:34Z","receivedAt":"2011-10-08T01:09:34Z","isPatch":true,"sender":{"key":"szeder.dev@gmail.com","avatar":"https://avatars.githubusercontent.com/u/116324?v=4"},"body":"Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>\n---\n contrib/completion/git-completion.bash |   18 ++++--------------\n 1 files changed, 4 insertions(+), 14 deletions(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex 98282435..b36f9e70 100755\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1553,14 +1553,9 @@ _git_log ()\n \t\tmerge=\"--merge\"\n \tfi\n \tcase \"$cur\" in\n-\t--pretty=*)\n+\t--pretty=*|--format=*)\n \t\t__gitcomp \"$__git_log_pretty_formats $(__git_pretty_aliases)\n-\t\t\t\" \"\" \"${cur##--pretty=}\"\n-\t\treturn\n-\t\t;;\n-\t--format=*)\n-\t\t__gitcomp \"$__git_log_pretty_formats $(__git_pretty_aliases)\n-\t\t\t\" \"\" \"${cur##--format=}\"\n+\t\t\t\" \"\" \"${cur#*=}\"\n \t\treturn\n \t\t;;\n \t--date=*)\n@@ -2365,14 +2360,9 @@ _git_show ()\n \t__git_has_doubledash && return\n \n \tcase \"$cur\" in\n-\t--pretty=*)\n-\t\t__gitcomp \"$__git_log_pretty_formats $(__git_pretty_aliases)\n-\t\t\t\" \"\" \"${cur##--pretty=}\"\n-\t\treturn\n-\t\t;;\n-\t--format=*)\n+\t--pretty=*|--format=*)\n \t\t__gitcomp \"$__git_log_pretty_formats $(__git_pretty_aliases)\n-\t\t\t\" \"\" \"${cur##--format=}\"\n+\t\t\t\" \"\" \"${cur#*=}\"\n \t\treturn\n \t\t;;\n \t--*)\n-- \n1.7.7.187.ga41de\n"}]}