Permalink
Branch: master
Commits on Feb 7, 2019
  1. Merge pull request #690 from shijinglu/merge_refactor

    novalis committed Feb 7, 2019
    Allow normal merge to operate on bare and half opened repos
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…
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 Oct 5, 2018
  1. optimize synthetic branch check

    novalis committed Oct 4, 2018
Commits on Aug 23, 2018
  1. missed defaultSignature calls

    novalis committed Aug 23, 2018
  2. test

    novalis committed Aug 23, 2018
  3. replace NodeGit.Repository.defaultSignature with our own function

    novalis committed Aug 23, 2018
    NodeGit's occasionally returns unknown@example.com, for unknown
    reasons, and this is bad.
  4. Revert "dumb fix for color output to pipes"

    novalis committed Aug 21, 2018
    This reverts commit 4883e15.
Commits on Aug 22, 2018
  1. Merge pull request #656 from blevz/turn-off-gc-in-subrepos

    novalis committed Aug 22, 2018
    Turn off GC in submodules on open
Commits on Aug 21, 2018
  1. dumb fix for color output to pipes

    novalis committed Aug 21, 2018
  2. remove deleted files from submodule index

    novalis committed Aug 16, 2018
Commits on Aug 16, 2018
  1. irrelevant non-commitable changes should not cause commits to fail

    novalis committed Aug 16, 2018
Commits on Jul 31, 2018
  1. Merge pull request #644 from novalis/more-checkout

    novalis committed Jul 31, 2018
    fix checkout --
Commits on Jul 30, 2018
  1. fix checkout --

    novalis committed Jul 30, 2018
Commits on Jul 26, 2018
  1. Merge pull request #642 from novalis/nonexisten-branch

    novalis committed Jul 26, 2018
    Fix checkout of nonexistent branch
  2. Fix checkout of nonexistent branch

    novalis committed Jul 26, 2018
Commits on Jul 24, 2018
  1. Merge pull request #635 from novalis/fix-hook-calls

    novalis committed Jul 24, 2018
    Fix calls to post-checkout hook.
  2. Merge pull request #636 from novalis/bogus-newline

    novalis committed Jul 24, 2018
    fix formatting
  3. fix formatting

    novalis committed Jul 23, 2018
  4. Merge pull request #639 from novalis/meta-checkout

    novalis committed Jul 24, 2018
    Meta checkout
  5. fix meta checkout -- filename

    novalis committed Jul 24, 2018
  6. fix checkout -b

    novalis committed Jul 24, 2018
Commits on Jul 23, 2018
  1. make git meta reset work for newly-added submodules

    novalis committed Jul 23, 2018
  2. Fix calls to post-checkout hook.

    novalis committed Jul 23, 2018
    Make post-checkout hook run as "branch checkout" in detached head
    state.  Make it run at all in file checkout mode.
    
    Per the git docs, "branch checkout" (passing "1" to the post-checkout
    hook) does not mean "branch, as opposed to detached".  It means
    "branch, as opposed to files".
Commits on Jul 18, 2018
  1. fix "undefined" for detached head

    novalis committed Jul 18, 2018
  2. fix checkout of nonexistent ref

    novalis committed Jul 18, 2018
Commits on Jul 10, 2018
  1. run post-checkout hook after ff rebase

    novalis committed Jul 10, 2018
  2. execute post-checkout hook after setting HEAD (e.g. after opening a r…

    novalis committed Jul 9, 2018
    …epo)
  3. always strip commit messages

    novalis committed Jul 6, 2018
Commits on Jul 6, 2018
  1. do not screw up escaping on shell commands

    novalis committed Jul 6, 2018
Commits on Jul 2, 2018
  1. fix checkout tests

    novalis committed Jul 2, 2018