diff options
| author |  Luke Shumaker <lukeshu@datawire.io> | 2021-04-27 15:17:45 -0600 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-04-28 16:47:19 +0900 |
| commit | cb6551447b8e0c35408b766ad605ba357f720a0d (patch) | |
| tree | 97a2b36766fb94568733ab4be4e35982b06df9d4 /t/t5515/refs.br-remote-explicit_remote-explicit | |
| parent | subtree: give the docs a once-over (diff) | |
| download | tgif-cb6551447b8e0c35408b766ad605ba357f720a0d.tar.xz | |
subtree: allow --squash to be used with --rejoin
Besides being a genuinely useful thing to do, this also just makes sense
and harmonizes which flags may be used when. `git subtree split
--rejoin` amounts to "automatically go ahead and do a `git subtree
merge` after doing the main `git subtree split`", so it's weird and
arbitrary that you can't pass `--squash` to `git subtree split --rejoin`
like you can `git subtree merge`. It's weird that `git subtree split
--rejoin` inherits `git subtree merge`'s `--message` but not `--squash`.
Reconcile the situation by just having `split --rejoin` actually just
call `merge` internally (or call `add` instead, as appropriate), so it
can get access to the full `merge` behavior, including `--squash`.
Signed-off-by: Luke Shumaker <lukeshu@datawire.io>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5515/refs.br-remote-explicit_remote-explicit')
0 files changed, 0 insertions, 0 deletions