Add 'contrib/subtree/' from commit 'd3a04e06c77d57978bb5230361c64946232cc346'
[git/git.git] / contrib / subtree / todo
1
2 delete tempdir
3
4 'git subtree rejoin' option to do the same as --rejoin, eg. after a
5 rebase
6
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
13 subtree merge...)
14
15 add a 'push' subcommand to parallel 'pull'
16
17 add a 'log' subcommand to see what's new in a subtree?
18
19 add to-submodule and from-submodule commands
20
21 automated tests for --squash stuff
22
23 "add" command non-obviously requires a commitid; would be easier if
24 it had a "pull" sort of mode instead
25
26 "pull" and "merge" commands should fail if you've never merged
27 that --prefix before
28
29 docs should provide an example of "add"
30
31 note that the initial split doesn't *have* to have a commitid
32 specified... that's just an optimization
33
34 if you try to add (or maybe merge?) with an invalid commitid, you
35 get a misleading "prefix must end with /" message from
36 one of the other git tools that git-subtree calls. Should
37 detect this situation and print the *real* problem.
38
39 "pull --squash" should do fetch-synthesize-merge, but instead just
40 does "pull" directly, which doesn't work at all.
41
42 make a 'force-update' that does what 'add' does even if the subtree
43 already exists. That way we can help people who imported
44 subtrees "incorrectly" (eg. by just copying in the files) in
45 the past.
46
47 guess --prefix automatically if possible based on pwd
48
49 make a 'git subtree grafts' that automatically expands --squash'd
50 commits so you can see the full history if you want it.