Commit | Line | Data |
---|---|---|
8c384754 AP |
1 | |
2 | delete tempdir | |
7b7ba4bb | 3 | |
8c384754 AP |
4 | 'git subtree rejoin' option to do the same as --rejoin, eg. after a |
5 | rebase | |
7b7ba4bb | 6 | |
43a39512 | 7 | --prefix doesn't force the subtree correctly in merge/pull: |
8c384754 | 8 | "-s subtree" should be given an explicit subtree option? |
43a39512 AP |
9 | There doesn't seem to be a way to do this. We'd have to |
10 | patch git-merge-subtree. Ugh. | |
d713e2d8 AP |
11 | (but we could avoid this problem by generating squashes with |
12 | exactly the right subtree structure, rather than using | |
13 | subtree merge...) | |
7b7ba4bb | 14 | |
43a39512 | 15 | add a 'log' subcommand to see what's new in a subtree? |
7b7ba4bb | 16 | |
7b7ba4bb | 17 | add to-submodule and from-submodule commands |
d713e2d8 AP |
18 | |
19 | automated tests for --squash stuff | |
c8a98d4f | 20 | |
6aa76263 AP |
21 | "add" command non-obviously requires a commitid; would be easier if |
22 | it had a "pull" sort of mode instead | |
23 | ||
24 | "pull" and "merge" commands should fail if you've never merged | |
25 | that --prefix before | |
26 | ||
27 | docs should provide an example of "add" | |
28 | ||
29 | note that the initial split doesn't *have* to have a commitid | |
30 | specified... that's just an optimization | |
31 | ||
32 | if you try to add (or maybe merge?) with an invalid commitid, you | |
33 | get a misleading "prefix must end with /" message from | |
34 | one of the other git tools that git-subtree calls. Should | |
35 | detect this situation and print the *real* problem. | |
36 | ||
5d1a5da4 AP |
37 | "pull --squash" should do fetch-synthesize-merge, but instead just |
38 | does "pull" directly, which doesn't work at all. | |
344f58ab AP |
39 | |
40 | make a 'force-update' that does what 'add' does even if the subtree | |
41 | already exists. That way we can help people who imported | |
42 | subtrees "incorrectly" (eg. by just copying in the files) in | |
43 | the past. | |
0af6aa46 AP |
44 | |
45 | guess --prefix automatically if possible based on pwd | |
ef759667 AP |
46 | |
47 | make a 'git subtree grafts' that automatically expands --squash'd | |
48 | commits so you can see the full history if you want it. |