Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
todo^
author
Avery Pennarun
<apenwarr@gmail.com>
Thu, 16 Jul 2009 18:31:50 +0000
(14:31 -0400)
committer
Avery Pennarun
<apenwarr@gmail.com>
Thu, 16 Jul 2009 18:31:50 +0000
(14:31 -0400)
todo
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(from parent 1:
5d1a5da
)
diff --git
a/todo
b/todo
index e67f713ad45863b52c9bc7b936e506d43f6cc58a..155c4be1552a0e168d59912dde91f4b53aecdccf 100644
(file)
--- a/
todo
+++ b/
todo
@@
-48,3
+48,8
@@
"pull --squash" should do fetch-synthesize-merge, but instead just
does "pull" directly, which doesn't work at all.
+
+ make a 'force-update' that does what 'add' does even if the subtree
+ already exists. That way we can help people who imported
+ subtrees "incorrectly" (eg. by just copying in the files) in
+ the past.