summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorr-obert <robert@jazzonmymind.xyz>2017-07-16 00:37:43 +0100
committerr-obert <robert@jazzonmymind.xyz>2017-07-16 00:37:43 +0100
commit9715da2ea0b01a068c276df7a3e9858d3668794a (patch)
tree19d8f7d56d4fbbac78c13ef4f5f964f474fbfc21
parent4ba21483f9efa888e99e275ab6c1e975f04f5d66 (diff)
parentbeaad80d0c1c1bf81ee464cdf9ae9a9e9b38c1df (diff)
downloadpry-9715da2ea0b01a068c276df7a3e9858d3668794a.tar.gz
Merge branch 'master' into string_literal_methods_completion
-rw-r--r--CHANGELOG.md1
-rw-r--r--lib/pry/commands/whereami.rb1
2 files changed, 2 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6369dca1..39ce0da4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
### HEAD
+* Add alias 'whereami[?!]+' for 'whereami' command. ([#1597](https://github.com/pry/pry/pull/1597))
* Improve Ruby 2.4 support ([#1611](https://github.com/pry/pry/pull/1611)):
* Deprecated constants are hidden from `ls` output by default, use the `-d` switch to see them.
* Fix warnings that originate in Pry while using the repl.
diff --git a/lib/pry/commands/whereami.rb b/lib/pry/commands/whereami.rb
index d7c1eeca..810f407f 100644
--- a/lib/pry/commands/whereami.rb
+++ b/lib/pry/commands/whereami.rb
@@ -193,4 +193,5 @@ class Pry
Pry::Commands.add_command(Pry::Command::Whereami)
Pry::Commands.alias_command '@', 'whereami'
+ Pry::Commands.alias_command /whereami[!?]+/, 'whereami'
end