David "novalis" Turner

Uncaught TypeError: Cannot read property '1' of null canvas2svg:886 (in 6983b3d78243). The problem was with a ctx.font = 'bold 270px sans-serif'; -- apparently, the 'bold' was the problem.

See attached demo script. [git-meta-add-d-f-test.txt](https://github.com/twosigma/git-meta/files/1146272/git-meta-add-d-f-test.txt)

Better handling of add/add conflicts

1

Well, I didn't get everything I wanted done, but at least I got this.

If the incoming commit's submodule 's' contains a file 'x' , but 'x' already exists as an untracked file inside 'x', it will be silently overwritten with the version from...

In git.git, rm --cached of a submodule does a sort of terrible thing where it removes the index entry for the submodule, but doesn't touch .gitmodules. This leaves a state...

git meta stash doesn't stash submodule with new commits

1

$ git status --short M my-submodule $ git meta stash Nothing to stash.

It should be possible via an environment variable to tell git-meta to run a different git than the one on $PATH.

git meta push pushes current not committed submodules

9

If I make a commit in submodule A, and then make a meta commit, and then make another commit in submodule A, git meta push will push the second submodule...

git meta fails with worktrees

2

When running git meta in a worktree $ git meta open sub2 Could not find Git directory from /home/novalis/twosigma/demo/wt.