summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--Completion/Unix/Command/_git3
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 234f26f11..67129de6e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2015-10-25 Daniel Shahaf <d.s@daniel.shahaf.name>
+ * 36959: Completion/Unix/Command/_git: _git: Offer @~$n as
+ completion of recent commits.
+
* 36958: Completion/Unix/Command/_git: _git: Fix recent commit
completion descriptions.
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index 279331b00..740aec4cd 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -5695,13 +5695,14 @@ __git_recent_commits () {
else
label="[HEAD~$distance_from_head]"
fi
+ descr+=("@~${distance_from_head}":"${label} $k") # CROSSREF: use the same label as below
# Prepare for the next first-parent-ancestry commit.
(( ++distance_from_head ))
next_first_parent_ancestral_line_commit=${parents%% *}
fi
# label is now 9 bytes, so the descriptions ($k) will be aligned.
- descr+=($i:"${label} $k")
+ descr+=($i:"${label} $k") # CROSSREF: use the same label as above
j=${${j# \(}%\)} # strip leading ' (' and trailing ')'
j=${j/ ->/,} # Convert " -> master, origin/master".