- I am of two minds about this one. diff output must always be
- -p1 format no matter where the command was started, and
- ls-tree might be easier to use if it matched diff, not
- ls-files.
+ - "update-index" with or without --add would mark the path
+ after registering. Should we make the working tree file
+ read-only at this point?
+
+ - checkout-index -u would mark the path and makes the working
+ tree file read-only.
+
+ Impacts to various commands:
+
+ - update-index --refresh would ignore them.
+
+ - diff-files would say unchanged.
+
+ - diff-index without --cached acts the same way as diff-index
+ --cached.
+
+* Decide what to do about rebase applied to merged head. One
+ extreme is to allow rebase if "rev-list ours..theirs" gives
+ anything. This loosens the current merge-base based approach.
+ The other extreme is to refuse rebase if "rev-list
+ theirs..ours" contains any merge commit, which was discussed
+ on the list.
+
+ <43CC695E.2020506@codeweavers.com>
+
+* Decide what the right thing to do upon an empty merge commit,
+ when both branches happen to have obtained the same set of
+ changes through different history. Not recording such keeps
+ the history simpler, and the next merge would soon create a
+ true merge commit anyway, but this does not feel quite right.
+
+ <20060114021800.4688.qmail@web31803.mail.mud.yahoo.com>
+
+* Perhaps a smarter HTTP anonymous download via CGI.
+
+* Prepare to enable "always use symbolic refs for HEAD" patch.
+ We need a timeline to force Porcelains to get ready. All the
+ major ones should be ready now.