Skip to content
Permalink
Branch: master
Commits on Mar 26, 2019
  1. Merge pull request #698 from bpeabody/fix-pull-rebase-deduction

    bpeabody committed Mar 26, 2019
    Fix rebase deduction logic in pull.
Commits on Mar 6, 2019
  1. Fix rebase deduction logic in pull.

    bpeabody committed Mar 6, 2019
    I think there must have been a change in the way argparse handles
    defaults, and where previously we were getting an `undefined` we are now
    getting a `null`.
Commits on Feb 15, 2019
  1. Merge pull request #693 from shijinglu/bugfix_merge

    bpeabody committed Feb 15, 2019
    Fix merge command
Commits on Oct 23, 2018
  1. Merge pull request #681 from twosigma/abliss-typo-1

    bpeabody committed Oct 23, 2018
    Fix typo in architecture.md
Commits on Oct 5, 2018
  1. Merge pull request #671 from bpeabody/fix-destitch-repo

    bpeabody committed Oct 5, 2018
    Use normal routine to find repo for destitch
Commits on Oct 4, 2018
  1. Use normal routine to find repo for destitch

    bpeabody committed Oct 4, 2018
    The normal git-meta way isn't needed (we're not in a meta-repo) and
    doesn't work if you're using worktrees.
  2. Merge pull request #672 from bpeabody/fix-get-current-repo

    bpeabody committed Oct 4, 2018
    Fix `getCurrentRepo` to recognize non-sub gitlinks
  3. Fix `getCurrentRepo` to recognize non-sub gitlinks

    bpeabody committed Oct 4, 2018
    So that it will do the right thing in a worktree.
Commits on Oct 3, 2018
  1. Merge pull request #670 from blevz/add-stash-apply-to-help-text

    bpeabody committed Oct 3, 2018
    Add stash apply to help text
Commits on Sep 28, 2018
  1. Merge pull request #669 from bpeabody/destitch

    bpeabody committed Sep 28, 2018
    stop over-sharding
Commits on Sep 27, 2018
  1. stop over-sharding

    bpeabody committed Sep 27, 2018
  2. Merge pull request #665 from bpeabody/destitch

    bpeabody committed Sep 27, 2018
    stitching and destitching
  3. Shard bulk note writes, can now read sharded notes

    bpeabody committed Sep 27, 2018
  4. Improved performance, functionality of stitch

    bpeabody committed Sep 26, 2018
    * cache reading of submodule changes, in memory and on disk
    * bulk read and write notes when necessary
    * option to always bulk read when, e.g., doing a large operation
    * whitelist
  5. Merge pull request #668 from twosigma/better-push

    bpeabody committed Sep 27, 2018
    Better logic to compute which submodules to push
  6. Better logic to compute which submodules to push

    bpeabody committed Sep 27, 2018
    The previous logic was to rule out pushing submodules if their current
    commits (or their descendants) existed in one of a set of relevant
    branches (e.g., tracking branches).  The downside of this strategy was
    that we couldn't deduce parent-child relationships of submodule commits
    that didn't exist locally.
    
    The new strategy is to include as candidates only submodules that were
    not changed between the commit being pushed and any of the (merge bases
    of the) candidate branches.
    
    Also fixed a bug where we were not constructing the ref name of a
    tracking branch correctly.
Commits on Sep 26, 2018
  1. Added `GitUtil.getReference`

    bpeabody committed Sep 26, 2018
  2. Fixed bug when adding files to removed directory

    bpeabody committed Sep 25, 2018
    Need to make sure we don't base it off of the original tree.
Commits on Sep 18, 2018
  1. Merge pull request #660 from bpeabody/stitch

    bpeabody committed Sep 18, 2018
    Initial implementation of tool to stitch repos
  2. Initial implementation of tool to stitch repos

    bpeabody committed Oct 4, 2017
    standalone script in `lib/stitch.js`
Commits on Sep 16, 2018
  1. Whoops, restore tracking of temp files

    bpeabody committed Sep 16, 2018
    so they qre automatically cleaned up
Commits on Aug 23, 2018
  1. Merge pull request #659 from novalis/sig

    bpeabody committed Aug 23, 2018
    missed defaultSignature calls
Commits on Aug 15, 2018
  1. Merge pull request #649 from twosigma/better-merge-error

    bpeabody committed Aug 15, 2018
    Better error when merge invoked with no args
  2. Better error when merge invoked with no args

    bpeabody committed Aug 15, 2018
    ... and there is no tracking info for the current branch.
Commits on Aug 13, 2018
  1. Merge pull request #647 from zokir/hook_disabled_buffering

    bpeabody committed Aug 13, 2018
    Added stderr and disabled buffering in hooks
Commits on Aug 10, 2018
  1. Merge pull request #648 from twosigma/faster-amend

    bpeabody committed Aug 10, 2018
    Optimize amend when many open repos
  2. Optimize amend when many open repos

    bpeabody committed Aug 10, 2018
    Don't grab the repo for a submodule unless we're sure we need it.
Commits on Jul 25, 2018
  1. Merge pull request #640 from bpeabody/fix-architecture-typos

    bpeabody committed Jul 25, 2018
    fixed typos in architecture.md
  2. fixed typos in architecture.md

    bpeabody committed Jul 25, 2018
Commits on Jul 24, 2018
  1. Merge pull request #638 from bpeabody/fix-repo-description

    bpeabody committed Jul 24, 2018
    Fix inaccuracies in description of `git-repo` tool
Commits on Jul 23, 2018
  1. Fix inaccuracies in description of `git-repo` tool

    bpeabody committed Jul 23, 2018
    Addresses: #634
Commits on Jul 9, 2018
  1. Merge pull request #625 from novalis/no-shell

    bpeabody committed Jul 9, 2018
    do not screw up escaping on shell commands
Older
You can’t perform that action at this time.