{"thread":{"id":"59848","subject":"[PATCH 00/25] completion: add missing diff options","startedAt":"2023-06-10T20:21:40Z","lastAt":"2023-06-26T16:26:52Z","messageCount":83,"participants":["Philippe Blain via GitGitGadget","Eric Sunshine","Philippe Blain","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":25},"messages":[{"id":"478191","messageId":"pull.1543.git.1686428484.gitgitgadget@gmail.com","threadId":"59848","inReplyTo":null,"subject":"[PATCH 00/25] completion: add missing diff options","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-06-10T20:20:59Z","receivedAt":"2023-06-10T20:21:40Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"This series adds missing diff options to the Bash completion script.\nCompletion often serves as a discovery mechanism for options, so it is\nbeneficial to users if all options are offered by the completion script.\n\nThe list of missing options was generated by:\n\n 1. Extracting all diff options from the documentation:\n \n git grep -h --no-column --only-match -e ^--[a-z][a-z-]*\n Documentation/diff-options.txt\n | sort -u > diff-options.txt\n\n 2. Searching for each option in the completion script and visually checking\n which one was missing:\n \n while read p; do echo --- $p ---; echo; git grep --color -p -e $p\n upstream/master contrib/completion/git-completion.bash done <\n diff-options.txt\n\nThe only options I left out are --skip-to and --rotate-to, since I agree\nwith their documentation: they are probably not very useful outside of their\nuse in 'git difftool'.\n\nCheers,\n\nPhilippe.\n\nPhilippe Blain (25):\n completion: add comments describing __git_diff_* globals\n completion: complete --break-rewrites\n completion: complete --cc\n completion: complete --combined-all-paths\n completion: complete --compact-summary\n completion: complete --default-prefix\n completion: complete --find-copies\n completion: complete --find-object\n completion: complete --find-renames\n completion: complete --function-context\n completion: complete --ignore-matching-lines\n completion: complete --irreversible-delete\n completion: complete --ita-invisible-in-index and\n --ita-visible-in-index\n completion: complete --line-prefix\n completion: complete --no-relative\n completion: complete --no-stat\n completion: complete --output\n completion: complete --output-indicator-{context,new,old}\n completion: complete --patch-with-raw\n completion: complete --unified\n completion: complete --ws-error-highlight\n completion: move --pickaxe-{all,regex} to __git_diff_common_options\n completion: complete --diff-merges, its options and --no-diff-merges\n completion: complete --remerge-diff\n diff.c: mention completion above add_diff_options\n\n contrib/completion/git-completion.bash | 57 ++++++++++++++++++++++----\n diff.c | 3 ++\n 2 files changed, 51 insertions(+), 9 deletions(-)\n\n\nbase-commit: fe86abd7511a9a6862d5706c6fa1d9b57a63ba09\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-1543%2Fphil-blain%2Fcompletion-common-diff-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1543/phil-blain/completion-common-diff-v1\nPull-Request: https://github.com/gitgitgadget/git/pull/1543\n-- \ngitgitgadget\n"},{"id":"478192","messageId":"1f3c9e8d417d2c9f16583da7609e8f322059f1f1.1686428485.git.gitgitgadget@gmail.com","threadId":"59848","inReplyTo":"pull.1543.git.1686428484.gitgitgadget@gmail.com","subject":"[PATCH 02/25] completion: complete --break-rewrites","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-06-10T20:21:01Z","receivedAt":"2023-06-10T20:21:43Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"From: Philippe Blain \n\nSigned-off-by: Philippe Blain \n---\n contrib/completion/git-completion.bash | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex 90fe292459b..f07b00b9c68 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1753,7 +1753,7 @@ __git_diff_common_options=\"--stat --numstat --shortstat --summary\n \t\t\t--diff-algorithm=\n \t\t\t--submodule --submodule= --ignore-submodules\n \t\t\t--indent-heuristic --no-indent-heuristic\n-\t\t\t--textconv --no-textconv\n+\t\t\t--textconv --no-textconv --break-rewrites\n \t\t\t--patch --no-patch\n \t\t\t--anchored=\n \"\n-- \ngitgitgadget\n\n"},{"id":"478194","messageId":"4edabc7f15c3ad55c911919bec5a406bb48ad0ee.1686428484.git.gitgitgadget@gmail.com","threadId":"59848","inReplyTo":"pull.1543.git.1686428484.gitgitgadget@gmail.com","subject":"[PATCH 01/25] completion: add comments describing __git_diff_* globals","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-06-10T20:21:00Z","receivedAt":"2023-06-10T20:21:43Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"From: Philippe Blain \n\nAdd descriptive comments for '__git_diff_common_options' and\n'__git_diff_difftool_options', so that it is clearer when looking at\nthese variables to know in which command's completion they are used.\n\nSigned-off-by: Philippe Blain \n---\n contrib/completion/git-completion.bash | 2 ++\n 1 file changed, 2 insertions(+)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex dc95c34cc85..90fe292459b 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1733,6 +1733,7 @@ __git_color_moved_opts=\"no default plain blocks zebra dimmed-zebra\"\n __git_color_moved_ws_opts=\"no ignore-space-at-eol ignore-space-change\n \t\t\tignore-all-space allow-indentation-change\"\n \n+# Options for the diff machinery (diff, log, show, stash, range-diff, ...)\n __git_diff_common_options=\"--stat --numstat --shortstat --summary\n \t\t\t--patch-with-stat --name-only --name-status --color\n \t\t\t--no-color --color-words --no-renames --check\n@@ -1757,6 +1758,7 @@ __git_diff_common_options=\"--stat --numstat --shortstat --summary\n \t\t\t--anchored=\n \"\n \n+# Options for diff/difftool\n __git_diff_difftool_options=\"--cached --staged --pickaxe-all --pickaxe-regex\n \t\t\t--base --ours --theirs --no-index --relative --merge-base\n \t\t\t$__git_diff_common_options\"\n-- \ngitgitgadget\n\n"},{"id":"478193","messageId":"63d70d645e25a2e7f9d3dfac7f6b01c3bd27fd7e.1686428485.git.gitgitgadget@gmail.com","threadId":"59848","inReplyTo":"pull.1543.git.1686428484.gitgitgadget@gmail.com","subject":"[PATCH 05/25] completion: complete --compact-summary","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-06-10T20:21:04Z","receivedAt":"2023-06-10T20:21:45Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"From: Philippe Blain \n\nSigned-off-by: Philippe Blain \n---\n contrib/completion/git-completion.bash | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex 58ce64de9e2..4c43d13eef4 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1755,7 +1755,7 @@ __git_diff_common_options=\"--stat --numstat --shortstat --summary\n \t\t\t--indent-heuristic --no-indent-heuristic\n \t\t\t--textconv --no-textconv --break-rewrites\n \t\t\t--patch --no-patch --cc --combined-all-paths\n-\t\t\t--anchored=\n+\t\t\t--anchored= --compact-summary\n \"\n \n # Options for diff/difftool\n-- \ngitgitgadget\n\n"},{"id":"478195","messageId":"7296a3a8c9da5287cca85c61af342dfc647fb2a8.1686428485.git.gitgitgadget@gmail.com","threadId":"59848","inReplyTo":"pull.1543.git.1686428484.gitgitgadget@gmail.com","subject":"[PATCH 06/25] completion: complete --default-prefix","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-06-10T20:21:05Z","receivedAt":"2023-06-10T20:21:48Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"From: Philippe Blain \n\nSigned-off-by: Philippe Blain \n---\n contrib/completion/git-completion.bash | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex 4c43d13eef4..6af04932a0a 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1750,7 +1750,7 @@ __git_diff_common_options=\"--stat --numstat --shortstat --summary\n \t\t\t--raw --word-diff --word-diff-regex=\n \t\t\t--dirstat --dirstat= --dirstat-by-file\n \t\t\t--dirstat-by-file= --cumulative\n-\t\t\t--diff-algorithm=\n+\t\t\t--diff-algorithm= --default-prefix\n \t\t\t--submodule --submodule= --ignore-submodules\n \t\t\t--indent-heuristic --no-indent-heuristic\n \t\t\t--textconv --no-textconv --break-rewrites\n-- \ngitgitgadget\n\n"},{"id":"478196","messageId":"1f9b213cee5a4c6325c7fa9528180e46aab7805a.1686428485.git.gitgitgadget@gmail.com","threadId":"59848","inReplyTo":"pull.1543.git.1686428484.gitgitgadget@gmail.com","subject":"[PATCH 07/25] completion: complete --find-copies","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-06-10T20:21:06Z","receivedAt":"2023-06-10T20:21:49Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"From: Philippe Blain \n\nSigned-off-by: Philippe Blain \n---\n contrib/completion/git-completion.bash | 1 +\n 1 file changed, 1 insertion(+)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex 6af04932a0a..dd6e12ad8f6 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1740,6 +1740,7 @@ __git_diff_common_options=\"--stat --numstat --shortstat --summary\n \t\t\t--color-moved --color-moved= --no-color-moved\n \t\t\t--color-moved-ws= --no-color-moved-ws\n \t\t\t--full-index --binary --abbrev --diff-filter=\n+\t\t\t--find-copies\n \t\t\t--find-copies-harder --ignore-cr-at-eol\n \t\t\t--text --ignore-space-at-eol --ignore-space-change\n \t\t\t--ignore-all-space --ignore-blank-lines --exit-code\n-- \ngitgitgadget\n\n"},{"id":"478197","messageId":"51024ee2f2c4862d223e10ae4f193b8e0aeb1c60.1686428485.git.gitgitgadget@gmail.com","threadId":"59848","inReplyTo":"pull.1543.git.1686428484.gitgitgadget@gmail.com","subject":"[PATCH 04/25] completion: complete --combined-all-paths","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-06-10T20:21:03Z","receivedAt":"2023-06-10T20:21:51Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"From: Philippe Blain \n\nSigned-off-by: Philippe Blain \n---\n contrib/completion/git-completion.bash | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex b61c54e37f7..58ce64de9e2 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1754,7 +1754,7 @@ __git_diff_common_options=\"--stat --numstat --shortstat --summary\n \t\t\t--submodule --submodule= --ignore-submodules\n \t\t\t--indent-heuristic --no-indent-heuristic\n \t\t\t--textconv --no-textconv --break-rewrites\n-\t\t\t--patch --no-patch --cc\n+\t\t\t--patch --no-patch --cc --combined-all-paths\n \t\t\t--anchored=\n \"\n \n-- \ngitgitgadget\n\n"},{"id":"478198","messageId":"53b1c348f822ca32228cdb0f40b03c9ae9ec59c8.1686428485.git.gitgitgadget@gmail.com","threadId":"59848","inReplyTo":"pull.1543.git.1686428484.gitgitgadget@gmail.com","subject":"[PATCH 08/25] completion: complete --find-object","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-06-10T20:21:07Z","receivedAt":"2023-06-10T20:21:54Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"From: Philippe Blain \n\nSigned-off-by: Philippe Blain \n---\n contrib/completion/git-completion.bash | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex dd6e12ad8f6..392fdbedd9f 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1740,7 +1740,7 @@ __git_diff_common_options=\"--stat --numstat --shortstat --summary\n \t\t\t--color-moved --color-moved= --no-color-moved\n \t\t\t--color-moved-ws= --no-color-moved-ws\n \t\t\t--full-index --binary --abbrev --diff-filter=\n-\t\t\t--find-copies\n+\t\t\t--find-copies --find-object\n \t\t\t--find-copies-harder --ignore-cr-at-eol\n \t\t\t--text --ignore-space-at-eol --ignore-space-change\n \t\t\t--ignore-all-space --ignore-blank-lines --exit-code\n-- \ngitgitgadget\n\n"},{"id":"478199","messageId":"053f9e8620aa369f04eff8f1235eb57d15fe8755.1686428485.git.gitgitgadget@gmail.com","threadId":"59848","inReplyTo":"pull.1543.git.1686428484.gitgitgadget@gmail.com","subject":"[PATCH 09/25] completion: complete --find-renames","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-06-10T20:21:08Z","receivedAt":"2023-06-10T20:21:57Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"From: Philippe Blain \n\nSigned-off-by: Philippe Blain \n---\n contrib/completion/git-completion.bash | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex 392fdbedd9f..0fa86dcde6f 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1740,7 +1740,7 @@ __git_diff_common_options=\"--stat --numstat --shortstat --summary\n \t\t\t--color-moved --color-moved= --no-color-moved\n \t\t\t--color-moved-ws= --no-color-moved-ws\n \t\t\t--full-index --binary --abbrev --diff-filter=\n-\t\t\t--find-copies --find-object\n+\t\t\t--find-copies --find-object --find-renames\n \t\t\t--find-copies-harder --ignore-cr-at-eol\n \t\t\t--text --ignore-space-at-eol --ignore-space-change\n \t\t\t--ignore-all-space --ignore-blank-lines --exit-code\n-- \ngitgitgadget\n\n"},{"id":"478200","messageId":"d38823dd116e4579bbbeb96ff7b1eae8116681bb.1686428485.git.gitgitgadget@gmail.com","threadId":"59848","inReplyTo":"pull.1543.git.1686428484.gitgitgadget@gmail.com","subject":"[PATCH 03/25] completion: complete --cc","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-06-10T20:21:02Z","receivedAt":"2023-06-10T20:21:58Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"From: Philippe Blain \n\nSigned-off-by: Philippe Blain \n---\n contrib/completion/git-completion.bash | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex f07b00b9c68..b61c54e37f7 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1754,7 +1754,7 @@ __git_diff_common_options=\"--stat --numstat --shortstat --summary\n \t\t\t--submodule --submodule= --ignore-submodules\n \t\t\t--indent-heuristic --no-indent-heuristic\n \t\t\t--textconv --no-textconv --break-rewrites\n-\t\t\t--patch --no-patch\n+\t\t\t--patch --no-patch --cc\n \t\t\t--anchored=\n \"\n \n-- \ngitgitgadget\n\n"},{"id":"478201","messageId":"8bd72945a2ff26c96cecc83abc07299ab51d262d.1686428485.git.gitgitgadget@gmail.com","threadId":"59848","inReplyTo":"pull.1543.git.1686428484.gitgitgadget@gmail.com","subject":"[PATCH 11/25] completion: complete --ignore-matching-lines","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-06-10T20:21:10Z","receivedAt":"2023-06-10T20:21:59Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"From: Philippe Blain \n\nSigned-off-by: Philippe Blain \n---\n contrib/completion/git-completion.bash | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex 2610a55487b..b4d0643b049 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1756,7 +1756,7 @@ __git_diff_common_options=\"--stat --numstat --shortstat --summary\n \t\t\t--indent-heuristic --no-indent-heuristic\n \t\t\t--textconv --no-textconv --break-rewrites\n \t\t\t--patch --no-patch --cc --combined-all-paths\n-\t\t\t--anchored= --compact-summary\n+\t\t\t--anchored= --compact-summary --ignore-matching-lines=\n \"\n \n # Options for diff/difftool\n-- \ngitgitgadget\n\n"},{"id":"478202","messageId":"5d32e972a0c6e099f1d30d4a2a8cbff6e204b09e.1686428485.git.gitgitgadget@gmail.com","threadId":"59848","inReplyTo":"pull.1543.git.1686428484.gitgitgadget@gmail.com","subject":"[PATCH 12/25] completion: complete --irreversible-delete","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-06-10T20:21:11Z","receivedAt":"2023-06-10T20:22:01Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"From: Philippe Blain \n\nSigned-off-by: Philippe Blain \n---\n contrib/completion/git-completion.bash | 1 +\n 1 file changed, 1 insertion(+)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex b4d0643b049..e74636ebe86 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1757,6 +1757,7 @@ __git_diff_common_options=\"--stat --numstat --shortstat --summary\n \t\t\t--textconv --no-textconv --break-rewrites\n \t\t\t--patch --no-patch --cc --combined-all-paths\n \t\t\t--anchored= --compact-summary --ignore-matching-lines=\n+\t\t\t--irreversible-delete\n \"\n \n # Options for diff/difftool\n-- \ngitgitgadget\n\n"},{"id":"478203","messageId":"2503d990e5c7d1fb5bbf06493951204e7c00ea09.1686428485.git.gitgitgadget@gmail.com","threadId":"59848","inReplyTo":"pull.1543.git.1686428484.gitgitgadget@gmail.com","subject":"[PATCH 10/25] completion: complete --function-context","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-06-10T20:21:09Z","receivedAt":"2023-06-10T20:22:02Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"From: Philippe Blain \n\nSigned-off-by: Philippe Blain \n---\n contrib/completion/git-completion.bash | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex 0fa86dcde6f..2610a55487b 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1746,7 +1746,7 @@ __git_diff_common_options=\"--stat --numstat --shortstat --summary\n \t\t\t--ignore-all-space --ignore-blank-lines --exit-code\n \t\t\t--quiet --ext-diff --no-ext-diff\n \t\t\t--no-prefix --src-prefix= --dst-prefix=\n-\t\t\t--inter-hunk-context=\n+\t\t\t--inter-hunk-context= --function-context\n \t\t\t--patience --histogram --minimal\n \t\t\t--raw --word-diff --word-diff-regex=\n \t\t\t--dirstat --dirstat= --dirstat-by-file\n-- \ngitgitgadget\n\n"},{"id":"478204","messageId":"fd94e9ae7830e98397c0f79cd3e0a519dc1fcd5f.1686428485.git.gitgitgadget@gmail.com","threadId":"59848","inReplyTo":"pull.1543.git.1686428484.gitgitgadget@gmail.com","subject":"[PATCH 13/25] completion: complete --ita-invisible-in-index and --ita-visible-in-index","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-06-10T20:21:12Z","receivedAt":"2023-06-10T20:22:04Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"From: Philippe Blain \n\nThe options --ita-invisible-in-index and --ita-visible-in-index are\nlisted in diff-options.txt and so are included in the documentation of\ncommands which include this file (diff, diff-*, log, show, format-patch)\nbut they only make sense for diffs relating to the index. As such, add\nthem to '__git_diff_difftool_options' instead of\n'__git_diff_common_options' since it makes more sense to add them there.\n\nSigned-off-by: Philippe Blain \n---\n contrib/completion/git-completion.bash | 1 +\n 1 file changed, 1 insertion(+)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex e74636ebe86..7246ced14ad 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1763,6 +1763,7 @@ __git_diff_common_options=\"--stat --numstat --shortstat --summary\n # Options for diff/difftool\n __git_diff_difftool_options=\"--cached --staged --pickaxe-all --pickaxe-regex\n \t\t\t--base --ours --theirs --no-index --relative --merge-base\n+\t\t\t--ita-invisible-in-index --ita-visible-in-index\n \t\t\t$__git_diff_common_options\"\n \n _git_diff ()\n-- \ngitgitgadget\n\n"},{"id":"478205","messageId":"560ad1cd0179f8615dadd8b252b5c3f8cef6822e.1686428485.git.gitgitgadget@gmail.com","threadId":"59848","inReplyTo":"pull.1543.git.1686428484.gitgitgadget@gmail.com","subject":"[PATCH 14/25] completion: complete --line-prefix","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-06-10T20:21:13Z","receivedAt":"2023-06-10T20:22:06Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"From: Philippe Blain \n\nSigned-off-by: Philippe Blain \n---\n contrib/completion/git-completion.bash | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex 7246ced14ad..13d6730f33d 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1757,7 +1757,7 @@ __git_diff_common_options=\"--stat --numstat --shortstat --summary\n \t\t\t--textconv --no-textconv --break-rewrites\n \t\t\t--patch --no-patch --cc --combined-all-paths\n \t\t\t--anchored= --compact-summary --ignore-matching-lines=\n-\t\t\t--irreversible-delete\n+\t\t\t--irreversible-delete --line-prefix\n \"\n \n # Options for diff/difftool\n-- \ngitgitgadget\n\n"},{"id":"478206","messageId":"0f16a466fd9bdafe0365ee9cf1bce81fc11767d1.1686428485.git.gitgitgadget@gmail.com","threadId":"59848","inReplyTo":"pull.1543.git.1686428484.gitgitgadget@gmail.com","subject":"[PATCH 16/25] completion: complete --no-stat","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-06-10T20:21:15Z","receivedAt":"2023-06-10T20:22:07Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"From: Philippe Blain \n\nSigned-off-by: Philippe Blain \n---\n contrib/completion/git-completion.bash | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex f4e773cb997..ec2e4c9e711 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1758,7 +1758,7 @@ __git_diff_common_options=\"--stat --numstat --shortstat --summary\n \t\t\t--textconv --no-textconv --break-rewrites\n \t\t\t--patch --no-patch --cc --combined-all-paths\n \t\t\t--anchored= --compact-summary --ignore-matching-lines=\n-\t\t\t--irreversible-delete --line-prefix\n+\t\t\t--irreversible-delete --line-prefix --no-stat\n \"\n \n # Options for diff/difftool\n-- \ngitgitgadget\n\n"},{"id":"478207","messageId":"d3242e1f949815e6c2c036146da2f5faff92d94f.1686428485.git.gitgitgadget@gmail.com","threadId":"59848","inReplyTo":"pull.1543.git.1686428484.gitgitgadget@gmail.com","subject":"[PATCH 15/25] completion: complete --no-relative","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-06-10T20:21:14Z","receivedAt":"2023-06-10T20:22:10Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"From: Philippe Blain \n\nAdd --no-relative to __git_diff_common_options in the completion script,\nand move --relative from __git_diff_difftool_options to\n__git_diff_common_options since it applies to more than just diff and\ndifftool.\n\nSigned-off-by: Philippe Blain \n---\n contrib/completion/git-completion.bash | 3 ++-\n 1 file changed, 2 insertions(+), 1 deletion(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex 13d6730f33d..f4e773cb997 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1741,6 +1741,7 @@ __git_diff_common_options=\"--stat --numstat --shortstat --summary\n \t\t\t--color-moved-ws= --no-color-moved-ws\n \t\t\t--full-index --binary --abbrev --diff-filter=\n \t\t\t--find-copies --find-object --find-renames\n+\t\t\t--no-relative --relative\n \t\t\t--find-copies-harder --ignore-cr-at-eol\n \t\t\t--text --ignore-space-at-eol --ignore-space-change\n \t\t\t--ignore-all-space --ignore-blank-lines --exit-code\n@@ -1762,7 +1763,7 @@ __git_diff_common_options=\"--stat --numstat --shortstat --summary\n \n # Options for diff/difftool\n __git_diff_difftool_options=\"--cached --staged --pickaxe-all --pickaxe-regex\n-\t\t\t--base --ours --theirs --no-index --relative --merge-base\n+\t\t\t--base --ours --theirs --no-index --merge-base\n \t\t\t--ita-invisible-in-index --ita-visible-in-index\n \t\t\t$__git_diff_common_options\"\n \n-- \ngitgitgadget\n\n"},{"id":"478208","messageId":"761c75d4aec988609a105db0f039ad9f15d2337e.1686428485.git.gitgitgadget@gmail.com","threadId":"59848","inReplyTo":"pull.1543.git.1686428484.gitgitgadget@gmail.com","subject":"[PATCH 17/25] completion: complete --output","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-06-10T20:21:16Z","receivedAt":"2023-06-10T20:22:12Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"From: Philippe Blain \n\nSigned-off-by: Philippe Blain \n---\n contrib/completion/git-completion.bash | 1 +\n 1 file changed, 1 insertion(+)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex ec2e4c9e711..a34432796bf 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1759,6 +1759,7 @@ __git_diff_common_options=\"--stat --numstat --shortstat --summary\n \t\t\t--patch --no-patch --cc --combined-all-paths\n \t\t\t--anchored= --compact-summary --ignore-matching-lines=\n \t\t\t--irreversible-delete --line-prefix --no-stat\n+\t\t\t--output=\n \"\n \n # Options for diff/difftool\n-- \ngitgitgadget\n\n"},{"id":"478209","messageId":"807b8201d145a21c629797067cee21d1d1b9a0d4.1686428485.git.gitgitgadget@gmail.com","threadId":"59848","inReplyTo":"pull.1543.git.1686428484.gitgitgadget@gmail.com","subject":"[PATCH 19/25] completion: complete --patch-with-raw","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-06-10T20:21:18Z","receivedAt":"2023-06-10T20:22:14Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"From: Philippe Blain \n\nSigned-off-by: Philippe Blain \n---\n contrib/completion/git-completion.bash | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex a69421cd740..c0d2678d320 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1741,7 +1741,7 @@ __git_diff_common_options=\"--stat --numstat --shortstat --summary\n \t\t\t--color-moved-ws= --no-color-moved-ws\n \t\t\t--full-index --binary --abbrev --diff-filter=\n \t\t\t--find-copies --find-object --find-renames\n-\t\t\t--no-relative --relative\n+\t\t\t--no-relative --relative --patch-with-raw\n \t\t\t--find-copies-harder --ignore-cr-at-eol\n \t\t\t--text --ignore-space-at-eol --ignore-space-change\n \t\t\t--ignore-all-space --ignore-blank-lines --exit-code\n-- \ngitgitgadget\n\n"},{"id":"478210","messageId":"f8d430639bcec85d822747aec161f1069255c10b.1686428485.git.gitgitgadget@gmail.com","threadId":"59848","inReplyTo":"pull.1543.git.1686428484.gitgitgadget@gmail.com","subject":"[PATCH 18/25] completion: complete --output-indicator-{context,new,old}","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-06-10T20:21:17Z","receivedAt":"2023-06-10T20:22:16Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"From: Philippe Blain \n\nSigned-off-by: Philippe Blain \n---\n contrib/completion/git-completion.bash | 3 ++-\n 1 file changed, 2 insertions(+), 1 deletion(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex a34432796bf..a69421cd740 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1759,7 +1759,8 @@ __git_diff_common_options=\"--stat --numstat --shortstat --summary\n \t\t\t--patch --no-patch --cc --combined-all-paths\n \t\t\t--anchored= --compact-summary --ignore-matching-lines=\n \t\t\t--irreversible-delete --line-prefix --no-stat\n-\t\t\t--output=\n+\t\t\t--output= --output-indicator-context=\n+\t\t\t--output-indicator-new= --output-indicator-old=\n \"\n \n # Options for diff/difftool\n-- \ngitgitgadget\n\n"},{"id":"478211","messageId":"19507b1a2109f419ba5c628c32db46f96903e166.1686428485.git.gitgitgadget@gmail.com","threadId":"59848","inReplyTo":"pull.1543.git.1686428484.gitgitgadget@gmail.com","subject":"[PATCH 20/25] completion: complete --unified","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-06-10T20:21:19Z","receivedAt":"2023-06-10T20:22:18Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"From: Philippe Blain \n\nSigned-off-by: Philippe Blain \n---\n contrib/completion/git-completion.bash | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex c0d2678d320..230d5807860 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1745,7 +1745,7 @@ __git_diff_common_options=\"--stat --numstat --shortstat --summary\n \t\t\t--find-copies-harder --ignore-cr-at-eol\n \t\t\t--text --ignore-space-at-eol --ignore-space-change\n \t\t\t--ignore-all-space --ignore-blank-lines --exit-code\n-\t\t\t--quiet --ext-diff --no-ext-diff\n+\t\t\t--quiet --ext-diff --no-ext-diff --unified=\n \t\t\t--no-prefix --src-prefix= --dst-prefix=\n \t\t\t--inter-hunk-context= --function-context\n \t\t\t--patience --histogram --minimal\n-- \ngitgitgadget\n\n"},{"id":"478212","messageId":"f8246a2a581f3bb1e424da6f2cf6d8f5b377f2c6.1686428485.git.gitgitgadget@gmail.com","threadId":"59848","inReplyTo":"pull.1543.git.1686428484.gitgitgadget@gmail.com","subject":"[PATCH 21/25] completion: complete --ws-error-highlight","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-06-10T20:21:20Z","receivedAt":"2023-06-10T20:22:19Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"From: Philippe Blain \n\nAdd --ws-error-highlight= to the list in __git_diff_common_options, and\nadd the accepted values in a new list __git_ws_error_highlight_opts.\n\nUse __git_ws_error_highlight_opts in _git_diff, _git_log and _git_show\nto offer the accepted values.\n\nAs noted in fd0bc17557 (completion: add diff --color-moved[-ws],\n2020-02-21), there is no easy way to offer completion for several\ncomma-separated values, so this is limited to completing a single\nvalue.\n\nSigned-off-by: Philippe Blain \n---\n contrib/completion/git-completion.bash | 14 ++++++++++++++\n 1 file changed, 14 insertions(+)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex 230d5807860..93522558a98 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1733,6 +1733,8 @@ __git_color_moved_opts=\"no default plain blocks zebra dimmed-zebra\"\n __git_color_moved_ws_opts=\"no ignore-space-at-eol ignore-space-change\n \t\t\tignore-all-space allow-indentation-change\"\n \n+__git_ws_error_highlight_opts=\"context old new all default\"\n+\n # Options for the diff machinery (diff, log, show, stash, range-diff, ...)\n __git_diff_common_options=\"--stat --numstat --shortstat --summary\n \t\t\t--patch-with-stat --name-only --name-status --color\n@@ -1790,6 +1792,10 @@ _git_diff ()\n \t\t__gitcomp \"$__git_color_moved_ws_opts\" \"\" \"${cur##--color-moved-ws=}\"\n \t\treturn\n \t\t;;\n+\t--ws-error-highlight=*)\n+\t\t__gitcomp \"$__git_ws_error_highlight_opts\" \"\" \"${cur##--ws-error-highlight=}\"\n+\t\treturn\n+\t\t;;\n \t--*)\n \t\t__gitcomp \"$__git_diff_difftool_options\"\n \t\treturn\n@@ -2080,6 +2086,10 @@ _git_log ()\n \t\t__gitcomp \"$__git_diff_submodule_formats\" \"\" \"${cur##--submodule=}\"\n \t\treturn\n \t\t;;\n+\t--ws-error-highlight=*)\n+\t\t__gitcomp \"$__git_ws_error_highlight_opts\" \"\" \"${cur##--ws-error-highlight=}\"\n+\t\treturn\n+\t\t;;\n \t--no-walk=*)\n \t\t__gitcomp \"sorted unsorted\" \"\" \"${cur##--no-walk=}\"\n \t\treturn\n@@ -3000,6 +3010,10 @@ _git_show ()\n \t\t__gitcomp \"$__git_color_moved_ws_opts\" \"\" \"${cur##--color-moved-ws=}\"\n \t\treturn\n \t\t;;\n+\t--ws-error-highlight=*)\n+\t\t__gitcomp \"$__git_ws_error_highlight_opts\" \"\" \"${cur##--ws-error-highlight=}\"\n+\t\treturn\n+\t\t;;\n \t--*)\n \t\t__gitcomp \"--pretty= --format= --abbrev-commit --no-abbrev-commit\n \t\t\t--oneline --show-signature\n-- \ngitgitgadget\n\n"},{"id":"478213","messageId":"cbe0c1b3e5fc0de8dd30253e8967360d2fb1f095.1686428485.git.gitgitgadget@gmail.com","threadId":"59848","inReplyTo":"pull.1543.git.1686428484.gitgitgadget@gmail.com","subject":"[PATCH 22/25] completion: move --pickaxe-{all,regex} to __git_diff_common_options","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-06-10T20:21:21Z","receivedAt":"2023-06-10T20:22:24Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"From: Philippe Blain \n\nThe options --pickaxe-all and --pickaxe-regex are listed in\n__git_diff_difftool_options and repeated in _git_log. Move them to\n__git_diff_common_options instead, which makes them available\nautomatically in the completion of other commands referencing this\nvariable.\n\nSigned-off-by: Philippe Blain \n---\n contrib/completion/git-completion.bash | 5 +++--\n 1 file changed, 3 insertions(+), 2 deletions(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex 93522558a98..8dd54fd3ae0 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1763,10 +1763,12 @@ __git_diff_common_options=\"--stat --numstat --shortstat --summary\n \t\t\t--irreversible-delete --line-prefix --no-stat\n \t\t\t--output= --output-indicator-context=\n \t\t\t--output-indicator-new= --output-indicator-old=\n+\t\t\t--ws-error-highlight=\n+\t\t\t--pickaxe-all --pickaxe-regex\n \"\n \n # Options for diff/difftool\n-__git_diff_difftool_options=\"--cached --staged --pickaxe-all --pickaxe-regex\n+__git_diff_difftool_options=\"--cached --staged\n \t\t\t--base --ours --theirs --no-index --merge-base\n \t\t\t--ita-invisible-in-index --ita-visible-in-index\n \t\t\t$__git_diff_common_options\"\n@@ -2115,7 +2117,6 @@ _git_log ()\n \t\t\t--expand-tabs --expand-tabs= --no-expand-tabs\n \t\t\t$merge\n \t\t\t$__git_diff_common_options\n-\t\t\t--pickaxe-all --pickaxe-regex\n \t\t\t\"\n \t\treturn\n \t\t;;\n-- \ngitgitgadget\n\n"},{"id":"478214","messageId":"d66068db0a4ab531fdd26b9b22a79d9bb1b5fc4c.1686428485.git.gitgitgadget@gmail.com","threadId":"59848","inReplyTo":"pull.1543.git.1686428484.gitgitgadget@gmail.com","subject":"[PATCH 24/25] completion: complete --remerge-diff","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-06-10T20:21:23Z","receivedAt":"2023-06-10T20:22:25Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"From: Philippe Blain \n\n--remerge-diff only makes sense for 'git log' and 'git show', so add it\nto __git_log_show_options which is referenced in the completion for\nthese two commands.\n\nSigned-off-by: Philippe Blain \n---\n contrib/completion/git-completion.bash | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex 7b7f3f838e0..38b6bac9154 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -2042,7 +2042,7 @@ __git_log_shortlog_options=\"\n \"\n # Options accepted by log and show\n __git_log_show_options=\"\n-\t--diff-merges --diff-merges= --no-diff-merges\n+\t--diff-merges --diff-merges= --no-diff-merges --remerge-diff\n \"\n \n __git_diff_merges_opts=\"off none on first-parent 1 separate m combined c dense-combined cc remerge r\"\n-- \ngitgitgadget\n\n"},{"id":"478215","messageId":"5dc1e541d1606807e188015ce51da4f2c7f8ff5b.1686428485.git.gitgitgadget@gmail.com","threadId":"59848","inReplyTo":"pull.1543.git.1686428484.gitgitgadget@gmail.com","subject":"[PATCH 23/25] completion: complete --diff-merges, its options and --no-diff-merges","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-06-10T20:21:22Z","receivedAt":"2023-06-10T20:22:30Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"From: Philippe Blain \n\nThe flgs --[no-]diff-merges only make sense for 'git log' and 'git\nshow', so add a new variable __git_log_show_options for options only\nrelevant to these two commands, and add them there. Also add\n__git_diff_merges_opts and list the accepted values for --diff-merges,\nand use it in _git_log and _git_show.\n\nSigned-off-by: Philippe Blain \n---\n contrib/completion/git-completion.bash | 16 ++++++++++++++++\n 1 file changed, 16 insertions(+)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex 8dd54fd3ae0..7b7f3f838e0 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -2040,6 +2040,12 @@ __git_log_shortlog_options=\"\n \t--author= --committer= --grep=\n \t--all-match --invert-grep\n \"\n+# Options accepted by log and show\n+__git_log_show_options=\"\n+\t--diff-merges --diff-merges= --no-diff-merges\n+\"\n+\n+__git_diff_merges_opts=\"off none on first-parent 1 separate m combined c dense-combined cc remerge r\"\n \n __git_log_pretty_formats=\"oneline short medium full fuller reference email raw format: tformat: mboxrd\"\n __git_log_date_formats=\"relative iso8601 iso8601-strict rfc2822 short local default human raw unix auto: format:\"\n@@ -2096,11 +2102,16 @@ _git_log ()\n \t\t__gitcomp \"sorted unsorted\" \"\" \"${cur##--no-walk=}\"\n \t\treturn\n \t\t;;\n+\t--diff-merges=*)\n+ __gitcomp \"$__git_diff_merges_opts\" \"\" \"${cur##--diff-merges=}\"\n+ return\n+ ;;\n \t--*)\n \t\t__gitcomp \"\n \t\t\t$__git_log_common_options\n \t\t\t$__git_log_shortlog_options\n \t\t\t$__git_log_gitk_options\n+\t\t\t$__git_log_show_options\n \t\t\t--root --topo-order --date-order --reverse\n \t\t\t--follow --full-diff\n \t\t\t--abbrev-commit --no-abbrev-commit --abbrev=\n@@ -3015,10 +3026,15 @@ _git_show ()\n \t\t__gitcomp \"$__git_ws_error_highlight_opts\" \"\" \"${cur##--ws-error-highlight=}\"\n \t\treturn\n \t\t;;\n+\t--diff-merges=*)\n+ __gitcomp \"$__git_diff_merges_opts\" \"\" \"${cur##--diff-merges=}\"\n+ return\n+ ;;\n \t--*)\n \t\t__gitcomp \"--pretty= --format= --abbrev-commit --no-abbrev-commit\n \t\t\t--oneline --show-signature\n \t\t\t--expand-tabs --expand-tabs= --no-expand-tabs\n+\t\t\t$__git_log_show_options\n \t\t\t$__git_diff_common_options\n \t\t\t\"\n \t\treturn\n-- \ngitgitgadget\n\n"},{"id":"478216","messageId":"93b6233f0dd89d36c0eec7a4768f8b7d22db755b.1686428485.git.gitgitgadget@gmail.com","threadId":"59848","inReplyTo":"pull.1543.git.1686428484.gitgitgadget@gmail.com","subject":"[PATCH 25/25] diff.c: mention completion above add_diff_options","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-06-10T20:21:24Z","receivedAt":"2023-06-10T20:22:31Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"From: Philippe Blain \n\nAdd a comment on top of add_diff_options, where common diff options are\nlisted, mentioning __git_diff_common_options in the completion script,\nin the hope that contributors update it when they add new diff flags.\n\nSigned-off-by: Philippe Blain \n---\n diff.c | 3 +++\n 1 file changed, 3 insertions(+)\n\ndiff --git a/diff.c b/diff.c\nindex 3c88c37908d..fda7bc91f85 100644\n--- a/diff.c\n+++ b/diff.c\n@@ -5491,6 +5491,9 @@ static int diff_opt_rotate_to(const struct option *opt, const char *arg, int uns\n \treturn 0;\n }\n \n+/* Consider adding new flags to __git_diff_common_options\n+ * in contrib/completion/git-completion.bash\n+ */\n struct option *add_diff_options(const struct option *opts,\n \t\t\t\tstruct diff_options *options)\n {\n-- \ngitgitgadget\n"},{"id":"478218","messageId":"CAPig+cQ_A1i5NNmaLUmGt+h-J0PugrFX7jkKJ=dBDg3Ygk2hJQ@mail.gmail.com","threadId":"59848","inReplyTo":"5dc1e541d1606807e188015ce51da4f2c7f8ff5b.1686428485.git.gitgitgadget@gmail.com","subject":"Re: [PATCH 23/25] completion: complete --diff-merges, its options and --no-diff-merges","fromName":"Eric Sunshine","fromEmail":"sunshine@sunshineco.com","sentAt":"2023-06-11T02:35:08Z","receivedAt":"2023-06-11T02:35:35Z","isPatch":true,"sender":{"key":"sunshine@sunshineco.com","avatar":"https://avatars.githubusercontent.com/u/163641?v=4"},"body":"On Sat, Jun 10, 2023 at 4:24 PM Philippe Blain via GitGitGadget\n wrote:\n> The flgs --[no-]diff-merges only make sense for 'git log' and 'git\n\ns/flgs/flags/\n\n> show', so add a new variable __git_log_show_options for options only\n> relevant to these two commands, and add them there. Also add\n> __git_diff_merges_opts and list the accepted values for --diff-merges,\n> and use it in _git_log and _git_show.\n>\n> Signed-off-by: Philippe Blain \n"},{"id":"478219","messageId":"CAPig+cRPrf0dQbGKDvKkTBAXVVLWX_YcGEvg6Mcwuwe3k7bLnQ@mail.gmail.com","threadId":"59848","inReplyTo":"93b6233f0dd89d36c0eec7a4768f8b7d22db755b.1686428485.git.gitgitgadget@gmail.com","subject":"Re: [PATCH 25/25] diff.c: mention completion above add_diff_options","fromName":"Eric Sunshine","fromEmail":"sunshine@sunshineco.com","sentAt":"2023-06-11T02:36:31Z","receivedAt":"2023-06-11T02:36:47Z","isPatch":true,"sender":{"key":"sunshine@sunshineco.com","avatar":"https://avatars.githubusercontent.com/u/163641?v=4"},"body":"On Sat, Jun 10, 2023 at 4:24 PM Philippe Blain via GitGitGadget\n wrote:\n> Add a comment on top of add_diff_options, where common diff options are\n> listed, mentioning __git_diff_common_options in the completion script,\n> in the hope that contributors update it when they add new diff flags.\n>\n> Signed-off-by: Philippe Blain \n> ---\n> diff --git a/diff.c b/diff.c\n> @@ -5491,6 +5491,9 @@ static int diff_opt_rotate_to(const struct option *opt, const char *arg, int uns\n> return 0;\n> }\n>\n> +/* Consider adding new flags to __git_diff_common_options\n> + * in contrib/completion/git-completion.bash\n> + */\n\nStyle:\n\n /*\n * This is a multi-line\n * comment.\n */\n"},{"id":"478222","messageId":"76eeff98-3e6c-a1dd-6498-b6d88c61fe81@gmail.com","threadId":"59848","inReplyTo":"CAPig+cQ_A1i5NNmaLUmGt+h-J0PugrFX7jkKJ=dBDg3Ygk2hJQ@mail.gmail.com","subject":"Re: [PATCH 23/25] completion: complete --diff-merges, its options and --no-diff-merges","fromName":"Philippe Blain","fromEmail":"levraiphilippeblain@gmail.com","sentAt":"2023-06-11T14:56:58Z","receivedAt":"2023-06-11T14:57:05Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"Hi Eric,\n\nLe 2023-06-10 à 22:35, Eric Sunshine a écrit :\n> On Sat, Jun 10, 2023 at 4:24 PM Philippe Blain via GitGitGadget\n> wrote:\n>> The flgs --[no-]diff-merges only make sense for 'git log' and 'git\n> \n> s/flgs/flags/\n> \n\nThanks, I fixed this as well as the styling of the comment on patch 25.\n\nPhilippe.\n"},{"id":"478256","messageId":"1a290787-9756-3d07-f95f-3915299cdb8b@gmail.com","threadId":"59848","inReplyTo":"f8246a2a581f3bb1e424da6f2cf6d8f5b377f2c6.1686428485.git.gitgitgadget@gmail.com","subject":"Re: [PATCH 21/25] completion: complete --ws-error-highlight","fromName":"Philippe Blain","fromEmail":"levraiphilippeblain@gmail.com","sentAt":"2023-06-12T12:49:21Z","receivedAt":"2023-06-12T12:49:29Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"\n\nLe 2023-06-10 à 16:21, Philippe Blain via GitGitGadget a écrit :\n> From: Philippe Blain \n\nThis is a operator mistake that has slipped in. I'll resend with correct\nauthor information. Please wait before merging this to seen. \n\nThanks,\nPhilippe.\n"},{"id":"478257","messageId":"4edabc7f15c3ad55c911919bec5a406bb48ad0ee.1686574374.git.gitgitgadget@gmail.com","threadId":"59848","inReplyTo":"pull.1543.v2.git.1686574374.gitgitgadget@gmail.com","subject":"[PATCH v2 01/25] completion: add comments describing __git_diff_* globals","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-06-12T12:52:29Z","receivedAt":"2023-06-12T12:53:21Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"From: Philippe Blain \n\nAdd descriptive comments for '__git_diff_common_options' and\n'__git_diff_difftool_options', so that it is clearer when looking at\nthese variables to know in which command's completion they are used.\n\nSigned-off-by: Philippe Blain \n---\n contrib/completion/git-completion.bash | 2 ++\n 1 file changed, 2 insertions(+)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex dc95c34cc85..90fe292459b 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1733,6 +1733,7 @@ __git_color_moved_opts=\"no default plain blocks zebra dimmed-zebra\"\n __git_color_moved_ws_opts=\"no ignore-space-at-eol ignore-space-change\n \t\t\tignore-all-space allow-indentation-change\"\n \n+# Options for the diff machinery (diff, log, show, stash, range-diff, ...)\n __git_diff_common_options=\"--stat --numstat --shortstat --summary\n \t\t\t--patch-with-stat --name-only --name-status --color\n \t\t\t--no-color --color-words --no-renames --check\n@@ -1757,6 +1758,7 @@ __git_diff_common_options=\"--stat --numstat --shortstat --summary\n \t\t\t--anchored=\n \"\n \n+# Options for diff/difftool\n __git_diff_difftool_options=\"--cached --staged --pickaxe-all --pickaxe-regex\n \t\t\t--base --ours --theirs --no-index --relative --merge-base\n \t\t\t$__git_diff_common_options\"\n-- \ngitgitgadget\n\n"},{"id":"478258","messageId":"1f3c9e8d417d2c9f16583da7609e8f322059f1f1.1686574374.git.gitgitgadget@gmail.com","threadId":"59848","inReplyTo":"pull.1543.v2.git.1686574374.gitgitgadget@gmail.com","subject":"[PATCH v2 02/25] completion: complete --break-rewrites","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-06-12T12:52:30Z","receivedAt":"2023-06-12T12:53:24Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"From: Philippe Blain \n\nSigned-off-by: Philippe Blain \n---\n contrib/completion/git-completion.bash | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex 90fe292459b..f07b00b9c68 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1753,7 +1753,7 @@ __git_diff_common_options=\"--stat --numstat --shortstat --summary\n \t\t\t--diff-algorithm=\n \t\t\t--submodule --submodule= --ignore-submodules\n \t\t\t--indent-heuristic --no-indent-heuristic\n-\t\t\t--textconv --no-textconv\n+\t\t\t--textconv --no-textconv --break-rewrites\n \t\t\t--patch --no-patch\n \t\t\t--anchored=\n \"\n-- \ngitgitgadget\n\n"},{"id":"478259","messageId":"pull.1543.v2.git.1686574374.gitgitgadget@gmail.com","threadId":"59848","inReplyTo":"pull.1543.git.1686428484.gitgitgadget@gmail.com","subject":"[PATCH v2 00/25] completion: add missing diff options","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-06-12T12:52:28Z","receivedAt":"2023-06-12T12:53:27Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"Changes since v1:\n\n * correted authorship in 21/25\n * fixed typos pointed out by Eric\n\nv1: This series adds missing diff options to the Bash completion script.\nCompletion often serves as a discovery mechanism for options, so it is\nbeneficial to users if all options are offered by the completion script.\n\nThe list of missing options was generated by:\n\n 1. Extracting all diff options from the documentation:\n \n git grep -h --no-column --only-match -e ^--[a-z][a-z-]*\n Documentation/diff-options.txt\n | sort -u > diff-options.txt\n\n 2. Searching for each option in the completion script and visually checking\n which one was missing:\n \n while read p; do echo --- $p ---; echo; git grep --color -p -e $p\n upstream/master contrib/completion/git-completion.bash done <\n diff-options.txt\n\nThe only options I left out are --skip-to and --rotate-to, since I agree\nwith their documentation: they are probably not very useful outside of their\nuse in 'git difftool'.\n\nCheers,\n\nPhilippe.\n\nPhilippe Blain (25):\n completion: add comments describing __git_diff_* globals\n completion: complete --break-rewrites\n completion: complete --cc\n completion: complete --combined-all-paths\n completion: complete --compact-summary\n completion: complete --default-prefix\n completion: complete --find-copies\n completion: complete --find-object\n completion: complete --find-renames\n completion: complete --function-context\n completion: complete --ignore-matching-lines\n completion: complete --irreversible-delete\n completion: complete --ita-invisible-in-index and\n --ita-visible-in-index\n completion: complete --line-prefix\n completion: complete --no-relative\n completion: complete --no-stat\n completion: complete --output\n completion: complete --output-indicator-{context,new,old}\n completion: complete --patch-with-raw\n completion: complete --unified\n completion: complete --ws-error-highlight\n completion: move --pickaxe-{all,regex} to __git_diff_common_options\n completion: complete --diff-merges, its options and --no-diff-merges\n completion: complete --remerge-diff\n diff.c: mention completion above add_diff_options\n\n contrib/completion/git-completion.bash | 57 ++++++++++++++++++++++----\n diff.c | 4 ++\n 2 files changed, 52 insertions(+), 9 deletions(-)\n\n\nbase-commit: fe86abd7511a9a6862d5706c6fa1d9b57a63ba09\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-1543%2Fphil-blain%2Fcompletion-common-diff-v2\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1543/phil-blain/completion-common-diff-v2\nPull-Request: https://github.com/gitgitgadget/git/pull/1543\n\nRange-diff vs v1:\n\n 1: 4edabc7f15c = 1: 4edabc7f15c completion: add comments describing __git_diff_* globals\n 2: 1f3c9e8d417 = 2: 1f3c9e8d417 completion: complete --break-rewrites\n 3: d38823dd116 = 3: d38823dd116 completion: complete --cc\n 4: 51024ee2f2c = 4: 51024ee2f2c completion: complete --combined-all-paths\n 5: 63d70d645e2 = 5: 63d70d645e2 completion: complete --compact-summary\n 6: 7296a3a8c9d = 6: 7296a3a8c9d completion: complete --default-prefix\n 7: 1f9b213cee5 = 7: 1f9b213cee5 completion: complete --find-copies\n 8: 53b1c348f82 = 8: 53b1c348f82 completion: complete --find-object\n 9: 053f9e8620a = 9: 053f9e8620a completion: complete --find-renames\n 10: 2503d990e5c = 10: 2503d990e5c completion: complete --function-context\n 11: 8bd72945a2f = 11: 8bd72945a2f completion: complete --ignore-matching-lines\n 12: 5d32e972a0c = 12: 5d32e972a0c completion: complete --irreversible-delete\n 13: fd94e9ae783 = 13: fd94e9ae783 completion: complete --ita-invisible-in-index and --ita-visible-in-index\n 14: 560ad1cd017 = 14: 560ad1cd017 completion: complete --line-prefix\n 15: d3242e1f949 = 15: d3242e1f949 completion: complete --no-relative\n 16: 0f16a466fd9 = 16: 0f16a466fd9 completion: complete --no-stat\n 17: 761c75d4aec = 17: 761c75d4aec completion: complete --output\n 18: f8d430639bc = 18: f8d430639bc completion: complete --output-indicator-{context,new,old}\n 19: 807b8201d14 = 19: 807b8201d14 completion: complete --patch-with-raw\n 20: 19507b1a210 = 20: 19507b1a210 completion: complete --unified\n 21: f8246a2a581 ! 21: c78650f215e completion: complete --ws-error-highlight\n @@\n ## Metadata ##\n -Author: Philippe Blain \n +Author: Philippe Blain \n \n ## Commit message ##\n completion: complete --ws-error-highlight\n 22: cbe0c1b3e5f = 22: 040248a3868 completion: move --pickaxe-{all,regex} to __git_diff_common_options\n 23: 5dc1e541d16 ! 23: 808e7db20cf completion: complete --diff-merges, its options and --no-diff-merges\n @@ Metadata\n ## Commit message ##\n completion: complete --diff-merges, its options and --no-diff-merges\n \n - The flgs --[no-]diff-merges only make sense for 'git log' and 'git\n + The flags --[no-]diff-merges only make sense for 'git log' and 'git\n show', so add a new variable __git_log_show_options for options only\n relevant to these two commands, and add them there. Also add\n __git_diff_merges_opts and list the accepted values for --diff-merges,\n 24: d66068db0a4 = 24: d5fc5b04b00 completion: complete --remerge-diff\n 25: 93b6233f0dd ! 25: da2cc42cbd4 diff.c: mention completion above add_diff_options\n @@ diff.c: static int diff_opt_rotate_to(const struct option *opt, const char *arg,\n \treturn 0;\n }\n \n -+/* Consider adding new flags to __git_diff_common_options\n ++/*\n ++ * Consider adding new flags to __git_diff_common_options\n + * in contrib/completion/git-completion.bash\n + */\n struct option *add_diff_options(const struct option *opts,\n\n-- \ngitgitgadget\n"},{"id":"478260","messageId":"d38823dd116e4579bbbeb96ff7b1eae8116681bb.1686574374.git.gitgitgadget@gmail.com","threadId":"59848","inReplyTo":"pull.1543.v2.git.1686574374.gitgitgadget@gmail.com","subject":"[PATCH v2 03/25] completion: complete --cc","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-06-12T12:52:31Z","receivedAt":"2023-06-12T12:53:28Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"From: Philippe Blain \n\nSigned-off-by: Philippe Blain \n---\n contrib/completion/git-completion.bash | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex f07b00b9c68..b61c54e37f7 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1754,7 +1754,7 @@ __git_diff_common_options=\"--stat --numstat --shortstat --summary\n \t\t\t--submodule --submodule= --ignore-submodules\n \t\t\t--indent-heuristic --no-indent-heuristic\n \t\t\t--textconv --no-textconv --break-rewrites\n-\t\t\t--patch --no-patch\n+\t\t\t--patch --no-patch --cc\n \t\t\t--anchored=\n \"\n \n-- \ngitgitgadget\n\n"},{"id":"478261","messageId":"51024ee2f2c4862d223e10ae4f193b8e0aeb1c60.1686574374.git.gitgitgadget@gmail.com","threadId":"59848","inReplyTo":"pull.1543.v2.git.1686574374.gitgitgadget@gmail.com","subject":"[PATCH v2 04/25] completion: complete --combined-all-paths","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-06-12T12:52:32Z","receivedAt":"2023-06-12T12:53:31Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"From: Philippe Blain \n\nSigned-off-by: Philippe Blain \n---\n contrib/completion/git-completion.bash | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex b61c54e37f7..58ce64de9e2 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1754,7 +1754,7 @@ __git_diff_common_options=\"--stat --numstat --shortstat --summary\n \t\t\t--submodule --submodule= --ignore-submodules\n \t\t\t--indent-heuristic --no-indent-heuristic\n \t\t\t--textconv --no-textconv --break-rewrites\n-\t\t\t--patch --no-patch --cc\n+\t\t\t--patch --no-patch --cc --combined-all-paths\n \t\t\t--anchored=\n \"\n \n-- \ngitgitgadget\n\n"},{"id":"478262","messageId":"7296a3a8c9da5287cca85c61af342dfc647fb2a8.1686574374.git.gitgitgadget@gmail.com","threadId":"59848","inReplyTo":"pull.1543.v2.git.1686574374.gitgitgadget@gmail.com","subject":"[PATCH v2 06/25] completion: complete --default-prefix","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-06-12T12:52:34Z","receivedAt":"2023-06-12T12:53:36Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"From: Philippe Blain \n\nSigned-off-by: Philippe Blain \n---\n contrib/completion/git-completion.bash | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex 4c43d13eef4..6af04932a0a 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1750,7 +1750,7 @@ __git_diff_common_options=\"--stat --numstat --shortstat --summary\n \t\t\t--raw --word-diff --word-diff-regex=\n \t\t\t--dirstat --dirstat= --dirstat-by-file\n \t\t\t--dirstat-by-file= --cumulative\n-\t\t\t--diff-algorithm=\n+\t\t\t--diff-algorithm= --default-prefix\n \t\t\t--submodule --submodule= --ignore-submodules\n \t\t\t--indent-heuristic --no-indent-heuristic\n \t\t\t--textconv --no-textconv --break-rewrites\n-- \ngitgitgadget\n\n"},{"id":"478263","messageId":"1f9b213cee5a4c6325c7fa9528180e46aab7805a.1686574374.git.gitgitgadget@gmail.com","threadId":"59848","inReplyTo":"pull.1543.v2.git.1686574374.gitgitgadget@gmail.com","subject":"[PATCH v2 07/25] completion: complete --find-copies","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-06-12T12:52:35Z","receivedAt":"2023-06-12T12:53:37Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"From: Philippe Blain \n\nSigned-off-by: Philippe Blain \n---\n contrib/completion/git-completion.bash | 1 +\n 1 file changed, 1 insertion(+)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex 6af04932a0a..dd6e12ad8f6 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1740,6 +1740,7 @@ __git_diff_common_options=\"--stat --numstat --shortstat --summary\n \t\t\t--color-moved --color-moved= --no-color-moved\n \t\t\t--color-moved-ws= --no-color-moved-ws\n \t\t\t--full-index --binary --abbrev --diff-filter=\n+\t\t\t--find-copies\n \t\t\t--find-copies-harder --ignore-cr-at-eol\n \t\t\t--text --ignore-space-at-eol --ignore-space-change\n \t\t\t--ignore-all-space --ignore-blank-lines --exit-code\n-- \ngitgitgadget\n\n"},{"id":"478264","messageId":"2503d990e5c7d1fb5bbf06493951204e7c00ea09.1686574374.git.gitgitgadget@gmail.com","threadId":"59848","inReplyTo":"pull.1543.v2.git.1686574374.gitgitgadget@gmail.com","subject":"[PATCH v2 10/25] completion: complete --function-context","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-06-12T12:52:38Z","receivedAt":"2023-06-12T12:53:39Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"From: Philippe Blain \n\nSigned-off-by: Philippe Blain \n---\n contrib/completion/git-completion.bash | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex 0fa86dcde6f..2610a55487b 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1746,7 +1746,7 @@ __git_diff_common_options=\"--stat --numstat --shortstat --summary\n \t\t\t--ignore-all-space --ignore-blank-lines --exit-code\n \t\t\t--quiet --ext-diff --no-ext-diff\n \t\t\t--no-prefix --src-prefix= --dst-prefix=\n-\t\t\t--inter-hunk-context=\n+\t\t\t--inter-hunk-context= --function-context\n \t\t\t--patience --histogram --minimal\n \t\t\t--raw --word-diff --word-diff-regex=\n \t\t\t--dirstat --dirstat= --dirstat-by-file\n-- \ngitgitgadget\n\n"},{"id":"478265","messageId":"53b1c348f822ca32228cdb0f40b03c9ae9ec59c8.1686574374.git.gitgitgadget@gmail.com","threadId":"59848","inReplyTo":"pull.1543.v2.git.1686574374.gitgitgadget@gmail.com","subject":"[PATCH v2 08/25] completion: complete --find-object","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-06-12T12:52:36Z","receivedAt":"2023-06-12T12:53:40Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"From: Philippe Blain \n\nSigned-off-by: Philippe Blain \n---\n contrib/completion/git-completion.bash | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex dd6e12ad8f6..392fdbedd9f 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1740,7 +1740,7 @@ __git_diff_common_options=\"--stat --numstat --shortstat --summary\n \t\t\t--color-moved --color-moved= --no-color-moved\n \t\t\t--color-moved-ws= --no-color-moved-ws\n \t\t\t--full-index --binary --abbrev --diff-filter=\n-\t\t\t--find-copies\n+\t\t\t--find-copies --find-object\n \t\t\t--find-copies-harder --ignore-cr-at-eol\n \t\t\t--text --ignore-space-at-eol --ignore-space-change\n \t\t\t--ignore-all-space --ignore-blank-lines --exit-code\n-- \ngitgitgadget\n\n"},{"id":"478266","messageId":"053f9e8620aa369f04eff8f1235eb57d15fe8755.1686574374.git.gitgitgadget@gmail.com","threadId":"59848","inReplyTo":"pull.1543.v2.git.1686574374.gitgitgadget@gmail.com","subject":"[PATCH v2 09/25] completion: complete --find-renames","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-06-12T12:52:37Z","receivedAt":"2023-06-12T12:53:42Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"From: Philippe Blain \n\nSigned-off-by: Philippe Blain \n---\n contrib/completion/git-completion.bash | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex 392fdbedd9f..0fa86dcde6f 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1740,7 +1740,7 @@ __git_diff_common_options=\"--stat --numstat --shortstat --summary\n \t\t\t--color-moved --color-moved= --no-color-moved\n \t\t\t--color-moved-ws= --no-color-moved-ws\n \t\t\t--full-index --binary --abbrev --diff-filter=\n-\t\t\t--find-copies --find-object\n+\t\t\t--find-copies --find-object --find-renames\n \t\t\t--find-copies-harder --ignore-cr-at-eol\n \t\t\t--text --ignore-space-at-eol --ignore-space-change\n \t\t\t--ignore-all-space --ignore-blank-lines --exit-code\n-- \ngitgitgadget\n\n"},{"id":"478267","messageId":"63d70d645e25a2e7f9d3dfac7f6b01c3bd27fd7e.1686574374.git.gitgitgadget@gmail.com","threadId":"59848","inReplyTo":"pull.1543.v2.git.1686574374.gitgitgadget@gmail.com","subject":"[PATCH v2 05/25] completion: complete --compact-summary","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-06-12T12:52:33Z","receivedAt":"2023-06-12T12:53:44Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"From: Philippe Blain \n\nSigned-off-by: Philippe Blain \n---\n contrib/completion/git-completion.bash | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex 58ce64de9e2..4c43d13eef4 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1755,7 +1755,7 @@ __git_diff_common_options=\"--stat --numstat --shortstat --summary\n \t\t\t--indent-heuristic --no-indent-heuristic\n \t\t\t--textconv --no-textconv --break-rewrites\n \t\t\t--patch --no-patch --cc --combined-all-paths\n-\t\t\t--anchored=\n+\t\t\t--anchored= --compact-summary\n \"\n \n # Options for diff/difftool\n-- \ngitgitgadget\n\n"},{"id":"478268","messageId":"8bd72945a2ff26c96cecc83abc07299ab51d262d.1686574374.git.gitgitgadget@gmail.com","threadId":"59848","inReplyTo":"pull.1543.v2.git.1686574374.gitgitgadget@gmail.com","subject":"[PATCH v2 11/25] completion: complete --ignore-matching-lines","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-06-12T12:52:39Z","receivedAt":"2023-06-12T12:53:47Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"From: Philippe Blain \n\nSigned-off-by: Philippe Blain \n---\n contrib/completion/git-completion.bash | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex 2610a55487b..b4d0643b049 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1756,7 +1756,7 @@ __git_diff_common_options=\"--stat --numstat --shortstat --summary\n \t\t\t--indent-heuristic --no-indent-heuristic\n \t\t\t--textconv --no-textconv --break-rewrites\n \t\t\t--patch --no-patch --cc --combined-all-paths\n-\t\t\t--anchored= --compact-summary\n+\t\t\t--anchored= --compact-summary --ignore-matching-lines=\n \"\n \n # Options for diff/difftool\n-- \ngitgitgadget\n\n"},{"id":"478269","messageId":"5d32e972a0c6e099f1d30d4a2a8cbff6e204b09e.1686574374.git.gitgitgadget@gmail.com","threadId":"59848","inReplyTo":"pull.1543.v2.git.1686574374.gitgitgadget@gmail.com","subject":"[PATCH v2 12/25] completion: complete --irreversible-delete","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-06-12T12:52:40Z","receivedAt":"2023-06-12T12:53:49Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"From: Philippe Blain \n\nSigned-off-by: Philippe Blain \n---\n contrib/completion/git-completion.bash | 1 +\n 1 file changed, 1 insertion(+)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex b4d0643b049..e74636ebe86 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1757,6 +1757,7 @@ __git_diff_common_options=\"--stat --numstat --shortstat --summary\n \t\t\t--textconv --no-textconv --break-rewrites\n \t\t\t--patch --no-patch --cc --combined-all-paths\n \t\t\t--anchored= --compact-summary --ignore-matching-lines=\n+\t\t\t--irreversible-delete\n \"\n \n # Options for diff/difftool\n-- \ngitgitgadget\n\n"},{"id":"478270","messageId":"fd94e9ae7830e98397c0f79cd3e0a519dc1fcd5f.1686574374.git.gitgitgadget@gmail.com","threadId":"59848","inReplyTo":"pull.1543.v2.git.1686574374.gitgitgadget@gmail.com","subject":"[PATCH v2 13/25] completion: complete --ita-invisible-in-index and --ita-visible-in-index","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-06-12T12:52:41Z","receivedAt":"2023-06-12T12:53:55Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"From: Philippe Blain \n\nThe options --ita-invisible-in-index and --ita-visible-in-index are\nlisted in diff-options.txt and so are included in the documentation of\ncommands which include this file (diff, diff-*, log, show, format-patch)\nbut they only make sense for diffs relating to the index. As such, add\nthem to '__git_diff_difftool_options' instead of\n'__git_diff_common_options' since it makes more sense to add them there.\n\nSigned-off-by: Philippe Blain \n---\n contrib/completion/git-completion.bash | 1 +\n 1 file changed, 1 insertion(+)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex e74636ebe86..7246ced14ad 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1763,6 +1763,7 @@ __git_diff_common_options=\"--stat --numstat --shortstat --summary\n # Options for diff/difftool\n __git_diff_difftool_options=\"--cached --staged --pickaxe-all --pickaxe-regex\n \t\t\t--base --ours --theirs --no-index --relative --merge-base\n+\t\t\t--ita-invisible-in-index --ita-visible-in-index\n \t\t\t$__git_diff_common_options\"\n \n _git_diff ()\n-- \ngitgitgadget\n\n"},{"id":"478271","messageId":"560ad1cd0179f8615dadd8b252b5c3f8cef6822e.1686574374.git.gitgitgadget@gmail.com","threadId":"59848","inReplyTo":"pull.1543.v2.git.1686574374.gitgitgadget@gmail.com","subject":"[PATCH v2 14/25] completion: complete --line-prefix","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-06-12T12:52:42Z","receivedAt":"2023-06-12T12:53:57Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"From: Philippe Blain \n\nSigned-off-by: Philippe Blain \n---\n contrib/completion/git-completion.bash | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex 7246ced14ad..13d6730f33d 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1757,7 +1757,7 @@ __git_diff_common_options=\"--stat --numstat --shortstat --summary\n \t\t\t--textconv --no-textconv --break-rewrites\n \t\t\t--patch --no-patch --cc --combined-all-paths\n \t\t\t--anchored= --compact-summary --ignore-matching-lines=\n-\t\t\t--irreversible-delete\n+\t\t\t--irreversible-delete --line-prefix\n \"\n \n # Options for diff/difftool\n-- \ngitgitgadget\n\n"},{"id":"478272","messageId":"d3242e1f949815e6c2c036146da2f5faff92d94f.1686574374.git.gitgitgadget@gmail.com","threadId":"59848","inReplyTo":"pull.1543.v2.git.1686574374.gitgitgadget@gmail.com","subject":"[PATCH v2 15/25] completion: complete --no-relative","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-06-12T12:52:43Z","receivedAt":"2023-06-12T12:54:00Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"From: Philippe Blain \n\nAdd --no-relative to __git_diff_common_options in the completion script,\nand move --relative from __git_diff_difftool_options to\n__git_diff_common_options since it applies to more than just diff and\ndifftool.\n\nSigned-off-by: Philippe Blain \n---\n contrib/completion/git-completion.bash | 3 ++-\n 1 file changed, 2 insertions(+), 1 deletion(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex 13d6730f33d..f4e773cb997 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1741,6 +1741,7 @@ __git_diff_common_options=\"--stat --numstat --shortstat --summary\n \t\t\t--color-moved-ws= --no-color-moved-ws\n \t\t\t--full-index --binary --abbrev --diff-filter=\n \t\t\t--find-copies --find-object --find-renames\n+\t\t\t--no-relative --relative\n \t\t\t--find-copies-harder --ignore-cr-at-eol\n \t\t\t--text --ignore-space-at-eol --ignore-space-change\n \t\t\t--ignore-all-space --ignore-blank-lines --exit-code\n@@ -1762,7 +1763,7 @@ __git_diff_common_options=\"--stat --numstat --shortstat --summary\n \n # Options for diff/difftool\n __git_diff_difftool_options=\"--cached --staged --pickaxe-all --pickaxe-regex\n-\t\t\t--base --ours --theirs --no-index --relative --merge-base\n+\t\t\t--base --ours --theirs --no-index --merge-base\n \t\t\t--ita-invisible-in-index --ita-visible-in-index\n \t\t\t$__git_diff_common_options\"\n \n-- \ngitgitgadget\n\n"},{"id":"478273","messageId":"0f16a466fd9bdafe0365ee9cf1bce81fc11767d1.1686574374.git.gitgitgadget@gmail.com","threadId":"59848","inReplyTo":"pull.1543.v2.git.1686574374.gitgitgadget@gmail.com","subject":"[PATCH v2 16/25] completion: complete --no-stat","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-06-12T12:52:44Z","receivedAt":"2023-06-12T12:54:01Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"From: Philippe Blain \n\nSigned-off-by: Philippe Blain \n---\n contrib/completion/git-completion.bash | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex f4e773cb997..ec2e4c9e711 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1758,7 +1758,7 @@ __git_diff_common_options=\"--stat --numstat --shortstat --summary\n \t\t\t--textconv --no-textconv --break-rewrites\n \t\t\t--patch --no-patch --cc --combined-all-paths\n \t\t\t--anchored= --compact-summary --ignore-matching-lines=\n-\t\t\t--irreversible-delete --line-prefix\n+\t\t\t--irreversible-delete --line-prefix --no-stat\n \"\n \n # Options for diff/difftool\n-- \ngitgitgadget\n\n"},{"id":"478274","messageId":"761c75d4aec988609a105db0f039ad9f15d2337e.1686574374.git.gitgitgadget@gmail.com","threadId":"59848","inReplyTo":"pull.1543.v2.git.1686574374.gitgitgadget@gmail.com","subject":"[PATCH v2 17/25] completion: complete --output","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-06-12T12:52:45Z","receivedAt":"2023-06-12T12:54:10Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"From: Philippe Blain \n\nSigned-off-by: Philippe Blain \n---\n contrib/completion/git-completion.bash | 1 +\n 1 file changed, 1 insertion(+)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex ec2e4c9e711..a34432796bf 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1759,6 +1759,7 @@ __git_diff_common_options=\"--stat --numstat --shortstat --summary\n \t\t\t--patch --no-patch --cc --combined-all-paths\n \t\t\t--anchored= --compact-summary --ignore-matching-lines=\n \t\t\t--irreversible-delete --line-prefix --no-stat\n+\t\t\t--output=\n \"\n \n # Options for diff/difftool\n-- \ngitgitgadget\n\n"},{"id":"478275","messageId":"f8d430639bcec85d822747aec161f1069255c10b.1686574374.git.gitgitgadget@gmail.com","threadId":"59848","inReplyTo":"pull.1543.v2.git.1686574374.gitgitgadget@gmail.com","subject":"[PATCH v2 18/25] completion: complete --output-indicator-{context,new,old}","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-06-12T12:52:46Z","receivedAt":"2023-06-12T12:54:28Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"From: Philippe Blain \n\nSigned-off-by: Philippe Blain \n---\n contrib/completion/git-completion.bash | 3 ++-\n 1 file changed, 2 insertions(+), 1 deletion(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex a34432796bf..a69421cd740 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1759,7 +1759,8 @@ __git_diff_common_options=\"--stat --numstat --shortstat --summary\n \t\t\t--patch --no-patch --cc --combined-all-paths\n \t\t\t--anchored= --compact-summary --ignore-matching-lines=\n \t\t\t--irreversible-delete --line-prefix --no-stat\n-\t\t\t--output=\n+\t\t\t--output= --output-indicator-context=\n+\t\t\t--output-indicator-new= --output-indicator-old=\n \"\n \n # Options for diff/difftool\n-- \ngitgitgadget\n\n"},{"id":"478276","messageId":"807b8201d145a21c629797067cee21d1d1b9a0d4.1686574374.git.gitgitgadget@gmail.com","threadId":"59848","inReplyTo":"pull.1543.v2.git.1686574374.gitgitgadget@gmail.com","subject":"[PATCH v2 19/25] completion: complete --patch-with-raw","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-06-12T12:52:47Z","receivedAt":"2023-06-12T12:54:30Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"From: Philippe Blain \n\nSigned-off-by: Philippe Blain \n---\n contrib/completion/git-completion.bash | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex a69421cd740..c0d2678d320 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1741,7 +1741,7 @@ __git_diff_common_options=\"--stat --numstat --shortstat --summary\n \t\t\t--color-moved-ws= --no-color-moved-ws\n \t\t\t--full-index --binary --abbrev --diff-filter=\n \t\t\t--find-copies --find-object --find-renames\n-\t\t\t--no-relative --relative\n+\t\t\t--no-relative --relative --patch-with-raw\n \t\t\t--find-copies-harder --ignore-cr-at-eol\n \t\t\t--text --ignore-space-at-eol --ignore-space-change\n \t\t\t--ignore-all-space --ignore-blank-lines --exit-code\n-- \ngitgitgadget\n\n"},{"id":"478277","messageId":"19507b1a2109f419ba5c628c32db46f96903e166.1686574374.git.gitgitgadget@gmail.com","threadId":"59848","inReplyTo":"pull.1543.v2.git.1686574374.gitgitgadget@gmail.com","subject":"[PATCH v2 20/25] completion: complete --unified","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-06-12T12:52:48Z","receivedAt":"2023-06-12T12:54:33Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"From: Philippe Blain \n\nSigned-off-by: Philippe Blain \n---\n contrib/completion/git-completion.bash | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex c0d2678d320..230d5807860 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1745,7 +1745,7 @@ __git_diff_common_options=\"--stat --numstat --shortstat --summary\n \t\t\t--find-copies-harder --ignore-cr-at-eol\n \t\t\t--text --ignore-space-at-eol --ignore-space-change\n \t\t\t--ignore-all-space --ignore-blank-lines --exit-code\n-\t\t\t--quiet --ext-diff --no-ext-diff\n+\t\t\t--quiet --ext-diff --no-ext-diff --unified=\n \t\t\t--no-prefix --src-prefix= --dst-prefix=\n \t\t\t--inter-hunk-context= --function-context\n \t\t\t--patience --histogram --minimal\n-- \ngitgitgadget\n\n"},{"id":"478278","messageId":"c78650f215e6f651ac66add302014f145b7dfc3a.1686574374.git.gitgitgadget@gmail.com","threadId":"59848","inReplyTo":"pull.1543.v2.git.1686574374.gitgitgadget@gmail.com","subject":"[PATCH v2 21/25] completion: complete --ws-error-highlight","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-06-12T12:52:49Z","receivedAt":"2023-06-12T12:54:35Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"From: Philippe Blain \n\nAdd --ws-error-highlight= to the list in __git_diff_common_options, and\nadd the accepted values in a new list __git_ws_error_highlight_opts.\n\nUse __git_ws_error_highlight_opts in _git_diff, _git_log and _git_show\nto offer the accepted values.\n\nAs noted in fd0bc17557 (completion: add diff --color-moved[-ws],\n2020-02-21), there is no easy way to offer completion for several\ncomma-separated values, so this is limited to completing a single\nvalue.\n\nSigned-off-by: Philippe Blain \n---\n contrib/completion/git-completion.bash | 14 ++++++++++++++\n 1 file changed, 14 insertions(+)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex 230d5807860..93522558a98 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1733,6 +1733,8 @@ __git_color_moved_opts=\"no default plain blocks zebra dimmed-zebra\"\n __git_color_moved_ws_opts=\"no ignore-space-at-eol ignore-space-change\n \t\t\tignore-all-space allow-indentation-change\"\n \n+__git_ws_error_highlight_opts=\"context old new all default\"\n+\n # Options for the diff machinery (diff, log, show, stash, range-diff, ...)\n __git_diff_common_options=\"--stat --numstat --shortstat --summary\n \t\t\t--patch-with-stat --name-only --name-status --color\n@@ -1790,6 +1792,10 @@ _git_diff ()\n \t\t__gitcomp \"$__git_color_moved_ws_opts\" \"\" \"${cur##--color-moved-ws=}\"\n \t\treturn\n \t\t;;\n+\t--ws-error-highlight=*)\n+\t\t__gitcomp \"$__git_ws_error_highlight_opts\" \"\" \"${cur##--ws-error-highlight=}\"\n+\t\treturn\n+\t\t;;\n \t--*)\n \t\t__gitcomp \"$__git_diff_difftool_options\"\n \t\treturn\n@@ -2080,6 +2086,10 @@ _git_log ()\n \t\t__gitcomp \"$__git_diff_submodule_formats\" \"\" \"${cur##--submodule=}\"\n \t\treturn\n \t\t;;\n+\t--ws-error-highlight=*)\n+\t\t__gitcomp \"$__git_ws_error_highlight_opts\" \"\" \"${cur##--ws-error-highlight=}\"\n+\t\treturn\n+\t\t;;\n \t--no-walk=*)\n \t\t__gitcomp \"sorted unsorted\" \"\" \"${cur##--no-walk=}\"\n \t\treturn\n@@ -3000,6 +3010,10 @@ _git_show ()\n \t\t__gitcomp \"$__git_color_moved_ws_opts\" \"\" \"${cur##--color-moved-ws=}\"\n \t\treturn\n \t\t;;\n+\t--ws-error-highlight=*)\n+\t\t__gitcomp \"$__git_ws_error_highlight_opts\" \"\" \"${cur##--ws-error-highlight=}\"\n+\t\treturn\n+\t\t;;\n \t--*)\n \t\t__gitcomp \"--pretty= --format= --abbrev-commit --no-abbrev-commit\n \t\t\t--oneline --show-signature\n-- \ngitgitgadget\n\n"},{"id":"478279","messageId":"040248a386899a611f7c10243a808624b53f290f.1686574374.git.gitgitgadget@gmail.com","threadId":"59848","inReplyTo":"pull.1543.v2.git.1686574374.gitgitgadget@gmail.com","subject":"[PATCH v2 22/25] completion: move --pickaxe-{all,regex} to __git_diff_common_options","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-06-12T12:52:50Z","receivedAt":"2023-06-12T12:54:36Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"From: Philippe Blain \n\nThe options --pickaxe-all and --pickaxe-regex are listed in\n__git_diff_difftool_options and repeated in _git_log. Move them to\n__git_diff_common_options instead, which makes them available\nautomatically in the completion of other commands referencing this\nvariable.\n\nSigned-off-by: Philippe Blain \n---\n contrib/completion/git-completion.bash | 5 +++--\n 1 file changed, 3 insertions(+), 2 deletions(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex 93522558a98..8dd54fd3ae0 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1763,10 +1763,12 @@ __git_diff_common_options=\"--stat --numstat --shortstat --summary\n \t\t\t--irreversible-delete --line-prefix --no-stat\n \t\t\t--output= --output-indicator-context=\n \t\t\t--output-indicator-new= --output-indicator-old=\n+\t\t\t--ws-error-highlight=\n+\t\t\t--pickaxe-all --pickaxe-regex\n \"\n \n # Options for diff/difftool\n-__git_diff_difftool_options=\"--cached --staged --pickaxe-all --pickaxe-regex\n+__git_diff_difftool_options=\"--cached --staged\n \t\t\t--base --ours --theirs --no-index --merge-base\n \t\t\t--ita-invisible-in-index --ita-visible-in-index\n \t\t\t$__git_diff_common_options\"\n@@ -2115,7 +2117,6 @@ _git_log ()\n \t\t\t--expand-tabs --expand-tabs= --no-expand-tabs\n \t\t\t$merge\n \t\t\t$__git_diff_common_options\n-\t\t\t--pickaxe-all --pickaxe-regex\n \t\t\t\"\n \t\treturn\n \t\t;;\n-- \ngitgitgadget\n\n"},{"id":"478280","messageId":"808e7db20cf92991ac4c61355bd4b22bcdeefd3f.1686574374.git.gitgitgadget@gmail.com","threadId":"59848","inReplyTo":"pull.1543.v2.git.1686574374.gitgitgadget@gmail.com","subject":"[PATCH v2 23/25] completion: complete --diff-merges, its options and --no-diff-merges","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-06-12T12:52:51Z","receivedAt":"2023-06-12T12:54:37Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"From: Philippe Blain \n\nThe flags --[no-]diff-merges only make sense for 'git log' and 'git\nshow', so add a new variable __git_log_show_options for options only\nrelevant to these two commands, and add them there. Also add\n__git_diff_merges_opts and list the accepted values for --diff-merges,\nand use it in _git_log and _git_show.\n\nSigned-off-by: Philippe Blain \n---\n contrib/completion/git-completion.bash | 16 ++++++++++++++++\n 1 file changed, 16 insertions(+)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex 8dd54fd3ae0..7b7f3f838e0 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -2040,6 +2040,12 @@ __git_log_shortlog_options=\"\n \t--author= --committer= --grep=\n \t--all-match --invert-grep\n \"\n+# Options accepted by log and show\n+__git_log_show_options=\"\n+\t--diff-merges --diff-merges= --no-diff-merges\n+\"\n+\n+__git_diff_merges_opts=\"off none on first-parent 1 separate m combined c dense-combined cc remerge r\"\n \n __git_log_pretty_formats=\"oneline short medium full fuller reference email raw format: tformat: mboxrd\"\n __git_log_date_formats=\"relative iso8601 iso8601-strict rfc2822 short local default human raw unix auto: format:\"\n@@ -2096,11 +2102,16 @@ _git_log ()\n \t\t__gitcomp \"sorted unsorted\" \"\" \"${cur##--no-walk=}\"\n \t\treturn\n \t\t;;\n+\t--diff-merges=*)\n+ __gitcomp \"$__git_diff_merges_opts\" \"\" \"${cur##--diff-merges=}\"\n+ return\n+ ;;\n \t--*)\n \t\t__gitcomp \"\n \t\t\t$__git_log_common_options\n \t\t\t$__git_log_shortlog_options\n \t\t\t$__git_log_gitk_options\n+\t\t\t$__git_log_show_options\n \t\t\t--root --topo-order --date-order --reverse\n \t\t\t--follow --full-diff\n \t\t\t--abbrev-commit --no-abbrev-commit --abbrev=\n@@ -3015,10 +3026,15 @@ _git_show ()\n \t\t__gitcomp \"$__git_ws_error_highlight_opts\" \"\" \"${cur##--ws-error-highlight=}\"\n \t\treturn\n \t\t;;\n+\t--diff-merges=*)\n+ __gitcomp \"$__git_diff_merges_opts\" \"\" \"${cur##--diff-merges=}\"\n+ return\n+ ;;\n \t--*)\n \t\t__gitcomp \"--pretty= --format= --abbrev-commit --no-abbrev-commit\n \t\t\t--oneline --show-signature\n \t\t\t--expand-tabs --expand-tabs= --no-expand-tabs\n+\t\t\t$__git_log_show_options\n \t\t\t$__git_diff_common_options\n \t\t\t\"\n \t\treturn\n-- \ngitgitgadget\n\n"},{"id":"478281","messageId":"d5fc5b04b00c863a7201b6762f5034a89adc4577.1686574374.git.gitgitgadget@gmail.com","threadId":"59848","inReplyTo":"pull.1543.v2.git.1686574374.gitgitgadget@gmail.com","subject":"[PATCH v2 24/25] completion: complete --remerge-diff","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-06-12T12:52:52Z","receivedAt":"2023-06-12T12:54:40Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"From: Philippe Blain \n\n--remerge-diff only makes sense for 'git log' and 'git show', so add it\nto __git_log_show_options which is referenced in the completion for\nthese two commands.\n\nSigned-off-by: Philippe Blain \n---\n contrib/completion/git-completion.bash | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex 7b7f3f838e0..38b6bac9154 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -2042,7 +2042,7 @@ __git_log_shortlog_options=\"\n \"\n # Options accepted by log and show\n __git_log_show_options=\"\n-\t--diff-merges --diff-merges= --no-diff-merges\n+\t--diff-merges --diff-merges= --no-diff-merges --remerge-diff\n \"\n \n __git_diff_merges_opts=\"off none on first-parent 1 separate m combined c dense-combined cc remerge r\"\n-- \ngitgitgadget\n\n"},{"id":"478282","messageId":"da2cc42cbd4d6085079e1bc2152e4503072bef90.1686574374.git.gitgitgadget@gmail.com","threadId":"59848","inReplyTo":"pull.1543.v2.git.1686574374.gitgitgadget@gmail.com","subject":"[PATCH v2 25/25] diff.c: mention completion above add_diff_options","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-06-12T12:52:53Z","receivedAt":"2023-06-12T12:54:41Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"From: Philippe Blain \n\nAdd a comment on top of add_diff_options, where common diff options are\nlisted, mentioning __git_diff_common_options in the completion script,\nin the hope that contributors update it when they add new diff flags.\n\nSigned-off-by: Philippe Blain \n---\n diff.c | 4 ++++\n 1 file changed, 4 insertions(+)\n\ndiff --git a/diff.c b/diff.c\nindex 3c88c37908d..64c93c0f0e2 100644\n--- a/diff.c\n+++ b/diff.c\n@@ -5491,6 +5491,10 @@ static int diff_opt_rotate_to(const struct option *opt, const char *arg, int uns\n \treturn 0;\n }\n \n+/*\n+ * Consider adding new flags to __git_diff_common_options\n+ * in contrib/completion/git-completion.bash\n+ */\n struct option *add_diff_options(const struct option *opts,\n \t\t\t\tstruct diff_options *options)\n {\n-- \ngitgitgadget\n"},{"id":"478311","messageId":"xmqq4jnc8iie.fsf@gitster.g","threadId":"59848","inReplyTo":"807b8201d145a21c629797067cee21d1d1b9a0d4.1686574374.git.gitgitgadget@gmail.com","subject":"Re: [PATCH v2 19/25] completion: complete --patch-with-raw","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2023-06-12T21:42:33Z","receivedAt":"2023-06-12T21:42:39Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Philippe Blain via GitGitGadget\" writes:\n\n> From: Philippe Blain \n>\n> Signed-off-by: Philippe Blain \n> ---\n> contrib/completion/git-completion.bash | 2 +-\n> 1 file changed, 1 insertion(+), 1 deletion(-)\n\nEverything else in the series looked OK, but I am not sure if we\nwant to advertise this historical wart that has no practical\nadvantage over using \"-p --raw\". The only reason why we kept it is\nbecause we do not have to even think about how likely it will break\nancient scripts if we removed it.\n\nThanks.\n\n> diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\n> index a69421cd740..c0d2678d320 100644\n> --- a/contrib/completion/git-completion.bash\n> +++ b/contrib/completion/git-completion.bash\n> @@ -1741,7 +1741,7 @@ __git_diff_common_options=\"--stat --numstat --shortstat --summary\n> \t\t\t--color-moved-ws= --no-color-moved-ws\n> \t\t\t--full-index --binary --abbrev --diff-filter=\n> \t\t\t--find-copies --find-object --find-renames\n> -\t\t\t--no-relative --relative\n> +\t\t\t--no-relative --relative --patch-with-raw\n> \t\t\t--find-copies-harder --ignore-cr-at-eol\n> \t\t\t--text --ignore-space-at-eol --ignore-space-change\n> \t\t\t--ignore-all-space --ignore-blank-lines --exit-code\n"},{"id":"478316","messageId":"5cba334c-4d75-0dac-20c6-9e3def1f224a@gmail.com","threadId":"59848","inReplyTo":"xmqq4jnc8iie.fsf@gitster.g","subject":"Re: [PATCH v2 19/25] completion: complete --patch-with-raw","fromName":"Philippe Blain","fromEmail":"levraiphilippeblain@gmail.com","sentAt":"2023-06-12T22:57:41Z","receivedAt":"2023-06-12T22:57:49Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"Hi Junio,\n\nLe 2023-06-12 à 17:42, Junio C Hamano a écrit :\n> \"Philippe Blain via GitGitGadget\" writes:\n> \n>> From: Philippe Blain \n>>\n>> Signed-off-by: Philippe Blain \n>> ---\n>> contrib/completion/git-completion.bash | 2 +-\n>> 1 file changed, 1 insertion(+), 1 deletion(-)\n> \n> Everything else in the series looked OK, but I am not sure if we\n> want to advertise this historical wart that has no practical\n> advantage over using \"-p --raw\". The only reason why we kept it is\n> because we do not have to even think about how likely it will break\n> ancient scripts if we removed it.\n> \n> Thanks.\n\nYes, I tend to agree. I can drop this one in the next version.\n\n"},{"id":"478800","messageId":"fd94e9ae7830e98397c0f79cd3e0a519dc1fcd5f.1687796689.git.gitgitgadget@gmail.com","threadId":"59848","inReplyTo":"pull.1543.v3.git.1687796688.gitgitgadget@gmail.com","subject":"[PATCH v3 13/24] completion: complete --ita-invisible-in-index and --ita-visible-in-index","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-06-26T16:24:37Z","receivedAt":"2023-06-26T16:25:32Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"From: Philippe Blain \n\nThe options --ita-invisible-in-index and --ita-visible-in-index are\nlisted in diff-options.txt and so are included in the documentation of\ncommands which include this file (diff, diff-*, log, show, format-patch)\nbut they only make sense for diffs relating to the index. As such, add\nthem to '__git_diff_difftool_options' instead of\n'__git_diff_common_options' since it makes more sense to add them there.\n\nSigned-off-by: Philippe Blain \n---\n contrib/completion/git-completion.bash | 1 +\n 1 file changed, 1 insertion(+)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex e74636ebe86..7246ced14ad 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1763,6 +1763,7 @@ __git_diff_common_options=\"--stat --numstat --shortstat --summary\n # Options for diff/difftool\n __git_diff_difftool_options=\"--cached --staged --pickaxe-all --pickaxe-regex\n \t\t\t--base --ours --theirs --no-index --relative --merge-base\n+\t\t\t--ita-invisible-in-index --ita-visible-in-index\n \t\t\t$__git_diff_common_options\"\n \n _git_diff ()\n-- \ngitgitgadget\n\n"},{"id":"478801","messageId":"d3242e1f949815e6c2c036146da2f5faff92d94f.1687796689.git.gitgitgadget@gmail.com","threadId":"59848","inReplyTo":"pull.1543.v3.git.1687796688.gitgitgadget@gmail.com","subject":"[PATCH v3 15/24] completion: complete --no-relative","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-06-26T16:24:39Z","receivedAt":"2023-06-26T16:25:33Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"From: Philippe Blain \n\nAdd --no-relative to __git_diff_common_options in the completion script,\nand move --relative from __git_diff_difftool_options to\n__git_diff_common_options since it applies to more than just diff and\ndifftool.\n\nSigned-off-by: Philippe Blain \n---\n contrib/completion/git-completion.bash | 3 ++-\n 1 file changed, 2 insertions(+), 1 deletion(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex 13d6730f33d..f4e773cb997 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1741,6 +1741,7 @@ __git_diff_common_options=\"--stat --numstat --shortstat --summary\n \t\t\t--color-moved-ws= --no-color-moved-ws\n \t\t\t--full-index --binary --abbrev --diff-filter=\n \t\t\t--find-copies --find-object --find-renames\n+\t\t\t--no-relative --relative\n \t\t\t--find-copies-harder --ignore-cr-at-eol\n \t\t\t--text --ignore-space-at-eol --ignore-space-change\n \t\t\t--ignore-all-space --ignore-blank-lines --exit-code\n@@ -1762,7 +1763,7 @@ __git_diff_common_options=\"--stat --numstat --shortstat --summary\n \n # Options for diff/difftool\n __git_diff_difftool_options=\"--cached --staged --pickaxe-all --pickaxe-regex\n-\t\t\t--base --ours --theirs --no-index --relative --merge-base\n+\t\t\t--base --ours --theirs --no-index --merge-base\n \t\t\t--ita-invisible-in-index --ita-visible-in-index\n \t\t\t$__git_diff_common_options\"\n \n-- \ngitgitgadget\n\n"},{"id":"478802","messageId":"63d70d645e25a2e7f9d3dfac7f6b01c3bd27fd7e.1687796689.git.gitgitgadget@gmail.com","threadId":"59848","inReplyTo":"pull.1543.v3.git.1687796688.gitgitgadget@gmail.com","subject":"[PATCH v3 05/24] completion: complete --compact-summary","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-06-26T16:24:29Z","receivedAt":"2023-06-26T16:25:38Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"From: Philippe Blain \n\nSigned-off-by: Philippe Blain \n---\n contrib/completion/git-completion.bash | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex 58ce64de9e2..4c43d13eef4 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1755,7 +1755,7 @@ __git_diff_common_options=\"--stat --numstat --shortstat --summary\n \t\t\t--indent-heuristic --no-indent-heuristic\n \t\t\t--textconv --no-textconv --break-rewrites\n \t\t\t--patch --no-patch --cc --combined-all-paths\n-\t\t\t--anchored=\n+\t\t\t--anchored= --compact-summary\n \"\n \n # Options for diff/difftool\n-- \ngitgitgadget\n\n"},{"id":"478803","messageId":"053f9e8620aa369f04eff8f1235eb57d15fe8755.1687796689.git.gitgitgadget@gmail.com","threadId":"59848","inReplyTo":"pull.1543.v3.git.1687796688.gitgitgadget@gmail.com","subject":"[PATCH v3 09/24] completion: complete --find-renames","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-06-26T16:24:33Z","receivedAt":"2023-06-26T16:25:40Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"From: Philippe Blain \n\nSigned-off-by: Philippe Blain \n---\n contrib/completion/git-completion.bash | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex 392fdbedd9f..0fa86dcde6f 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1740,7 +1740,7 @@ __git_diff_common_options=\"--stat --numstat --shortstat --summary\n \t\t\t--color-moved --color-moved= --no-color-moved\n \t\t\t--color-moved-ws= --no-color-moved-ws\n \t\t\t--full-index --binary --abbrev --diff-filter=\n-\t\t\t--find-copies --find-object\n+\t\t\t--find-copies --find-object --find-renames\n \t\t\t--find-copies-harder --ignore-cr-at-eol\n \t\t\t--text --ignore-space-at-eol --ignore-space-change\n \t\t\t--ignore-all-space --ignore-blank-lines --exit-code\n-- \ngitgitgadget\n\n"},{"id":"478804","messageId":"53b1c348f822ca32228cdb0f40b03c9ae9ec59c8.1687796689.git.gitgitgadget@gmail.com","threadId":"59848","inReplyTo":"pull.1543.v3.git.1687796688.gitgitgadget@gmail.com","subject":"[PATCH v3 08/24] completion: complete --find-object","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-06-26T16:24:32Z","receivedAt":"2023-06-26T16:25:44Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"From: Philippe Blain \n\nSigned-off-by: Philippe Blain \n---\n contrib/completion/git-completion.bash | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex dd6e12ad8f6..392fdbedd9f 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1740,7 +1740,7 @@ __git_diff_common_options=\"--stat --numstat --shortstat --summary\n \t\t\t--color-moved --color-moved= --no-color-moved\n \t\t\t--color-moved-ws= --no-color-moved-ws\n \t\t\t--full-index --binary --abbrev --diff-filter=\n-\t\t\t--find-copies\n+\t\t\t--find-copies --find-object\n \t\t\t--find-copies-harder --ignore-cr-at-eol\n \t\t\t--text --ignore-space-at-eol --ignore-space-change\n \t\t\t--ignore-all-space --ignore-blank-lines --exit-code\n-- \ngitgitgadget\n\n"},{"id":"478805","messageId":"4edabc7f15c3ad55c911919bec5a406bb48ad0ee.1687796689.git.gitgitgadget@gmail.com","threadId":"59848","inReplyTo":"pull.1543.v3.git.1687796688.gitgitgadget@gmail.com","subject":"[PATCH v3 01/24] completion: add comments describing __git_diff_* globals","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-06-26T16:24:25Z","receivedAt":"2023-06-26T16:25:46Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"From: Philippe Blain \n\nAdd descriptive comments for '__git_diff_common_options' and\n'__git_diff_difftool_options', so that it is clearer when looking at\nthese variables to know in which command's completion they are used.\n\nSigned-off-by: Philippe Blain \n---\n contrib/completion/git-completion.bash | 2 ++\n 1 file changed, 2 insertions(+)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex dc95c34cc85..90fe292459b 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1733,6 +1733,7 @@ __git_color_moved_opts=\"no default plain blocks zebra dimmed-zebra\"\n __git_color_moved_ws_opts=\"no ignore-space-at-eol ignore-space-change\n \t\t\tignore-all-space allow-indentation-change\"\n \n+# Options for the diff machinery (diff, log, show, stash, range-diff, ...)\n __git_diff_common_options=\"--stat --numstat --shortstat --summary\n \t\t\t--patch-with-stat --name-only --name-status --color\n \t\t\t--no-color --color-words --no-renames --check\n@@ -1757,6 +1758,7 @@ __git_diff_common_options=\"--stat --numstat --shortstat --summary\n \t\t\t--anchored=\n \"\n \n+# Options for diff/difftool\n __git_diff_difftool_options=\"--cached --staged --pickaxe-all --pickaxe-regex\n \t\t\t--base --ours --theirs --no-index --relative --merge-base\n \t\t\t$__git_diff_common_options\"\n-- \ngitgitgadget\n\n"},{"id":"478806","messageId":"560ad1cd0179f8615dadd8b252b5c3f8cef6822e.1687796689.git.gitgitgadget@gmail.com","threadId":"59848","inReplyTo":"pull.1543.v3.git.1687796688.gitgitgadget@gmail.com","subject":"[PATCH v3 14/24] completion: complete --line-prefix","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-06-26T16:24:38Z","receivedAt":"2023-06-26T16:25:48Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"From: Philippe Blain \n\nSigned-off-by: Philippe Blain \n---\n contrib/completion/git-completion.bash | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex 7246ced14ad..13d6730f33d 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1757,7 +1757,7 @@ __git_diff_common_options=\"--stat --numstat --shortstat --summary\n \t\t\t--textconv --no-textconv --break-rewrites\n \t\t\t--patch --no-patch --cc --combined-all-paths\n \t\t\t--anchored= --compact-summary --ignore-matching-lines=\n-\t\t\t--irreversible-delete\n+\t\t\t--irreversible-delete --line-prefix\n \"\n \n # Options for diff/difftool\n-- \ngitgitgadget\n\n"},{"id":"478807","messageId":"pull.1543.v3.git.1687796688.gitgitgadget@gmail.com","threadId":"59848","inReplyTo":"pull.1543.v2.git.1686574374.gitgitgadget@gmail.com","subject":"[PATCH v3 00/24] completion: add missing diff options","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-06-26T16:24:24Z","receivedAt":"2023-06-26T16:25:50Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"Changes since v2:\n\n * removed --patch-with-raw on Junio's suggestion, '-p --raw' does the exact\n same thing.\n\nChanges since v1:\n\n * correted authorship in 21/25\n * fixed typos pointed out by Eric\n\nv1: This series adds missing diff options to the Bash completion script.\nCompletion often serves as a discovery mechanism for options, so it is\nbeneficial to users if all options are offered by the completion script.\n\nThe list of missing options was generated by:\n\n 1. Extracting all diff options from the documentation:\n \n git grep -h --no-column --only-match -e ^--[a-z][a-z-]*\n Documentation/diff-options.txt\n | sort -u > diff-options.txt\n\n 2. Searching for each option in the completion script and visually checking\n which one was missing:\n \n while read p; do echo --- $p ---; echo; git grep --color -p -e $p\n upstream/master contrib/completion/git-completion.bash done <\n diff-options.txt\n\nThe only options I left out are --skip-to and --rotate-to, since I agree\nwith their documentation: they are probably not very useful outside of their\nuse in 'git difftool'.\n\nCheers,\n\nPhilippe.\n\nPhilippe Blain (24):\n completion: add comments describing __git_diff_* globals\n completion: complete --break-rewrites\n completion: complete --cc\n completion: complete --combined-all-paths\n completion: complete --compact-summary\n completion: complete --default-prefix\n completion: complete --find-copies\n completion: complete --find-object\n completion: complete --find-renames\n completion: complete --function-context\n completion: complete --ignore-matching-lines\n completion: complete --irreversible-delete\n completion: complete --ita-invisible-in-index and\n --ita-visible-in-index\n completion: complete --line-prefix\n completion: complete --no-relative\n completion: complete --no-stat\n completion: complete --output\n completion: complete --output-indicator-{context,new,old}\n completion: complete --unified\n completion: complete --ws-error-highlight\n completion: move --pickaxe-{all,regex} to __git_diff_common_options\n completion: complete --diff-merges, its options and --no-diff-merges\n completion: complete --remerge-diff\n diff.c: mention completion above add_diff_options\n\n contrib/completion/git-completion.bash | 57 ++++++++++++++++++++++----\n diff.c | 4 ++\n 2 files changed, 52 insertions(+), 9 deletions(-)\n\n\nbase-commit: fe86abd7511a9a6862d5706c6fa1d9b57a63ba09\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-1543%2Fphil-blain%2Fcompletion-common-diff-v3\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1543/phil-blain/completion-common-diff-v3\nPull-Request: https://github.com/gitgitgadget/git/pull/1543\n\nRange-diff vs v2:\n\n 1: 4edabc7f15c = 1: 4edabc7f15c completion: add comments describing __git_diff_* globals\n 2: 1f3c9e8d417 = 2: 1f3c9e8d417 completion: complete --break-rewrites\n 3: d38823dd116 = 3: d38823dd116 completion: complete --cc\n 4: 51024ee2f2c = 4: 51024ee2f2c completion: complete --combined-all-paths\n 5: 63d70d645e2 = 5: 63d70d645e2 completion: complete --compact-summary\n 6: 7296a3a8c9d = 6: 7296a3a8c9d completion: complete --default-prefix\n 7: 1f9b213cee5 = 7: 1f9b213cee5 completion: complete --find-copies\n 8: 53b1c348f82 = 8: 53b1c348f82 completion: complete --find-object\n 9: 053f9e8620a = 9: 053f9e8620a completion: complete --find-renames\n 10: 2503d990e5c = 10: 2503d990e5c completion: complete --function-context\n 11: 8bd72945a2f = 11: 8bd72945a2f completion: complete --ignore-matching-lines\n 12: 5d32e972a0c = 12: 5d32e972a0c completion: complete --irreversible-delete\n 13: fd94e9ae783 = 13: fd94e9ae783 completion: complete --ita-invisible-in-index and --ita-visible-in-index\n 14: 560ad1cd017 = 14: 560ad1cd017 completion: complete --line-prefix\n 15: d3242e1f949 = 15: d3242e1f949 completion: complete --no-relative\n 16: 0f16a466fd9 = 16: 0f16a466fd9 completion: complete --no-stat\n 17: 761c75d4aec = 17: 761c75d4aec completion: complete --output\n 18: f8d430639bc = 18: f8d430639bc completion: complete --output-indicator-{context,new,old}\n 19: 807b8201d14 < -: ----------- completion: complete --patch-with-raw\n 20: 19507b1a210 = 19: cbf2e59cbea completion: complete --unified\n 21: c78650f215e = 20: 4750951f120 completion: complete --ws-error-highlight\n 22: 040248a3868 = 21: eda4d407ded completion: move --pickaxe-{all,regex} to __git_diff_common_options\n 23: 808e7db20cf = 22: fb23869dfbb completion: complete --diff-merges, its options and --no-diff-merges\n 24: d5fc5b04b00 = 23: eb9a6a06914 completion: complete --remerge-diff\n 25: da2cc42cbd4 = 24: 47e81c2add6 diff.c: mention completion above add_diff_options\n\n-- \ngitgitgadget\n"},{"id":"478808","messageId":"2503d990e5c7d1fb5bbf06493951204e7c00ea09.1687796689.git.gitgitgadget@gmail.com","threadId":"59848","inReplyTo":"pull.1543.v3.git.1687796688.gitgitgadget@gmail.com","subject":"[PATCH v3 10/24] completion: complete --function-context","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-06-26T16:24:34Z","receivedAt":"2023-06-26T16:25:52Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"From: Philippe Blain \n\nSigned-off-by: Philippe Blain \n---\n contrib/completion/git-completion.bash | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex 0fa86dcde6f..2610a55487b 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1746,7 +1746,7 @@ __git_diff_common_options=\"--stat --numstat --shortstat --summary\n \t\t\t--ignore-all-space --ignore-blank-lines --exit-code\n \t\t\t--quiet --ext-diff --no-ext-diff\n \t\t\t--no-prefix --src-prefix= --dst-prefix=\n-\t\t\t--inter-hunk-context=\n+\t\t\t--inter-hunk-context= --function-context\n \t\t\t--patience --histogram --minimal\n \t\t\t--raw --word-diff --word-diff-regex=\n \t\t\t--dirstat --dirstat= --dirstat-by-file\n-- \ngitgitgadget\n\n"},{"id":"478809","messageId":"1f9b213cee5a4c6325c7fa9528180e46aab7805a.1687796689.git.gitgitgadget@gmail.com","threadId":"59848","inReplyTo":"pull.1543.v3.git.1687796688.gitgitgadget@gmail.com","subject":"[PATCH v3 07/24] completion: complete --find-copies","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-06-26T16:24:31Z","receivedAt":"2023-06-26T16:25:54Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"From: Philippe Blain \n\nSigned-off-by: Philippe Blain \n---\n contrib/completion/git-completion.bash | 1 +\n 1 file changed, 1 insertion(+)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex 6af04932a0a..dd6e12ad8f6 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1740,6 +1740,7 @@ __git_diff_common_options=\"--stat --numstat --shortstat --summary\n \t\t\t--color-moved --color-moved= --no-color-moved\n \t\t\t--color-moved-ws= --no-color-moved-ws\n \t\t\t--full-index --binary --abbrev --diff-filter=\n+\t\t\t--find-copies\n \t\t\t--find-copies-harder --ignore-cr-at-eol\n \t\t\t--text --ignore-space-at-eol --ignore-space-change\n \t\t\t--ignore-all-space --ignore-blank-lines --exit-code\n-- \ngitgitgadget\n\n"},{"id":"478810","messageId":"1f3c9e8d417d2c9f16583da7609e8f322059f1f1.1687796689.git.gitgitgadget@gmail.com","threadId":"59848","inReplyTo":"pull.1543.v3.git.1687796688.gitgitgadget@gmail.com","subject":"[PATCH v3 02/24] completion: complete --break-rewrites","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-06-26T16:24:26Z","receivedAt":"2023-06-26T16:25:56Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"From: Philippe Blain \n\nSigned-off-by: Philippe Blain \n---\n contrib/completion/git-completion.bash | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex 90fe292459b..f07b00b9c68 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1753,7 +1753,7 @@ __git_diff_common_options=\"--stat --numstat --shortstat --summary\n \t\t\t--diff-algorithm=\n \t\t\t--submodule --submodule= --ignore-submodules\n \t\t\t--indent-heuristic --no-indent-heuristic\n-\t\t\t--textconv --no-textconv\n+\t\t\t--textconv --no-textconv --break-rewrites\n \t\t\t--patch --no-patch\n \t\t\t--anchored=\n \"\n-- \ngitgitgadget\n\n"},{"id":"478811","messageId":"cbf2e59cbea00e631637958efd964a004af0efba.1687796689.git.gitgitgadget@gmail.com","threadId":"59848","inReplyTo":"pull.1543.v3.git.1687796688.gitgitgadget@gmail.com","subject":"[PATCH v3 19/24] completion: complete --unified","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-06-26T16:24:43Z","receivedAt":"2023-06-26T16:25:57Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"From: Philippe Blain \n\nSigned-off-by: Philippe Blain \n---\n contrib/completion/git-completion.bash | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex a69421cd740..7babd95d844 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1745,7 +1745,7 @@ __git_diff_common_options=\"--stat --numstat --shortstat --summary\n \t\t\t--find-copies-harder --ignore-cr-at-eol\n \t\t\t--text --ignore-space-at-eol --ignore-space-change\n \t\t\t--ignore-all-space --ignore-blank-lines --exit-code\n-\t\t\t--quiet --ext-diff --no-ext-diff\n+\t\t\t--quiet --ext-diff --no-ext-diff --unified=\n \t\t\t--no-prefix --src-prefix= --dst-prefix=\n \t\t\t--inter-hunk-context= --function-context\n \t\t\t--patience --histogram --minimal\n-- \ngitgitgadget\n\n"},{"id":"478812","messageId":"0f16a466fd9bdafe0365ee9cf1bce81fc11767d1.1687796689.git.gitgitgadget@gmail.com","threadId":"59848","inReplyTo":"pull.1543.v3.git.1687796688.gitgitgadget@gmail.com","subject":"[PATCH v3 16/24] completion: complete --no-stat","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-06-26T16:24:40Z","receivedAt":"2023-06-26T16:26:00Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"From: Philippe Blain \n\nSigned-off-by: Philippe Blain \n---\n contrib/completion/git-completion.bash | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex f4e773cb997..ec2e4c9e711 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1758,7 +1758,7 @@ __git_diff_common_options=\"--stat --numstat --shortstat --summary\n \t\t\t--textconv --no-textconv --break-rewrites\n \t\t\t--patch --no-patch --cc --combined-all-paths\n \t\t\t--anchored= --compact-summary --ignore-matching-lines=\n-\t\t\t--irreversible-delete --line-prefix\n+\t\t\t--irreversible-delete --line-prefix --no-stat\n \"\n \n # Options for diff/difftool\n-- \ngitgitgadget\n\n"},{"id":"478813","messageId":"5d32e972a0c6e099f1d30d4a2a8cbff6e204b09e.1687796689.git.gitgitgadget@gmail.com","threadId":"59848","inReplyTo":"pull.1543.v3.git.1687796688.gitgitgadget@gmail.com","subject":"[PATCH v3 12/24] completion: complete --irreversible-delete","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-06-26T16:24:36Z","receivedAt":"2023-06-26T16:26:02Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"From: Philippe Blain \n\nSigned-off-by: Philippe Blain \n---\n contrib/completion/git-completion.bash | 1 +\n 1 file changed, 1 insertion(+)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex b4d0643b049..e74636ebe86 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1757,6 +1757,7 @@ __git_diff_common_options=\"--stat --numstat --shortstat --summary\n \t\t\t--textconv --no-textconv --break-rewrites\n \t\t\t--patch --no-patch --cc --combined-all-paths\n \t\t\t--anchored= --compact-summary --ignore-matching-lines=\n+\t\t\t--irreversible-delete\n \"\n \n # Options for diff/difftool\n-- \ngitgitgadget\n\n"},{"id":"478814","messageId":"7296a3a8c9da5287cca85c61af342dfc647fb2a8.1687796689.git.gitgitgadget@gmail.com","threadId":"59848","inReplyTo":"pull.1543.v3.git.1687796688.gitgitgadget@gmail.com","subject":"[PATCH v3 06/24] completion: complete --default-prefix","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-06-26T16:24:30Z","receivedAt":"2023-06-26T16:26:04Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"From: Philippe Blain \n\nSigned-off-by: Philippe Blain \n---\n contrib/completion/git-completion.bash | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex 4c43d13eef4..6af04932a0a 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1750,7 +1750,7 @@ __git_diff_common_options=\"--stat --numstat --shortstat --summary\n \t\t\t--raw --word-diff --word-diff-regex=\n \t\t\t--dirstat --dirstat= --dirstat-by-file\n \t\t\t--dirstat-by-file= --cumulative\n-\t\t\t--diff-algorithm=\n+\t\t\t--diff-algorithm= --default-prefix\n \t\t\t--submodule --submodule= --ignore-submodules\n \t\t\t--indent-heuristic --no-indent-heuristic\n \t\t\t--textconv --no-textconv --break-rewrites\n-- \ngitgitgadget\n\n"},{"id":"478815","messageId":"f8d430639bcec85d822747aec161f1069255c10b.1687796689.git.gitgitgadget@gmail.com","threadId":"59848","inReplyTo":"pull.1543.v3.git.1687796688.gitgitgadget@gmail.com","subject":"[PATCH v3 18/24] completion: complete --output-indicator-{context,new,old}","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-06-26T16:24:42Z","receivedAt":"2023-06-26T16:26:06Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"From: Philippe Blain \n\nSigned-off-by: Philippe Blain \n---\n contrib/completion/git-completion.bash | 3 ++-\n 1 file changed, 2 insertions(+), 1 deletion(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex a34432796bf..a69421cd740 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1759,7 +1759,8 @@ __git_diff_common_options=\"--stat --numstat --shortstat --summary\n \t\t\t--patch --no-patch --cc --combined-all-paths\n \t\t\t--anchored= --compact-summary --ignore-matching-lines=\n \t\t\t--irreversible-delete --line-prefix --no-stat\n-\t\t\t--output=\n+\t\t\t--output= --output-indicator-context=\n+\t\t\t--output-indicator-new= --output-indicator-old=\n \"\n \n # Options for diff/difftool\n-- \ngitgitgadget\n\n"},{"id":"478816","messageId":"d38823dd116e4579bbbeb96ff7b1eae8116681bb.1687796689.git.gitgitgadget@gmail.com","threadId":"59848","inReplyTo":"pull.1543.v3.git.1687796688.gitgitgadget@gmail.com","subject":"[PATCH v3 03/24] completion: complete --cc","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-06-26T16:24:27Z","receivedAt":"2023-06-26T16:26:07Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"From: Philippe Blain \n\nSigned-off-by: Philippe Blain \n---\n contrib/completion/git-completion.bash | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex f07b00b9c68..b61c54e37f7 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1754,7 +1754,7 @@ __git_diff_common_options=\"--stat --numstat --shortstat --summary\n \t\t\t--submodule --submodule= --ignore-submodules\n \t\t\t--indent-heuristic --no-indent-heuristic\n \t\t\t--textconv --no-textconv --break-rewrites\n-\t\t\t--patch --no-patch\n+\t\t\t--patch --no-patch --cc\n \t\t\t--anchored=\n \"\n \n-- \ngitgitgadget\n\n"},{"id":"478817","messageId":"51024ee2f2c4862d223e10ae4f193b8e0aeb1c60.1687796689.git.gitgitgadget@gmail.com","threadId":"59848","inReplyTo":"pull.1543.v3.git.1687796688.gitgitgadget@gmail.com","subject":"[PATCH v3 04/24] completion: complete --combined-all-paths","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-06-26T16:24:28Z","receivedAt":"2023-06-26T16:26:10Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"From: Philippe Blain \n\nSigned-off-by: Philippe Blain \n---\n contrib/completion/git-completion.bash | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex b61c54e37f7..58ce64de9e2 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1754,7 +1754,7 @@ __git_diff_common_options=\"--stat --numstat --shortstat --summary\n \t\t\t--submodule --submodule= --ignore-submodules\n \t\t\t--indent-heuristic --no-indent-heuristic\n \t\t\t--textconv --no-textconv --break-rewrites\n-\t\t\t--patch --no-patch --cc\n+\t\t\t--patch --no-patch --cc --combined-all-paths\n \t\t\t--anchored=\n \"\n \n-- \ngitgitgadget\n\n"},{"id":"478818","messageId":"4750951f1209b6c8fb1e84e00dcf4072b051a418.1687796689.git.gitgitgadget@gmail.com","threadId":"59848","inReplyTo":"pull.1543.v3.git.1687796688.gitgitgadget@gmail.com","subject":"[PATCH v3 20/24] completion: complete --ws-error-highlight","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-06-26T16:24:44Z","receivedAt":"2023-06-26T16:26:13Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"From: Philippe Blain \n\nAdd --ws-error-highlight= to the list in __git_diff_common_options, and\nadd the accepted values in a new list __git_ws_error_highlight_opts.\n\nUse __git_ws_error_highlight_opts in _git_diff, _git_log and _git_show\nto offer the accepted values.\n\nAs noted in fd0bc17557 (completion: add diff --color-moved[-ws],\n2020-02-21), there is no easy way to offer completion for several\ncomma-separated values, so this is limited to completing a single\nvalue.\n\nSigned-off-by: Philippe Blain \n---\n contrib/completion/git-completion.bash | 14 ++++++++++++++\n 1 file changed, 14 insertions(+)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex 7babd95d844..9de33ed05da 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1733,6 +1733,8 @@ __git_color_moved_opts=\"no default plain blocks zebra dimmed-zebra\"\n __git_color_moved_ws_opts=\"no ignore-space-at-eol ignore-space-change\n \t\t\tignore-all-space allow-indentation-change\"\n \n+__git_ws_error_highlight_opts=\"context old new all default\"\n+\n # Options for the diff machinery (diff, log, show, stash, range-diff, ...)\n __git_diff_common_options=\"--stat --numstat --shortstat --summary\n \t\t\t--patch-with-stat --name-only --name-status --color\n@@ -1790,6 +1792,10 @@ _git_diff ()\n \t\t__gitcomp \"$__git_color_moved_ws_opts\" \"\" \"${cur##--color-moved-ws=}\"\n \t\treturn\n \t\t;;\n+\t--ws-error-highlight=*)\n+\t\t__gitcomp \"$__git_ws_error_highlight_opts\" \"\" \"${cur##--ws-error-highlight=}\"\n+\t\treturn\n+\t\t;;\n \t--*)\n \t\t__gitcomp \"$__git_diff_difftool_options\"\n \t\treturn\n@@ -2080,6 +2086,10 @@ _git_log ()\n \t\t__gitcomp \"$__git_diff_submodule_formats\" \"\" \"${cur##--submodule=}\"\n \t\treturn\n \t\t;;\n+\t--ws-error-highlight=*)\n+\t\t__gitcomp \"$__git_ws_error_highlight_opts\" \"\" \"${cur##--ws-error-highlight=}\"\n+\t\treturn\n+\t\t;;\n \t--no-walk=*)\n \t\t__gitcomp \"sorted unsorted\" \"\" \"${cur##--no-walk=}\"\n \t\treturn\n@@ -3000,6 +3010,10 @@ _git_show ()\n \t\t__gitcomp \"$__git_color_moved_ws_opts\" \"\" \"${cur##--color-moved-ws=}\"\n \t\treturn\n \t\t;;\n+\t--ws-error-highlight=*)\n+\t\t__gitcomp \"$__git_ws_error_highlight_opts\" \"\" \"${cur##--ws-error-highlight=}\"\n+\t\treturn\n+\t\t;;\n \t--*)\n \t\t__gitcomp \"--pretty= --format= --abbrev-commit --no-abbrev-commit\n \t\t\t--oneline --show-signature\n-- \ngitgitgadget\n\n"},{"id":"478819","messageId":"fb23869dfbb6d7846322bd69a78ab4118b5af3a7.1687796689.git.gitgitgadget@gmail.com","threadId":"59848","inReplyTo":"pull.1543.v3.git.1687796688.gitgitgadget@gmail.com","subject":"[PATCH v3 22/24] completion: complete --diff-merges, its options and --no-diff-merges","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-06-26T16:24:46Z","receivedAt":"2023-06-26T16:26:14Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"From: Philippe Blain \n\nThe flags --[no-]diff-merges only make sense for 'git log' and 'git\nshow', so add a new variable __git_log_show_options for options only\nrelevant to these two commands, and add them there. Also add\n__git_diff_merges_opts and list the accepted values for --diff-merges,\nand use it in _git_log and _git_show.\n\nSigned-off-by: Philippe Blain \n---\n contrib/completion/git-completion.bash | 16 ++++++++++++++++\n 1 file changed, 16 insertions(+)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex 5b8e7b810c8..8688f7c433c 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -2040,6 +2040,12 @@ __git_log_shortlog_options=\"\n \t--author= --committer= --grep=\n \t--all-match --invert-grep\n \"\n+# Options accepted by log and show\n+__git_log_show_options=\"\n+\t--diff-merges --diff-merges= --no-diff-merges\n+\"\n+\n+__git_diff_merges_opts=\"off none on first-parent 1 separate m combined c dense-combined cc remerge r\"\n \n __git_log_pretty_formats=\"oneline short medium full fuller reference email raw format: tformat: mboxrd\"\n __git_log_date_formats=\"relative iso8601 iso8601-strict rfc2822 short local default human raw unix auto: format:\"\n@@ -2096,11 +2102,16 @@ _git_log ()\n \t\t__gitcomp \"sorted unsorted\" \"\" \"${cur##--no-walk=}\"\n \t\treturn\n \t\t;;\n+\t--diff-merges=*)\n+ __gitcomp \"$__git_diff_merges_opts\" \"\" \"${cur##--diff-merges=}\"\n+ return\n+ ;;\n \t--*)\n \t\t__gitcomp \"\n \t\t\t$__git_log_common_options\n \t\t\t$__git_log_shortlog_options\n \t\t\t$__git_log_gitk_options\n+\t\t\t$__git_log_show_options\n \t\t\t--root --topo-order --date-order --reverse\n \t\t\t--follow --full-diff\n \t\t\t--abbrev-commit --no-abbrev-commit --abbrev=\n@@ -3015,10 +3026,15 @@ _git_show ()\n \t\t__gitcomp \"$__git_ws_error_highlight_opts\" \"\" \"${cur##--ws-error-highlight=}\"\n \t\treturn\n \t\t;;\n+\t--diff-merges=*)\n+ __gitcomp \"$__git_diff_merges_opts\" \"\" \"${cur##--diff-merges=}\"\n+ return\n+ ;;\n \t--*)\n \t\t__gitcomp \"--pretty= --format= --abbrev-commit --no-abbrev-commit\n \t\t\t--oneline --show-signature\n \t\t\t--expand-tabs --expand-tabs= --no-expand-tabs\n+\t\t\t$__git_log_show_options\n \t\t\t$__git_diff_common_options\n \t\t\t\"\n \t\treturn\n-- \ngitgitgadget\n\n"},{"id":"478820","messageId":"eb9a6a069147b5664a636095f398e3aac2e90dbf.1687796689.git.gitgitgadget@gmail.com","threadId":"59848","inReplyTo":"pull.1543.v3.git.1687796688.gitgitgadget@gmail.com","subject":"[PATCH v3 23/24] completion: complete --remerge-diff","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-06-26T16:24:47Z","receivedAt":"2023-06-26T16:26:15Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"From: Philippe Blain \n\n--remerge-diff only makes sense for 'git log' and 'git show', so add it\nto __git_log_show_options which is referenced in the completion for\nthese two commands.\n\nSigned-off-by: Philippe Blain \n---\n contrib/completion/git-completion.bash | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex 8688f7c433c..11f2edf47be 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -2042,7 +2042,7 @@ __git_log_shortlog_options=\"\n \"\n # Options accepted by log and show\n __git_log_show_options=\"\n-\t--diff-merges --diff-merges= --no-diff-merges\n+\t--diff-merges --diff-merges= --no-diff-merges --remerge-diff\n \"\n \n __git_diff_merges_opts=\"off none on first-parent 1 separate m combined c dense-combined cc remerge r\"\n-- \ngitgitgadget\n\n"},{"id":"478821","messageId":"47e81c2add6bad8ca5adf40fb13935bb1e5fd533.1687796689.git.gitgitgadget@gmail.com","threadId":"59848","inReplyTo":"pull.1543.v3.git.1687796688.gitgitgadget@gmail.com","subject":"[PATCH v3 24/24] diff.c: mention completion above add_diff_options","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-06-26T16:24:48Z","receivedAt":"2023-06-26T16:26:16Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"From: Philippe Blain \n\nAdd a comment on top of add_diff_options, where common diff options are\nlisted, mentioning __git_diff_common_options in the completion script,\nin the hope that contributors update it when they add new diff flags.\n\nSigned-off-by: Philippe Blain \n---\n diff.c | 4 ++++\n 1 file changed, 4 insertions(+)\n\ndiff --git a/diff.c b/diff.c\nindex 3c88c37908d..64c93c0f0e2 100644\n--- a/diff.c\n+++ b/diff.c\n@@ -5491,6 +5491,10 @@ static int diff_opt_rotate_to(const struct option *opt, const char *arg, int uns\n \treturn 0;\n }\n \n+/*\n+ * Consider adding new flags to __git_diff_common_options\n+ * in contrib/completion/git-completion.bash\n+ */\n struct option *add_diff_options(const struct option *opts,\n \t\t\t\tstruct diff_options *options)\n {\n-- \ngitgitgadget\n"},{"id":"478822","messageId":"eda4d407ded2f2189d9a7ea26fd49775afff5df0.1687796689.git.gitgitgadget@gmail.com","threadId":"59848","inReplyTo":"pull.1543.v3.git.1687796688.gitgitgadget@gmail.com","subject":"[PATCH v3 21/24] completion: move --pickaxe-{all,regex} to __git_diff_common_options","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-06-26T16:24:45Z","receivedAt":"2023-06-26T16:26:18Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"From: Philippe Blain \n\nThe options --pickaxe-all and --pickaxe-regex are listed in\n__git_diff_difftool_options and repeated in _git_log. Move them to\n__git_diff_common_options instead, which makes them available\nautomatically in the completion of other commands referencing this\nvariable.\n\nSigned-off-by: Philippe Blain \n---\n contrib/completion/git-completion.bash | 5 +++--\n 1 file changed, 3 insertions(+), 2 deletions(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex 9de33ed05da..5b8e7b810c8 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1763,10 +1763,12 @@ __git_diff_common_options=\"--stat --numstat --shortstat --summary\n \t\t\t--irreversible-delete --line-prefix --no-stat\n \t\t\t--output= --output-indicator-context=\n \t\t\t--output-indicator-new= --output-indicator-old=\n+\t\t\t--ws-error-highlight=\n+\t\t\t--pickaxe-all --pickaxe-regex\n \"\n \n # Options for diff/difftool\n-__git_diff_difftool_options=\"--cached --staged --pickaxe-all --pickaxe-regex\n+__git_diff_difftool_options=\"--cached --staged\n \t\t\t--base --ours --theirs --no-index --merge-base\n \t\t\t--ita-invisible-in-index --ita-visible-in-index\n \t\t\t$__git_diff_common_options\"\n@@ -2115,7 +2117,6 @@ _git_log ()\n \t\t\t--expand-tabs --expand-tabs= --no-expand-tabs\n \t\t\t$merge\n \t\t\t$__git_diff_common_options\n-\t\t\t--pickaxe-all --pickaxe-regex\n \t\t\t\"\n \t\treturn\n \t\t;;\n-- \ngitgitgadget\n\n"},{"id":"478823","messageId":"8bd72945a2ff26c96cecc83abc07299ab51d262d.1687796689.git.gitgitgadget@gmail.com","threadId":"59848","inReplyTo":"pull.1543.v3.git.1687796688.gitgitgadget@gmail.com","subject":"[PATCH v3 11/24] completion: complete --ignore-matching-lines","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-06-26T16:24:35Z","receivedAt":"2023-06-26T16:26:50Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"From: Philippe Blain \n\nSigned-off-by: Philippe Blain \n---\n contrib/completion/git-completion.bash | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex 2610a55487b..b4d0643b049 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1756,7 +1756,7 @@ __git_diff_common_options=\"--stat --numstat --shortstat --summary\n \t\t\t--indent-heuristic --no-indent-heuristic\n \t\t\t--textconv --no-textconv --break-rewrites\n \t\t\t--patch --no-patch --cc --combined-all-paths\n-\t\t\t--anchored= --compact-summary\n+\t\t\t--anchored= --compact-summary --ignore-matching-lines=\n \"\n \n # Options for diff/difftool\n-- \ngitgitgadget\n\n"},{"id":"478824","messageId":"761c75d4aec988609a105db0f039ad9f15d2337e.1687796689.git.gitgitgadget@gmail.com","threadId":"59848","inReplyTo":"pull.1543.v3.git.1687796688.gitgitgadget@gmail.com","subject":"[PATCH v3 17/24] completion: complete --output","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-06-26T16:24:41Z","receivedAt":"2023-06-26T16:26:52Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"From: Philippe Blain \n\nSigned-off-by: Philippe Blain \n---\n contrib/completion/git-completion.bash | 1 +\n 1 file changed, 1 insertion(+)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex ec2e4c9e711..a34432796bf 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1759,6 +1759,7 @@ __git_diff_common_options=\"--stat --numstat --shortstat --summary\n \t\t\t--patch --no-patch --cc --combined-all-paths\n \t\t\t--anchored= --compact-summary --ignore-matching-lines=\n \t\t\t--irreversible-delete --line-prefix --no-stat\n+\t\t\t--output=\n \"\n \n # Options for diff/difftool\n-- \ngitgitgadget\n\n"}]}