Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: textmate/shellscript.tmbundle
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: die-antwort/shellscript.tmbundle
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Able to merge. These branches can be automatically merged.
2 contributors

Commits on Aug 30, 2013

  1. Send 'clear' after cd'ing to dir in Open Terminal command.

    @noniq
    noniq committed Aug 30, 2013
    Copy the full SHA
    bebf0f5 View commit details

  2. Make 'Open Terminal' open a new terminal tab.

    @noniq
    noniq committed Aug 30, 2013
    Copy the full SHA
    70e86de View commit details

  3. Remove keybinding for 'Execute Line and Replace With Result'. 

    We use ^R for RSpec (run in terminal), instead.
    @noniq
    noniq committed Aug 30, 2013
    Copy the full SHA
    f22ca01 View commit details

Commits on Feb 18, 2014

  1. Merge remote-tracking branch 'upstream/master'

    @noniq
    noniq committed Feb 18, 2014
    Copy the full SHA
    16da10a View commit details

Commits on Feb 22, 2014

  1. Merge remote-tracking branch 'upstream/master'

    @noniq
    noniq committed Feb 22, 2014
    Copy the full SHA
    72125d3 View commit details

Commits on Feb 23, 2014

  1. Use ⇧^H for “Documentation for Word”. 

    ^H now used by DashMate.
    @noniq
    noniq committed Feb 23, 2014
    Copy the full SHA
    8d7e4ab View commit details

Commits on May 22, 2014

  1. Merge remote-tracking branch 'upstream/master'

    @noniq
    noniq committed May 22, 2014
    Copy the full SHA
    713cf26 View commit details

Commits on Jun 20, 2014

  1. Merge remote-tracking branch 'upstream/master'

    @noniq
    noniq committed Jun 20, 2014
    Copy the full SHA
    be3a030 View commit details

Commits on Jul 9, 2014

  1. Merge remote-tracking branch 'upstream/master'

    @noniq
    noniq committed Jul 9, 2014
    Copy the full SHA
    fc526cd View commit details

Commits on Jul 31, 2014

  1. Merge remote-tracking branch 'upstream/master'

    @noniq
    noniq committed Jul 31, 2014
    Copy the full SHA
    8584562 View commit details

Commits on Aug 18, 2014

  1. Merge remote-tracking branch 'upstream/master'

    @noniq
    noniq committed Aug 18, 2014
    Copy the full SHA
    19f0669 View commit details

  2. Rest “Open directory in Terminal” to upstream. 

    Upstream now defaults to open a new tab, so no need for a customized version anymore \o/
    @noniq
    noniq committed Aug 18, 2014
    Copy the full SHA
    efbb658 View commit details

Commits on Nov 9, 2014

  1. Merge remote-tracking branch 'upstream/master'

    @noniq
    noniq committed Nov 9, 2014
    Copy the full SHA
    f073fed View commit details

Commits on Jan 15, 2016

  1. Inject into scope meta.embedded_bash (for use in Markdown code blocks).

    @noniq
    noniq committed Jan 15, 2016
    Copy the full SHA
    a9c05ef View commit details

Commits on Mar 8, 2016

  1. Merge remote-tracking branch 'upstream/master'

    @noniq
    noniq committed Mar 8, 2016
    Copy the full SHA
    4b227c7 View commit details

Commits on May 30, 2016

  1. Merge remote-tracking branch 'upstream/master'

    @noniq
    noniq committed May 30, 2016
    Copy the full SHA
    e257337 View commit details

Commits on Jul 16, 2016

  1. Merge remote-tracking branch 'upstream/master'

    @noniq
    noniq committed Jul 16, 2016
    Copy the full SHA
    f6defb6 View commit details

  2. Merge branch 'master' into upstream-tmp 

    This merge was done with `-s ours`, so it effectively resets our master to upstream/master.

We’ll then cherry-pick the few commits that are still relevant from our master branch to reapply them.
    @noniq
    noniq committed Jul 16, 2016
    Copy the full SHA
    0e69547 View commit details

  3. Remove keybinding for 'Execute Line and Replace With Result'. 

    We use ^R for RSpec (run in terminal), instead.
    @noniq
    noniq committed Jul 16, 2016
    Copy the full SHA
    9acbd91 View commit details

  4. Use ⇧^H for “Documentation for Word”. 

    ^H now used by DashMate.
    @noniq
    noniq committed Jul 16, 2016
    Copy the full SHA
    47cf94b View commit details

  5. Inject into scope meta.embedded_bash (for use in Markdown code blocks).

    @noniq
    noniq committed Jul 16, 2016
    Copy the full SHA
    74dfde4 View commit details

