4 'git subtree rejoin' option to do the same as --rejoin, eg. after a
7 --prefix doesn't force the subtree correctly in merge/pull:
8 "-s subtree" should be given an explicit subtree option?
9 There doesn't seem to be a way to do this. We'd have to
10 patch git-merge-subtree. Ugh.
11 (but we could avoid this problem by generating squashes with
12 exactly the right subtree structure, rather than using
15 add a 'push' subcommand to parallel 'pull'
17 add a 'log' subcommand to see what's new in a subtree?
19 add to-submodule and from-submodule commands
21 automated tests for --squash stuff
23 test.sh fails in msysgit?
24 sort error - see Thell's email
26 "add" command non-obviously requires a commitid; would be easier if
27 it had a "pull" sort of mode instead
29 "pull" and "merge" commands should fail if you've never merged
32 docs should provide an example of "add"
34 note that the initial split doesn't *have* to have a commitid
35 specified... that's just an optimization
37 if you try to add (or maybe merge?) with an invalid commitid, you
38 get a misleading "prefix must end with /" message from
39 one of the other git tools that git-subtree calls. Should
40 detect this situation and print the *real* problem.
42 In fact, the prefix should *not* end with slash, and we
43 should detect (and fix) it if it does. Otherwise the
44 log message looks weird.