Page MenuHomeFreeBSD
Files F177600819

D61591.1794821435.diff
No OneTemporary
Actions

Authored By
Unknown
Size
2 KB
Referenced Files
None
Subscribers
None

D61591.1794821435.diff
View Options

Index: documentation/content/en/books/fdp-primer/working-copy/_index.adoc
===================================================================
--- documentation/content/en/books/fdp-primer/working-copy/_index.adoc
+++ documentation/content/en/books/fdp-primer/working-copy/_index.adoc
@@ -127,30 +127,45 @@
% git restore _index.adoc
....
-[[working-copy-making-diff]]
-== Making a Diff
+[[working-copy-submitting]]
+== Submitting the Changes
-After edits to a file or group of files are completed, the differences between the local working copy and the version on the FreeBSD repository must be collected into a single file for submission.
-These _diff_ files are produced by redirecting the output of `git diff` into a file:
+After edits to a file or group of files are completed, the differences between the local working copy and the version on the FreeBSD repository must be collected into a logical change called a commit, and submitted as a patch.
[source,shell]
....
% cd ~/doc
-% git diff > doc-fix-spelling.diff
+% vi README.md
+% git commit -a
....
-Give the file a meaningful name that identifies the contents.
-The example above is for spelling fixes to the whole documentation tree.
+They should be organized as one logical change per commit, with properly set authorship, and a message according to extref:{committers-guide}[project guidelines, commit-log-messages].
-If the diff file is to be submitted with the web "link:https://bugs.FreeBSD.org/bugzilla/enter_bug.cgi[Submit a FreeBSD problem report]" interface, add a [.filename]#.txt# extension to give the earnest and simple-minded web form a clue that the contents are plain text.
-
-Be careful: `git diff` includes all changes made in the current directory and any subdirectories.
-If there are files in the working copy with edits that are not ready to be submitted yet, provide a list of only the files that are to be included:
+Be careful: `git commit -a` includes all changes made in the current directory and any subdirectories, except deleted files.
+If there are files in the working copy with edits that are not ready to be submitted yet, add a list of only the files that are to be included:
[source,shell]
....
-% cd ~/doc
-% git diff disks/_index.adoc printers/_index.adoc > disks-printers.diff
+% cd ~/doc/documentation/content/en/books/handbook
+% git add disks/_index.adoc printers/_index.adoc
+% git commit
+....
+
+The preferred way to submit proposed changes is on our code review system, link:https://reviews.freebsd.org/[Differential].
+These patches can be sent directly from the command line with package:freebsd-git-arc[].
+
+[source,shell]
+....
+% git show
+% git arc create -r \#docs @
+....
+
+Alternatively format the top commit in the stack into a patch file to be submitted some other way:
+
+[source,shell]
+....
+% git show
+% git format-patch @~1
....
[[working-copy-git-references]]

File Metadata

Mime Type
text/plain
Expires
Mon, Nov 16, 9:30 AM (21 h, 5 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
41771185
Default Alt Text
D61591.1794821435.diff (2 KB)

Event Timeline