* [9front] [PATCH 1/6] git: document git/import -n
@ 2023-09-28 6:41 Romano
2023-09-28 7:10 ` unobe
0 siblings, 1 reply; 2+ messages in thread
From: Romano @ 2023-09-28 6:41 UTC (permalink / raw)
To: 9front
---
diff f48ee862768b677d0b0fca82a7efecd0b4fb3b06 a125c800817a8356de8580da78b7d9bd0ef95090
--- a/sys/man/1/git
+++ b/sys/man/1/git
@@ -73,6 +73,9 @@
.PP
.B git/import
[
+.B -n
+]
+[
.I commits...
]
.PP
@@ -432,7 +435,10 @@
.PP
.B Git/import
imports a commit with message, author, and
-date information.
+date information. When passed the
+.B -n
+option, applies the contents of the commit without
+committing to the branch.
.PP
.B Git/merge
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [9front] [PATCH 1/6] git: document git/import -n
2023-09-28 6:41 [9front] [PATCH 1/6] git: document git/import -n Romano
@ 2023-09-28 7:10 ` unobe
0 siblings, 0 replies; 2+ messages in thread
From: unobe @ 2023-09-28 7:10 UTC (permalink / raw)
To: 9front
Using this flag helps when trying to combine commits. I noticed it in
the code for git/rebase when I was trying to figure out why my
invocation of git/rebase wasn't working. I still haven't figured it
out, but side-stepped the problem by doing mostly what git/rebase does
(create a temporary branch, apply patches, commit, then delete the
original branch and use the temporary branch to create a new branch
named after the original: clever).
Quoth Romano <unobe@cpan.org>:
> ---
> diff f48ee862768b677d0b0fca82a7efecd0b4fb3b06 a125c800817a8356de8580da78b7d9bd0ef95090
> --- a/sys/man/1/git
> +++ b/sys/man/1/git
> @@ -73,6 +73,9 @@
> .PP
> .B git/import
> [
> +.B -n
> +]
> +[
> .I commits...
> ]
> .PP
> @@ -432,7 +435,10 @@
> .PP
> .B Git/import
> imports a commit with message, author, and
> -date information.
> +date information. When passed the
> +.B -n
> +option, applies the contents of the commit without
> +committing to the branch.
>
> .PP
> .B Git/merge
>
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-09-28 7:14 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-09-28 6:41 [9front] [PATCH 1/6] git: document git/import -n Romano
2023-09-28 7:10 ` unobe
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).