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: andsens/homeshick Loading
base: master
Choose a base ref
...
head repository: antontsv/homeshick Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 20 commits
  • 13 files changed
  • 1 contributor

Commits on Aug 15, 2016

  1. Add castle root mode when repository root is used instead of home/ 

        Files are symlinked directry from repository root, instead of
    a home/ subdirectory under root.

    Use HOMESHICK_USE_CASTLE_ROOT for clone and generate to enable
    this mode on per castle basis
    @antontsv
    antontsv committed Aug 15, 2016
    Configuration menu
    Copy the full SHA
    a2fe048 View commit details
    Browse the repository at this point in the history

  2. Allow to exclude symlinking of files base on git exclude patterns 

        HOMESHICK_IGNORE environment variable with comma-separated
    exclude patterns will add entries to .git/info/exclude

    Excluded files will be ignored during symlink step, but still
    can be checked into the repository
    @antontsv
    antontsv committed Aug 15, 2016
    Configuration menu
    Copy the full SHA
    2136eba View commit details
    Browse the repository at this point in the history

  3. Make sure HOMESHICK_USE_CASTLE_ROOT is truthy before changing the mode

    @antontsv
    antontsv committed Aug 15, 2016
    Configuration menu
    Copy the full SHA
    723535f View commit details
    Browse the repository at this point in the history

  4. Use HOMESHICK_CLONE_BRANCH env var to clone specific branch

    @antontsv
    antontsv committed Aug 15, 2016
    Configuration menu
    Copy the full SHA
    dc42a3f View commit details
    Browse the repository at this point in the history

  5. Store homeshick config values in local castle .git/config

    @antontsv
    antontsv committed Aug 15, 2016
    Configuration menu
    Copy the full SHA
    96a8379 View commit details
    Browse the repository at this point in the history

  6. Rollback if git-pull fails, both merge and rebase style 

        It would be inconvenient if live symlinked files will stop
    working due to git-merge conflict markers added to those files,
    so if pull fails we make sure display a message and rollback
    files to a pre-pull state
    @antontsv
    antontsv committed Aug 15, 2016
    Configuration menu
    Copy the full SHA
    d72bdcf View commit details
    Browse the repository at this point in the history

  7. Propagate castle root mode into submodule script

    @antontsv
    antontsv committed Aug 15, 2016
    Configuration menu
    Copy the full SHA
    8a5deea View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2016

  1. Do a check for HOMESHICK_CLONE_BRANCH before checking out a branch

    @antontsv
    antontsv committed Aug 26, 2016
    Configuration menu
    Copy the full SHA
    9a0d420 View commit details
    Browse the repository at this point in the history

  2. Build statuses for both origin and fork

    @antontsv
    antontsv committed Aug 26, 2016
    Configuration menu
    Copy the full SHA
    bbbcef9 View commit details
    Browse the repository at this point in the history

  3. Get rid of underscore in biuld status label

    @antontsv
    antontsv committed Aug 26, 2016
    Configuration menu
    Copy the full SHA
    edc0ae8 View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2016

  1. Force relative submodule paths if git prior to v1.7.10 is used 

      Older git versions create absolute paths, making it hard to move
  and rename directories for git projects
    @antontsv
    antontsv committed Oct 25, 2016
    Configuration menu
    Copy the full SHA
    70041bd View commit details
    Browse the repository at this point in the history

  2. Correct vim-related typos

    @antontsv
    antontsv committed Oct 25, 2016
    Configuration menu
    Copy the full SHA
    c91fddf View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2017

  1. Use "." as default path for git ls-files 

     Otherwise git may show warning:
 warning: empty strings as pathspecs will be made invalid in upcoming
 releases. please use . instead if you meant to match all paths
    @antontsv
    antontsv committed Jan 19, 2017
    Configuration menu
    Copy the full SHA
    84fa2f2 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'andsens/master'

    @antontsv
    antontsv committed Jan 19, 2017
    Configuration menu
    Copy the full SHA
    ed3866f View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2020

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

    @antontsv
    antontsv committed Mar 15, 2020
    Configuration menu
    Copy the full SHA
    3d79c06 View commit details
    Browse the repository at this point in the history

  2. Fix SC2155 in link.sh

    @antontsv
    antontsv committed Mar 15, 2020
    Configuration menu
    Copy the full SHA
    d662f5e View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2020

  1. Verify new commit signature on pull, before merging it

    @antontsv
    antontsv committed Mar 16, 2020
    Configuration menu
    Copy the full SHA
    6df3cc2 View commit details
    Browse the repository at this point in the history

  2. If trusted key file is present - enforce signature check on pull

    @antontsv
    antontsv committed Mar 16, 2020
    Configuration menu
    Copy the full SHA
    c643eb9 View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2020

  1. Add fork change in README, LICENSE changes same as original code

    @antontsv
    antontsv committed Mar 21, 2020
    Configuration menu
    Copy the full SHA
    ca6226c View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2022

  1. Use git ls-files -c

    @antontsv
    antontsv committed Oct 13, 2022
    Configuration menu
    Copy the full SHA
    587813d View commit details
    Browse the repository at this point in the history
Loading