Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

merge trunk #4995

Open
wants to merge 31 commits into
base: cp/fzf-lib-scoping
Choose a base branch
from
Open

merge trunk #4995

wants to merge 31 commits into from

Commits on May 8, 2024

  1. pull up where we load a git-pulled branch into memory

    @mitchellwrosen
    mitchellwrosen committed May 8, 2024
    Configuration menu
    Copy the full SHA
    6dcd616 View commit details
    Browse the repository at this point in the history

Commits on May 9, 2024

  1. separate importing code from loading branches

    @mitchellwrosen
    mitchellwrosen committed May 9, 2024
    Configuration menu
    Copy the full SHA
    cc4a91a View commit details
    Browse the repository at this point in the history

Commits on May 13, 2024

  1. merge work

    @mitchellwrosen
    mitchellwrosen committed May 13, 2024
    Configuration menu
    Copy the full SHA
    9a0ef3d View commit details
    Browse the repository at this point in the history

  2. explicitly ignore ignored return values

    @mitchellwrosen
    mitchellwrosen committed May 13, 2024
    Configuration menu
    Copy the full SHA
    aee317a View commit details
    Browse the repository at this point in the history

  3. ⅄ trunk → topic/merge5

    @mitchellwrosen
    mitchellwrosen committed May 13, 2024
    Configuration menu
    Copy the full SHA
    3813bfb View commit details
    Browse the repository at this point in the history

  4. ⅄ topic/merge4 → topic/merge5

    @mitchellwrosen
    mitchellwrosen committed May 13, 2024
    Configuration menu
    Copy the full SHA
    9daaa8d View commit details
    Browse the repository at this point in the history

  5. merge work

    @mitchellwrosen
    mitchellwrosen committed May 13, 2024
    Configuration menu
    Copy the full SHA
    3e0e10e View commit details
    Browse the repository at this point in the history

Commits on May 14, 2024

  1. merge work (not compiling)

    @mitchellwrosen
    mitchellwrosen committed May 14, 2024
    Configuration menu
    Copy the full SHA
    a77c10a View commit details
    Browse the repository at this point in the history

  2. fix compiler error

    @mitchellwrosen
    mitchellwrosen committed May 14, 2024
    Configuration menu
    Copy the full SHA
    88f4ff1 View commit details
    Browse the repository at this point in the history

  3. fix up undefineds

    @mitchellwrosen
    mitchellwrosen committed May 14, 2024
    Configuration menu
    Copy the full SHA
    5dcf56d View commit details
    Browse the repository at this point in the history

  4. regenerate merge.md output

    @mitchellwrosen
    mitchellwrosen committed May 14, 2024
    Configuration menu
    Copy the full SHA
    f80b07d View commit details
    Browse the repository at this point in the history

  5. begin forming merge API for pull to call

    @mitchellwrosen
    mitchellwrosen committed May 14, 2024
    Configuration menu
    Copy the full SHA
    af71ab2 View commit details
    Browse the repository at this point in the history

  6. make pull perform a new merge, not an old merge

    @mitchellwrosen
    mitchellwrosen committed May 14, 2024
    Configuration menu
    Copy the full SHA
    75e0e3c View commit details
    Browse the repository at this point in the history

  7. slightly better error messages

    @mitchellwrosen
    mitchellwrosen committed May 14, 2024
    Configuration menu
    Copy the full SHA
    06b743a View commit details
    Browse the repository at this point in the history

Commits on May 16, 2024

  1. ⅄ trunk → topic/merge5

    @mitchellwrosen
    mitchellwrosen committed May 16, 2024
    Configuration menu
    Copy the full SHA
    b9a45d5 View commit details
    Browse the repository at this point in the history

  2. disallow pulling into an arbitrary path

    @mitchellwrosen
    mitchellwrosen committed May 16, 2024
    Configuration menu
    Copy the full SHA
    1ccb978 View commit details
    Browse the repository at this point in the history

Commits on May 17, 2024

  1. make pull call new merge instead of old merge

    @mitchellwrosen
    mitchellwrosen committed May 17, 2024
    Configuration menu
    Copy the full SHA
    bc54e4d View commit details
    Browse the repository at this point in the history

  2. fix warning error and remove unused PinBoard code

    @mitchellwrosen
    mitchellwrosen committed May 17, 2024
    Configuration menu
    Copy the full SHA
    3b8bdf5 View commit details
    Browse the repository at this point in the history

  3. ⅄ trunk → topic/merge5

    @mitchellwrosen
    mitchellwrosen committed May 17, 2024
    Configuration menu
    Copy the full SHA
    acf34b6 View commit details
    Browse the repository at this point in the history

  4. revert removing ApplicativeDo from default extensions because apparently 

    we spookily rely on it! fragile! wow!
    @mitchellwrosen
    mitchellwrosen committed May 17, 2024
    Configuration menu
    Copy the full SHA
    9d7fe1f View commit details
    Browse the repository at this point in the history

Commits on May 19, 2024

  1. improve pull error messages

    @mitchellwrosen
    mitchellwrosen committed May 19, 2024
    Configuration menu
    Copy the full SHA
    0c622f8 View commit details
    Browse the repository at this point in the history

Commits on May 20, 2024

  1. slightly improve help lib.install

    @mitchellwrosen
    mitchellwrosen committed May 20, 2024
    Configuration menu
    Copy the full SHA
    cbed387 View commit details
    Browse the repository at this point in the history

  2. fix typo

    @mitchellwrosen
    mitchellwrosen committed May 20, 2024
    Configuration menu
    Copy the full SHA
    d9bc18f View commit details
    Browse the repository at this point in the history

  3. Merge pull request #4966 from unisonweb/topic/merge5

    @aryairani
    aryairani committed May 20, 2024
    Configuration menu
    Copy the full SHA
    2ec8e01 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #4972 from unisonweb/install-help

    @aryairani
    aryairani committed May 20, 2024
    Configuration menu
    Copy the full SHA
    6197d4c View commit details
    Browse the repository at this point in the history

  5. improve push output

    @mitchellwrosen
    mitchellwrosen committed May 20, 2024
    Configuration menu
    Copy the full SHA
    2a21ed5 View commit details
    Browse the repository at this point in the history

Commits on May 21, 2024

  1. remove unused incoming hashes event

    @ChrisPenner
    ChrisPenner committed May 21, 2024
    Configuration menu
    Copy the full SHA
    d7077c9 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #4991 from unisonweb/cp/unused-event

    @aryairani
    aryairani committed May 21, 2024
    Configuration menu
    Copy the full SHA
    1b5fda3 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #4990 from unisonweb/24-05-20-better-push-output

    @aryairani
    aryairani committed May 21, 2024
    Configuration menu
    Copy the full SHA
    9fc96ed View commit details
    Browse the repository at this point in the history

  4. merge trunk

    @aryairani
    aryairani committed May 21, 2024
    Configuration menu
    Copy the full SHA
    1eadc3b View commit details
    Browse the repository at this point in the history

  5. Merge branch 'trunk' into fzf-lib-scoping-merge

    @aryairani
    aryairani committed May 21, 2024
    Configuration menu
    Copy the full SHA
    8922548 View commit details
    Browse the repository at this point in the history