Commits on Aug 16, 2016

  1. Merge remote-tracking branch 'upstream/master'

    @noniq
    noniq committed Aug 16, 2016
    Copy the full SHA
    e46c0c4 View commit details

Commits on Sep 26, 2016

  1. Merge remote-tracking branch 'upstream/master'

    @noniq
    noniq committed Sep 26, 2016
    Copy the full SHA
    02c314d View commit details

Commits on Jan 28, 2017

  1. Merge remote-tracking branch 'upstream/master'

    @noniq
    noniq committed Jan 28, 2017
    Copy the full SHA
    ce40ee4 View commit details

Commits on Feb 16, 2017

  1. Merge remote-tracking branch 'upstream/master'

    @noniq
    noniq committed Feb 16, 2017
    Copy the full SHA
    a38daaa View commit details

Commits on Apr 13, 2017

  1. Merge remote-tracking branch 'upstream/master'

    @noniq
    noniq committed Apr 13, 2017
    Copy the full SHA
    dee8954 View commit details

Commits on Aug 20, 2017

  1. Merge branch 'improve-open-directory-in-tab'

    @noniq
    noniq committed Aug 20, 2017
    Copy the full SHA
    b472505 View commit details

Commits on Sep 6, 2017

  1. Merge remote-tracking branch 'upstream/master'

    @noniq
    noniq committed Sep 6, 2017
    Copy the full SHA
    9d9136d View commit details

Commits on Nov 19, 2017

  1. Merge remote-tracking branch 'upstream/master'

    @noniq
    noniq committed Nov 19, 2017
    Copy the full SHA
    bef8e85 View commit details

Commits on Feb 27, 2018

  1. Fix “Run in Terminal” for macOS High Sierra 

    It seems that in High Sierra, `count tabs` for the Terminal app always returns 1 (probably a bug?). So this can no longer be used for checking if the new tab is ready.

Instead we now wait until the content of the visible tab has changed, which seems to work fine
    @noniq
    noniq committed Feb 27, 2018
    Copy the full SHA
    59e0379 View commit details

Commits on Mar 12, 2018

  1. Merge remote-tracking branch 'upstream/master'

    @noniq
    noniq committed Mar 12, 2018
    Copy the full SHA
    d1b2fa7 View commit details

Commits on Jul 24, 2018

  1. Merge remote-tracking branch 'upstream/master' into reset-to-upstream

    @noniq
    noniq committed Jul 24, 2018
    Copy the full SHA
    1431b81 View commit details

  2. Merge branch 'master' into reset-to-upstream

    @noniq
    noniq committed Jul 24, 2018
    Copy the full SHA
    66f3745 View commit details

  3. Remove keybinding for 'Execute Line and Replace With Result'. 

    We use ^R for RSpec (run in terminal), instead.
    @noniq
    noniq committed Jul 24, 2018
    Copy the full SHA
    5301fe0 View commit details

  4. Use ⇧^H for “Documentation for Word”. 

    ^H now used by DashMate.
    @noniq
    noniq committed Jul 24, 2018
    Copy the full SHA
    840d3bf View commit details
Showing with 1 addition and 3 deletions.
  1. +0 −2 Commands/Execute Line and Replace With Result.tmCommand
  2. +1 −1 Commands/man.plist
2 changes: 0 additions & 2 deletions Commands/Execute Line and Replace With Result.tmCommand
View file
Original file line number Diff line number Diff line change
@@ -16,8 +16,6 @@ echo -n "${res%"${res##*[![:space:]]}"}"
<string>selection</string>
<key>inputFormat</key>
<string>text</string>
<key>keyEquivalent</key>
<string>^~r</string>
<key>name</key>
<string>Execute Line / Selection and Replace With Result</string>
<key>outputCaret</key>
2 changes: 1 addition & 1 deletion Commands/man.plist
View file
Original file line number Diff line number Diff line change
@@ -48,7 +48,7 @@ fi
<key>inputFormat</key>
<string>text</string>
<key>keyEquivalent</key>
<string>^h</string>
<string>^H</string>
<key>name</key>
<string>Documentation for Word / Selection</string>
<key>outputCaret</key>