2009-04-26 12:53:14 +00:00
|
|
|
|
|
|
|
|
delete tempdir
|
2009-05-24 19:28:54 +00:00
|
|
|
|
2009-04-26 12:53:14 +00:00
|
|
|
'git subtree rejoin' option to do the same as --rejoin, eg. after a
|
|
|
|
|
rebase
|
2009-05-24 19:28:54 +00:00
|
|
|
|
2009-05-30 05:05:43 +00:00
|
|
|
--prefix doesn't force the subtree correctly in merge/pull:
|
2009-04-26 12:53:14 +00:00
|
|
|
"-s subtree" should be given an explicit subtree option?
|
2009-05-30 05:05:43 +00:00
|
|
|
There doesn't seem to be a way to do this. We'd have to
|
|
|
|
|
patch git-merge-subtree. Ugh.
|
2009-05-30 08:11:43 +00:00
|
|
|
(but we could avoid this problem by generating squashes with
|
|
|
|
|
exactly the right subtree structure, rather than using
|
|
|
|
|
subtree merge...)
|
2009-05-24 19:28:54 +00:00
|
|
|
|
2009-05-30 05:05:43 +00:00
|
|
|
add a 'log' subcommand to see what's new in a subtree?
|
2009-05-24 19:28:54 +00:00
|
|
|
|
|
|
|
|
add to-submodule and from-submodule commands
|
2009-05-30 08:11:43 +00:00
|
|
|
|
|
|
|
|
automated tests for --squash stuff
|
2009-06-15 18:12:40 +00:00
|
|
|
|
2009-07-02 16:39:48 +00:00
|
|
|
"add" command non-obviously requires a commitid; would be easier if
|
|
|
|
|
it had a "pull" sort of mode instead
|
|
|
|
|
|
|
|
|
|
"pull" and "merge" commands should fail if you've never merged
|
|
|
|
|
that --prefix before
|
subtree: give the docs a once-over
Just went through the docs looking for anything inaccurate or that can
be improved.
In the '-h' text, in the man page synopsis, and in the man page
description: Normalize the ordering of the list of sub-commands: 'add',
'merge', 'split', 'pull', 'push'. This allows us to kinda separate the
lower-level add/merge/split from the higher-level pull/push.
'-h' text:
- correction: Indicate that split's arg is optional.
- clarity: Emphasize that 'pull' takes the 'add'/'merge' flags.
man page:
- correction: State that all subcommands take options (it seemed to
indicate that only 'split' takes any options other than '-P').
- correction: 'split' only guarantees that the results are identical if
the flags are identical.
- correction: The flag is named '--ignore-joins', not '--ignore-join'.
- completeness: Clarify that 'push' always operates on HEAD, and that
'split' operates on HEAD if no local commit is given.
- clarity: In the description, when listing commands, repeat what their
arguments are. This way the reader doesn't need to flip back and
forth between the command description and the synopsis and the full
description to understand what's being said.
- clarity: In the <variables> used to give command arguments, give
slightly longer, descriptive names. Like <local-commit> instead of
just <commit>.
- clarity: Emphasize that 'pull' takes the 'add'/'merge' flags.
- style: In the synopsis, list options before the subcommand. This
makes things line up and be much more readable when shown
non-monospace (such as in `make html`), and also more closely matches
other man pages (like `git-submodule.txt`).
- style: Use the correct syntax for indicating the options ([<options>]
instead of [OPTIONS]).
- style: In the synopsis, separate 'pull' and 'push' from the other
lower-level commands. I think this helps readability.
- style: Code-quote things in prose that seem like they should be
code-quoted, like '.gitmodules', flags, or full commands.
- style: Minor wording improvements, like more consistent mood (many
of the command descriptions start in the imperative mood and switch
to the indicative mode by the end). That sort of thing.
- style: Capitalize "ID".
- style: Remove the "This option is only valid for XXX command" remarks
from each option, and instead rely on the section headings.
- style: Since that line is getting edited anyway, switch "behaviour" to
American "behavior".
- style: Trim trailing whitespace.
`todo`:
- style: Trim trailing whitespace.
Signed-off-by: Luke Shumaker <lukeshu@datawire.io>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2021-04-27 21:17:44 +00:00
|
|
|
|
2009-07-02 16:39:48 +00:00
|
|
|
docs should provide an example of "add"
|
subtree: give the docs a once-over
Just went through the docs looking for anything inaccurate or that can
be improved.
In the '-h' text, in the man page synopsis, and in the man page
description: Normalize the ordering of the list of sub-commands: 'add',
'merge', 'split', 'pull', 'push'. This allows us to kinda separate the
lower-level add/merge/split from the higher-level pull/push.
'-h' text:
- correction: Indicate that split's arg is optional.
- clarity: Emphasize that 'pull' takes the 'add'/'merge' flags.
man page:
- correction: State that all subcommands take options (it seemed to
indicate that only 'split' takes any options other than '-P').
- correction: 'split' only guarantees that the results are identical if
the flags are identical.
- correction: The flag is named '--ignore-joins', not '--ignore-join'.
- completeness: Clarify that 'push' always operates on HEAD, and that
'split' operates on HEAD if no local commit is given.
- clarity: In the description, when listing commands, repeat what their
arguments are. This way the reader doesn't need to flip back and
forth between the command description and the synopsis and the full
description to understand what's being said.
- clarity: In the <variables> used to give command arguments, give
slightly longer, descriptive names. Like <local-commit> instead of
just <commit>.
- clarity: Emphasize that 'pull' takes the 'add'/'merge' flags.
- style: In the synopsis, list options before the subcommand. This
makes things line up and be much more readable when shown
non-monospace (such as in `make html`), and also more closely matches
other man pages (like `git-submodule.txt`).
- style: Use the correct syntax for indicating the options ([<options>]
instead of [OPTIONS]).
- style: In the synopsis, separate 'pull' and 'push' from the other
lower-level commands. I think this helps readability.
- style: Code-quote things in prose that seem like they should be
code-quoted, like '.gitmodules', flags, or full commands.
- style: Minor wording improvements, like more consistent mood (many
of the command descriptions start in the imperative mood and switch
to the indicative mode by the end). That sort of thing.
- style: Capitalize "ID".
- style: Remove the "This option is only valid for XXX command" remarks
from each option, and instead rely on the section headings.
- style: Since that line is getting edited anyway, switch "behaviour" to
American "behavior".
- style: Trim trailing whitespace.
`todo`:
- style: Trim trailing whitespace.
Signed-off-by: Luke Shumaker <lukeshu@datawire.io>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2021-04-27 21:17:44 +00:00
|
|
|
|
2009-07-02 16:39:48 +00:00
|
|
|
note that the initial split doesn't *have* to have a commitid
|
|
|
|
|
specified... that's just an optimization
|
|
|
|
|
|
|
|
|
|
if you try to add (or maybe merge?) with an invalid commitid, you
|
|
|
|
|
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.
|
subtree: give the docs a once-over
Just went through the docs looking for anything inaccurate or that can
be improved.
In the '-h' text, in the man page synopsis, and in the man page
description: Normalize the ordering of the list of sub-commands: 'add',
'merge', 'split', 'pull', 'push'. This allows us to kinda separate the
lower-level add/merge/split from the higher-level pull/push.
'-h' text:
- correction: Indicate that split's arg is optional.
- clarity: Emphasize that 'pull' takes the 'add'/'merge' flags.
man page:
- correction: State that all subcommands take options (it seemed to
indicate that only 'split' takes any options other than '-P').
- correction: 'split' only guarantees that the results are identical if
the flags are identical.
- correction: The flag is named '--ignore-joins', not '--ignore-join'.
- completeness: Clarify that 'push' always operates on HEAD, and that
'split' operates on HEAD if no local commit is given.
- clarity: In the description, when listing commands, repeat what their
arguments are. This way the reader doesn't need to flip back and
forth between the command description and the synopsis and the full
description to understand what's being said.
- clarity: In the <variables> used to give command arguments, give
slightly longer, descriptive names. Like <local-commit> instead of
just <commit>.
- clarity: Emphasize that 'pull' takes the 'add'/'merge' flags.
- style: In the synopsis, list options before the subcommand. This
makes things line up and be much more readable when shown
non-monospace (such as in `make html`), and also more closely matches
other man pages (like `git-submodule.txt`).
- style: Use the correct syntax for indicating the options ([<options>]
instead of [OPTIONS]).
- style: In the synopsis, separate 'pull' and 'push' from the other
lower-level commands. I think this helps readability.
- style: Code-quote things in prose that seem like they should be
code-quoted, like '.gitmodules', flags, or full commands.
- style: Minor wording improvements, like more consistent mood (many
of the command descriptions start in the imperative mood and switch
to the indicative mode by the end). That sort of thing.
- style: Capitalize "ID".
- style: Remove the "This option is only valid for XXX command" remarks
from each option, and instead rely on the section headings.
- style: Since that line is getting edited anyway, switch "behaviour" to
American "behavior".
- style: Trim trailing whitespace.
`todo`:
- style: Trim trailing whitespace.
Signed-off-by: Luke Shumaker <lukeshu@datawire.io>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2021-04-27 21:17:44 +00:00
|
|
|
|
2009-07-10 19:14:33 +00:00
|
|
|
"pull --squash" should do fetch-synthesize-merge, but instead just
|
|
|
|
|
does "pull" directly, which doesn't work at all.
|
2009-07-16 18:31:50 +00:00
|
|
|
|
|
|
|
|
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.
|
2009-08-01 05:19:48 +00:00
|
|
|
|
|
|
|
|
guess --prefix automatically if possible based on pwd
|
2009-08-02 21:48:20 +00:00
|
|
|
|
|
|
|
|
make a 'git subtree grafts' that automatically expands --squash'd
|
|
|
|
|
commits so you can see the full history if you want it.
|