threads / patch / 34250

patchcompletion: complete rebase --edit-todo

Subject: [PATCH] completion: complete rebase --edit-todo

## tl;dr

2 messages between Jun 22, 2013 and Jun 22, 2013. Diffs are folded; open one to read it.

replies: 1people: 1as markdown or json

Ramkumar Ramachandra· Jun 22, 2013, 08:03 UTC · lore

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
---
 contrib/completion/git-completion.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Show changes to contrib/completion/git-completion.bash +1 −1

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index fd9a1d5..43c6226 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1624,7 +1624,7 @@ _git_rebase ()
 			--preserve-merges --stat --no-stat
 			--committer-date-is-author-date --ignore-date
 			--ignore-whitespace --whitespace=
-			--autosquash
+			--autosquash --edit-todo
 			"
 
 		return

-- 
1.8.3.1.487.gd3dfebf.dirty

Ramkumar Ramachandra· Jun 22, 2013, 11:53 UTC · re: Ramkumar Ramachandra · lore

[PATCH v2] completion: complete rebase --edit-todo

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
---
 contrib/completion/git-completion.bash | 4 ++++
 1 file changed, 4 insertions(+)

Show changes to contrib/completion/git-completion.bash +4 −0

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 6c3bafe..b51c9e3 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1609,6 +1609,10 @@ _git_rebase ()
 {
 	local dir="$(__gitdir)"
 	if [ -d "$dir"/rebase-apply ] || [ -d "$dir"/rebase-merge ]; then
+		if [ -e "$dir"/rebase-merge/interactive ]; then
+			__gitcomp "--continue --skip --abort --edit-todo"
+			return
+		fi
 		__gitcomp "--continue --skip --abort"
 		return
 	fi

-- 
1.8.3.1.487.g3e7a5b4.dirty