Permalink
Commits on Sep 24, 2010
  1. @delfinof
Commits on Aug 12, 2010
  1. @apenwarr

    Fix typo: an -> a

    Thanks to Vanuan on github.
    apenwarr committed Aug 12, 2010
Commits on Jul 21, 2010
  1. @bryanlarsen @apenwarr

    docs: simplify example 1

    The documentation was written prior to Wayne Walter's 2-parameter add.
    Using 2-parameter add in example 1 makes the example much simpler.
    bryanlarsen committed with apenwarr Jul 21, 2010
Commits on Jun 24, 2010
  1. @apenwarr

    Another fix for PATH and msysgit.

    Evan Shaw tells me the previous fix didn't work.  Let's use this one
    instead, which he says does work.
    
    This fix is kind of wrong because it will run the "correct" git-sh-setup
    *after* the one in /usr/bin, if there is one, which could be weird if you
    have multiple versions of git installed.  But it works on my Linux and his
    msysgit, so it's obviously better than what we had before.
    apenwarr committed Jun 24, 2010
  2. @apenwarr

    Merge remote branch 'origin/master'

    * origin/master:
      Fixed regression with splitting out new subtree
      Use 'git merge -Xsubtree' when git version >= 1.7.0.
    apenwarr committed Jun 24, 2010
  3. @apenwarr

    (Hopefully) fix PATH setting for msysgit.

    Reported by Evan Shaw.  The problem is that $(git --exec-path) includes a
    'git' binary which is incompatible with the one in /usr/bin; if you run it,
    it gives you an error about libiconv2.dll.
    
    You might think we could just add $(git --exec-path) at the *end* of PATH,
    but then if there are multiple versions of git installed, we could end up
    with the wrong one; earlier versions used to put git-sh-setup in /usr/bin,
    so we'd pick up that one before the new one.
    
    So now we just set PATH back to its original value right after running
    git-sh-setup, and we should be okay.
    apenwarr committed Jun 24, 2010
Commits on May 20, 2010
  1. @voxpelli

    Fixed regression with splitting out new subtree

    A folder in a repository that wasn't initially imported as a  subtree could no longer be splitted into an entirely new subtree with no parent.
    
    A fix and a new test to fix that regression is added here.
    voxpelli committed May 20, 2010
Commits on May 7, 2010
  1. @voxpelli @apenwarr

    Use 'git merge -Xsubtree' when git version >= 1.7.0.

    It's possible to specify the subdir of a subtree since Git 1.7.0 - adding
    support for that functionality to make the merge more stable.
    
    Also checking for git version - now only uses the new subtree subdir option
    when on at least 1.7.
    voxpelli committed with apenwarr May 7, 2010
Commits on Feb 13, 2010
  1. @apenwarr

    Added new 'push' command and 2-parameter form of 'add'.

    Now you can do:
    
    	git subtree add --prefix=whatever git://wherever branchname
    
    to add a new branch, instead of rather weirdly having to do 'git fetch'
    first.  You can also split and push in one step:
    
    	git subtree push --prefix=whatever git://wherever newbranch
    
    (Somewhat cleaned up by apenwarr.)
    Wayne Walter committed with apenwarr Feb 13, 2010
Commits on Feb 9, 2010
  1. @kiyose @apenwarr

    Docs: cleaning up example textual redundancy

    Signed-off-by: Dan Sabath <dsabath@whitepages.com>
    kiyose committed with apenwarr Feb 9, 2010
  2. @kiyose @apenwarr

    docs: add simple 'add' case to clarify setup.

    This patch adds a simple use case for adding a library to an existing
    repository.
    
    Signed-off-by: Dan Sabath <dsabath@whitepages.com>
    kiyose committed with apenwarr Feb 9, 2010
  3. @apenwarr

    Some recent tests accidentally depended on very new versions of git.

    The "--format" option is too new.  Use "--pretty=format:" (which means the
    same thing) instead.  Now it works again on git 1.6.0 (at least).
    apenwarr committed Feb 9, 2010
  4. @apenwarr

    Oops. Apparently I didn't run 'make test' after most recent change.

    Thanks to Dan Sabath for pointing that out.
    apenwarr committed Feb 9, 2010
Commits on Feb 8, 2010
  1. @apenwarr

    Improve checking for existence of the --prefix directory.

    For add, the prefix must *not* already exist.  For all the other commands,
    it *must* already exist.
    apenwarr committed Feb 8, 2010
Commits on Feb 6, 2010
  1. @treese @apenwarr

    Make sure that <prefix> exists when splitting.

    And test cases for that check, as well as for an error if no prefix is
    specified at all.
    treese committed with apenwarr Feb 6, 2010
  2. @apenwarr

    Make tests pass with recent git (1.7.0 and up).

    It seems that in older versions, --message="" was interpreted as "use the
    default commit message" instead of "use an empty commit message", and
    git-subtree was depending on this behaviour.  Now we don't, so tests pass
    again.
    apenwarr committed Feb 6, 2010
  3. @treese @apenwarr
Commits on Feb 2, 2010
  1. @apenwarr

    Jakub's changes broke the progress message slightly.

    We really need that ^M (\r), not a ^J (\n) if we want the status message to
    overwrite itself nicely.
    apenwarr committed Feb 2, 2010
  2. @apenwarr

    Merge branch 'master' of git://github.com/psionides/git-subtree

    * 'master' of git://github.com/psionides/git-subtree:
      improved rev_is_descendant_of_branch() function
      added temporary test dirs to gitignore
      added tests for recent changes
      fixed bug in commit message for split
      changed alias for --prefix from -p to -P
      fix for subtree split not finding proper base for new commits
      allow using --branch with existing branches if it makes sense
      added -m/--message option for setting merge commit message
      added -p alias for --prefix
    apenwarr committed Feb 2, 2010
  3. @apenwarr

    Fix refspecs in given example for git subtree pull.

    (Updated slightly by apenwarr)
    Arlen Cuss committed with apenwarr Jan 19, 2010
Commits on Jan 12, 2010
  1. @mackuba
  2. @mackuba
  3. @mackuba

    added tests for recent changes

    mackuba committed Jan 12, 2010
  4. @mackuba
  5. @mackuba
Commits on Jan 10, 2010
  1. @mackuba
  2. @mackuba
  3. @mackuba
Commits on Jan 6, 2010
  1. @mackuba

    added -p alias for --prefix

    mackuba committed Jan 6, 2010
Commits on Nov 21, 2009
  1. @apenwarr
Commits on Nov 15, 2009
  1. @apenwarr

    make git version dynamic when building documentation

    Signed-off-by: Ben Walton <bwalton@artsci.utoronto.ca>
    Ben Walton committed with apenwarr Nov 14, 2009
  2. @apenwarr

    add installation support to Makefile

    Signed-off-by: Ben Walton <bwalton@artsci.utoronto.ca>
    Ben Walton committed with apenwarr Nov 14, 2009
  3. @apenwarr

    Oops, forgot a COPYING file. It's GPLv2.

    Thanks to Ben Walton for pointing this out.
    apenwarr committed Nov 15, 2009
Commits on Nov 4, 2009
  1. @apenwarr
Commits on Oct 2, 2009
  1. @apenwarr

    cmd_pull didn't support --squash correctly.

    We should implement it as
    	git fetch ...
    	git subtree merge ...
    
    But we were instead just calling
    	git pull -s subtree ...
    
    because 'git subtree merge' used to be just an alias for 'git merge -s
    subtree', but it no longer is.
    apenwarr committed Oct 2, 2009