Permalink
Commits on Jan 22, 2019
  1. Merge pull request #688 from shijinglu/merge_with_bare

    novalis committed Jan 22, 2019
    Add a 'merge-bare' subcommand that allows for merging under bare repo…
  2. Address review comments, add --no-ff option, update unit tests accord…

    shijinglu committed Jan 17, 2019
    …ingly
Commits on Jan 8, 2019
  1. Make the simple change logic clearer

    shijinglu committed Jan 8, 2019
Commits on Jan 3, 2019
  1. Address @novalis's comment

    shijinglu committed Jan 3, 2019
Commits on Dec 31, 2018
  1. Add a 'merge-bare' subcommand that allows for merging under bare repo…

    shijinglu committed Dec 29, 2018
    …sitory
Commits on Nov 10, 2018
  1. Merge pull request #687 from shijinglu/fix_rm_overmatch

    shijinglu committed Nov 10, 2018
    Fix git-meta rm path overmatching issue
Commits on Nov 9, 2018
  1. improve the check logic as per suggested

    shijinglu committed Nov 9, 2018
  2. Fix git-meta rm path overmatching issue

    shijinglu committed Nov 9, 2018
Commits on Nov 7, 2018
  1. Merge pull request #686 from novalis/thread-safety

    novalis committed Nov 7, 2018
    restore thread safety
  2. restore thread safety

    novalis committed Nov 7, 2018
Commits on Nov 6, 2018
  1. Merge pull request #685 from novalis/ffwd

    novalis committed Nov 6, 2018
    simplify handling of no-ff ffwd merges (and make them actually work)
Commits on Nov 2, 2018
  1. Merge pull request #684 from jhedwardyang/push-ignore-missing

    jhedwardyang committed Nov 2, 2018
    Repositories must be available (open or absorbed) if pushing.
Commits on Oct 31, 2018
  1. Repositories must be available (open or absorbed) if pushing.

    jhedwardyang committed Oct 31, 2018
Commits on Oct 25, 2018
  1. Merge pull request #682 from jhedwardyang/push-optimize

    jhedwardyang committed Oct 25, 2018
    Optimize Push logic to compare against remote refs to determine what to push
Commits on Oct 24, 2018
  1. Remove dead code.

    jhedwardyang committed Oct 23, 2018
Commits on Oct 23, 2018
  1. Fix small typo.

    jhedwardyang committed Oct 23, 2018
  2. Merge pull request #681 from twosigma/abliss-typo-1

    bpeabody committed Oct 23, 2018
    Fix typo in architecture.md
  3. Fix typo in architecture.md

    abliss committed Oct 23, 2018
Commits on Oct 22, 2018
  1. #678 fix git meta creates empty commits issue (#679)

    shijinglu authored and novalis committed Oct 22, 2018
    * #678 fix git meta creates empty commits issue
    
    * Address @novalis's comments
Commits on Oct 18, 2018
  1. Merge pull request #677 from jhedwardyang/passthrough

    jhedwardyang committed Oct 18, 2018
    Use concat properly.
  2. Use concat properly.

    jhedwardyang committed Oct 18, 2018
Commits on Oct 17, 2018
  1. Merge pull request #676 from jhedwardyang/passthrough

    jhedwardyang committed Oct 17, 2018
    Fixes #499 Do not pass -C to git unless in a git meta clone.
Commits on Oct 16, 2018
  1. Do not pass -C to git unless in a git meta clone.

    jhedwardyang committed Oct 16, 2018
  2. Merge pull request #675 from jhedwardyang/speedup-git-meta

    jhedwardyang committed Oct 16, 2018
    Module import optimizations to git-meta
  3. Remove dead code.

    jhedwardyang committed Oct 16, 2018
  4. Optimize git meta root and forward command.

    jhedwardyang committed Oct 16, 2018
    Both the forward command and root command currently load NodeGit
    for no specific reason. Removing this loading and breaking out
    non-NodeGit utility methods makes these commands significantly faster.
  5. Wait until completion of argparse to load NodeGit.

    jhedwardyang committed Oct 16, 2018
    Loading NodeGit causes an additional several hundred ms to argparse output
    and validation of flags. Instead, lazily load NodeGit after it has completed
    to speed up fatals and help calls.
  6. Modules are lazily loaded, however some managed to sneak in without

    jhedwardyang committed Oct 16, 2018
    being noticed causing some additional slowness.
Commits on Oct 5, 2018
  1. optimize synthetic branch check

    novalis committed Oct 4, 2018
  2. 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