aboutsummaryrefslogtreecommitdiffstats
path: root/contrib/subtree/todo
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-05-10 16:59:47 +0900
committerJunio C Hamano <gitster@pobox.com>2021-05-10 16:59:47 +0900
commit44ccb7629a448fd4408f4ff7206df628a31dabed (patch)
treeebe0308a9f041e57179316bc25d0fb0424dba5e8 /contrib/subtree/todo
parentaaa3c8065d86e8f25850eb79e90da68d6adcf03f (diff)
parent9a3e3ca2ba869f9fef9f8be390ed45457565ccd1 (diff)
downloadgit-44ccb7629a448fd4408f4ff7206df628a31dabed.tar.gz
Merge branch 'ls/subtree'
"git subtree" updates. * ls/subtree: (30 commits) subtree: be stricter about validating flags subtree: push: allow specifying a local rev other than HEAD subtree: allow 'split' flags to be passed to 'push' subtree: allow --squash to be used with --rejoin subtree: give the docs a once-over subtree: have $indent actually affect indentation subtree: don't let debug and progress output clash subtree: add comments and sanity checks subtree: remove duplicate check subtree: parse revs in individual cmd_ functions subtree: use "^{commit}" instead of "^0" subtree: don't fuss with PATH subtree: use "$*" instead of "$@" as appropriate subtree: use more explicit variable names for cmdline args subtree: use git-sh-setup's `say` subtree: use `git merge-base --is-ancestor` subtree: drop support for git < 1.7 subtree: more consistent error propagation subtree: don't have loose code outside of a function subtree: t7900: add porcelain tests for 'pull' and 'push' ...
Diffstat (limited to 'contrib/subtree/todo')
-rw-r--r--contrib/subtree/todo6
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/subtree/todo b/contrib/subtree/todo
index 0d0e777651..32d2ce3a40 100644
--- a/contrib/subtree/todo
+++ b/contrib/subtree/todo
@@ -23,9 +23,9 @@
"pull" and "merge" commands should fail if you've never merged
that --prefix before
-
+
docs should provide an example of "add"
-
+
note that the initial split doesn't *have* to have a commitid
specified... that's just an optimization
@@ -33,7 +33,7 @@
get a misleading "prefix must end with /" message from
one of the other git tools that git-subtree calls. Should
detect this situation and print the *real* problem.
-
+
"pull --squash" should do fetch-synthesize-merge, but instead just
does "pull" directly, which doesn't work at all.