Units
Translation components API.
See the Weblate's Web API documentation for detailed description of the API.
GET /api/translations/documentation/articlescommitters-guide_index/en/units/?format=api&page=21
{ "count": 1190, "next": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/units/?format=api&page=22", "previous": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/units/?format=api&page=20", "results": [ { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "% git reflog\n6ff9c25 (HEAD -> wilma) HEAD@{0}: rebase -i (finish): returning to refs/heads/wilma\n6ff9c25 (HEAD -> wilma) HEAD@{1}: rebase -i (start): checkout main\n869cbd3 HEAD@{2}: rebase -i (start): checkout wilma\na6a5094 (fred) HEAD@{3}: rebase -i (finish): returning to refs/heads/fred\na6a5094 (fred) HEAD@{4}: rebase -i (pick): Encourage contributions\n1ccd109 (freebsd/main, main) HEAD@{5}: rebase -i (start): checkout main\n869cbd3 HEAD@{6}: rebase -i (start): checkout fred\n869cbd3 HEAD@{7}: checkout: moving from wilma to fred\n869cbd3 HEAD@{8}: commit: Encourage contributions\n...\n%\n" ], "previous_source": "", "target": [ "% git reflog\n6ff9c25 (HEAD -> wilma) HEAD@{0}: rebase -i (finish): returning to refs/heads/wilma\n6ff9c25 (HEAD -> wilma) HEAD@{1}: rebase -i (start): checkout main\n869cbd3 HEAD@{2}: rebase -i (start): checkout wilma\na6a5094 (fred) HEAD@{3}: rebase -i (finish): returning to refs/heads/fred\na6a5094 (fred) HEAD@{4}: rebase -i (pick): Encourage contributions\n1ccd109 (freebsd/main, main) HEAD@{5}: rebase -i (start): checkout main\n869cbd3 HEAD@{6}: rebase -i (start): checkout fred\n869cbd3 HEAD@{7}: checkout: moving from wilma to fred\n869cbd3 HEAD@{8}: commit: Encourage contributions\n...\n%\n" ], "id_hash": -4027413667545449773, "content_hash": -4027413667545449773, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1704", "context": "", "note": "type: delimited block . 4", "flags": "no-wrap", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 489, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 79, "source_unit": "https://translate-dev.freebsd.org/api/units/1819728/?format=api", "priority": 100, "id": 1819728, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=481bc09b86667ad3", "url": "https://translate-dev.freebsd.org/api/units/1819728/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.741601Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "Here we see the changes I've made. You can use it to figure out where things went wrong. I'll just point out a few things here. The first one is that HEAD@{X} is a 'commitish' thing, so you can use that as an argument to a command. Although if that command commits anything to the repository, the X numbers change. You can also use the hash (first column)." ], "previous_source": "", "target": [ "Here we see the changes I've made. You can use it to figure out where things went wrong. I'll just point out a few things here. The first one is that HEAD@{X} is a 'commitish' thing, so you can use that as an argument to a command. Although if that command commits anything to the repository, the X numbers change. You can also use the hash (first column)." ], "id_hash": -8293201595133546906, "content_hash": -8293201595133546906, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1712", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 490, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 68, "source_unit": "https://translate-dev.freebsd.org/api/units/1819730/?format=api", "priority": 100, "id": 1819730, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=0ce8a116a75cae66", "url": "https://translate-dev.freebsd.org/api/units/1819730/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.745291Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "Next, 'Encourage contributions' was the last commit I made to `wilma` before I decided to split things up. You can also see the same hash is there when I created the `fred` branch to do that. I started by rebasing `fred` and you see the 'start', each step, and the 'finish' for that process. While we don't need it here, you can figure out exactly what happened. Fortunately, to fix this, you can follow the prior answer's steps, but with the hash `869cbd3` instead of `pre-split`. While that seems a bit verbose, it's easy to remember since you're doing one thing at a time. You can also stack:" ], "previous_source": "", "target": [ "Next, 'Encourage contributions' was the last commit I made to `wilma` before I decided to split things up. You can also see the same hash is there when I created the `fred` branch to do that. I started by rebasing `fred` and you see the 'start', each step, and the 'finish' for that process. While we don't need it here, you can figure out exactly what happened. Fortunately, to fix this, you can follow the prior answer's steps, but with the hash `869cbd3` instead of `pre-split`. While that seems a bit verbose, it's easy to remember since you're doing one thing at a time. You can also stack:" ], "id_hash": 535694241802003671, "content_hash": 535694241802003671, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1720", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 491, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 108, "source_unit": "https://translate-dev.freebsd.org/api/units/1819732/?format=api", "priority": 100, "id": 1819732, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=876f2b131ed4a4d7", "url": "https://translate-dev.freebsd.org/api/units/1819732/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.748634Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "% git checkout -B wilma 869cbd3\n% git branch -D fred\n" ], "previous_source": "", "target": [ "% git checkout -B wilma 869cbd3\n% git branch -D fred\n" ], "id_hash": 516976321396009026, "content_hash": 516976321396009026, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1725", "context": "", "note": "type: delimited block . 4", "flags": "no-wrap", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 492, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 11, "source_unit": "https://translate-dev.freebsd.org/api/units/1819734/?format=api", "priority": 100, "id": 1819734, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=872cab39aa18e842", "url": "https://translate-dev.freebsd.org/api/units/1819734/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.752187Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "and you are ready to try again. The `checkout -B` with the hash combines checking out and creating a branch for it. The `-B` instead of `-b` forces the movement of a pre-existing branch. Either way works, which is what's great (and awful) about Git. One reason I tend to use `git checkout -B xxxx hash` instead of checking out the hash, and then creating / moving the branch is purely to avoid the slightly distressing message about detached heads:" ], "previous_source": "", "target": [ "and you are ready to try again. The `checkout -B` with the hash combines checking out and creating a branch for it. The `-B` instead of `-b` forces the movement of a pre-existing branch. Either way works, which is what's great (and awful) about Git. One reason I tend to use `git checkout -B xxxx hash` instead of checking out the hash, and then creating / moving the branch is purely to avoid the slightly distressing message about detached heads:" ], "id_hash": -6465473100163297282, "content_hash": -6465473100163297282, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1732", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 493, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 80, "source_unit": "https://translate-dev.freebsd.org/api/units/1819736/?format=api", "priority": 100, "id": 1819736, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=264606788fec4ffe", "url": "https://translate-dev.freebsd.org/api/units/1819736/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.755263Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "% git checkout 869cbd3\nM\tfaq.md\nNote: checking out '869cbd3'.\n" ], "previous_source": "", "target": [ "% git checkout 869cbd3\nM\tfaq.md\nNote: checking out '869cbd3'.\n" ], "id_hash": 738953289563899568, "content_hash": 738953289563899568, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1738", "context": "", "note": "type: delimited block . 4", "flags": "no-wrap", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 494, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 10, "source_unit": "https://translate-dev.freebsd.org/api/units/1819738/?format=api", "priority": 100, "id": 1819738, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=8a414a1a0a1006b0", "url": "https://translate-dev.freebsd.org/api/units/1819738/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.922712Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "You are in 'detached HEAD' state. You can look around, make experimental\nchanges and commit them, and you can discard any commits you make in this\nstate without impacting any branches by performing another checkout.\n" ], "previous_source": "", "target": [ "You are in 'detached HEAD' state. You can look around, make experimental\nchanges and commit them, and you can discard any commits you make in this\nstate without impacting any branches by performing another checkout.\n" ], "id_hash": 4910327960206966929, "content_hash": 4910327960206966929, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1742", "context": "", "note": "type: delimited block . 4", "flags": "no-wrap", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 495, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 35, "source_unit": "https://translate-dev.freebsd.org/api/units/1819740/?format=api", "priority": 100, "id": 1819740, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=c424fd4386ce0091", "url": "https://translate-dev.freebsd.org/api/units/1819740/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.926776Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "HEAD is now at 869cbd3 Encourage contributions\n% git checkout -B wilma\n" ], "previous_source": "", "target": [ "HEAD is now at 869cbd3 Encourage contributions\n% git checkout -B wilma\n" ], "id_hash": -5147837261356712416, "content_hash": -5147837261356712416, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1750", "context": "", "note": "type: delimited block . 4", "flags": "no-wrap", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 496, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 12, "source_unit": "https://translate-dev.freebsd.org/api/units/1819742/?format=api", "priority": 100, "id": 1819742, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=388f354903503e20", "url": "https://translate-dev.freebsd.org/api/units/1819742/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.930273Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "this produces the same effect, but I have to read a lot more and severed heads aren't an image I like to contemplate." ], "previous_source": "", "target": [ "this produces the same effect, but I have to read a lot more and severed heads aren't an image I like to contemplate." ], "id_hash": 8117986603388615844, "content_hash": 8117986603388615844, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1753", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 497, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 23, "source_unit": "https://translate-dev.freebsd.org/api/units/1819744/?format=api", "priority": 100, "id": 1819744, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=f0a8e1ce0a5bbca4", "url": "https://translate-dev.freebsd.org/api/units/1819744/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.933343Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "Many developers use `git pull --rebase` to avoid this situation." ], "previous_source": "", "target": [ "Many developers use `git pull --rebase` to avoid this situation." ], "id_hash": 675629953149316325, "content_hash": 675629953149316325, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1762", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 501, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 10, "source_unit": "https://translate-dev.freebsd.org/api/units/1819746/?format=api", "priority": 100, "id": 1819746, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=896051dcdd142ce5", "url": "https://translate-dev.freebsd.org/api/units/1819746/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.938411Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "Right after the pull, you will have the new merge commit checked out. Git supports a `HEAD^#` syntax to examine the parents of a merge commit:" ], "previous_source": "", "target": [ "Right after the pull, you will have the new merge commit checked out. Git supports a `HEAD^#` syntax to examine the parents of a merge commit:" ], "id_hash": 1447095245949301161, "content_hash": 1447095245949301161, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1765", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 502, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 26, "source_unit": "https://translate-dev.freebsd.org/api/units/1819748/?format=api", "priority": 100, "id": 1819748, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=94151d758af6f1a9", "url": "https://translate-dev.freebsd.org/api/units/1819748/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.941473Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "From those logs, you can easily identify which commit is your development work. Then you simply reset your branch to the corresponding `HEAD^#`:" ], "previous_source": "", "target": [ "From those logs, you can easily identify which commit is your development work. Then you simply reset your branch to the corresponding `HEAD^#`:" ], "id_hash": -478862002635302723, "content_hash": -478862002635302723, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1774", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 504, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 23, "source_unit": "https://translate-dev.freebsd.org/api/units/1819750/?format=api", "priority": 100, "id": 1819750, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=795abd8bb47d98bd", "url": "https://translate-dev.freebsd.org/api/units/1819750/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.950079Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "git reset --hard HEAD^1\n" ], "previous_source": "", "target": [ "git reset --hard HEAD^1\n" ], "id_hash": -2805572517763168106, "content_hash": -2805572517763168106, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1778", "context": "", "note": "type: delimited block . 4", "flags": "no-wrap", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 505, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 4, "source_unit": "https://translate-dev.freebsd.org/api/units/1819752/?format=api", "priority": 100, "id": 1819752, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=59109aa8df20c896", "url": "https://translate-dev.freebsd.org/api/units/1819752/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.953321Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "In addition, a `git pull --rebase` at this stage will rebase your changes to 'main' to the latest 'freebsd/main'." ], "previous_source": "", "target": [ "In addition, a `git pull --rebase` at this stage will rebase your changes to 'main' to the latest 'freebsd/main'." ], "id_hash": 6649665893207521460, "content_hash": 6649665893207521460, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1781", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 506, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 19, "source_unit": "https://translate-dev.freebsd.org/api/units/1819754/?format=api", "priority": 100, "id": 1819754, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=dc485be5ffaa38b4", "url": "https://translate-dev.freebsd.org/api/units/1819754/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.956435Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "git branch -f main freebsd/main\n" ], "previous_source": "", "target": [ "git branch -f main freebsd/main\n" ], "id_hash": 8550538921311173774, "content_hash": 8550538921311173774, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1790", "context": "", "note": "type: delimited block . 4", "flags": "no-wrap", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 509, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 5, "source_unit": "https://translate-dev.freebsd.org/api/units/1819756/?format=api", "priority": 100, "id": 1819756, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=f6a99dd8a2e77c8e", "url": "https://translate-dev.freebsd.org/api/units/1819756/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.960893Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "There's nothing magical about branches in Git: they are just labels on a graph that are automatically moved forward by making commits. So the above works because you're just moving a label. There's no metadata about the branch that needs to be preserved due to this." ], "previous_source": "", "target": [ "There's nothing magical about branches in Git: they are just labels on a graph that are automatically moved forward by making commits. So the above works because you're just moving a label. There's no metadata about the branch that needs to be preserved due to this." ], "id_hash": 6197673453184910749, "content_hash": 6197673453184910749, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1795", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 510, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 46, "source_unit": "https://translate-dev.freebsd.org/api/units/1819758/?format=api", "priority": 100, "id": 1819758, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=d6028f2b42f4859d", "url": "https://translate-dev.freebsd.org/api/units/1819758/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.964038Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "% git checkout worker\n% git checkout -b feature\t# create a new branch\n% git cherry-pick main..async\t# bring in the changes\n" ], "previous_source": "", "target": [ "% git checkout worker\n% git checkout -b feature\t# create a new branch\n% git cherry-pick main..async\t# bring in the changes\n" ], "id_hash": 1230069044690707254, "content_hash": 1230069044690707254, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1808", "context": "", "note": "type: delimited block . 4", "flags": "no-wrap", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 514, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 23, "source_unit": "https://translate-dev.freebsd.org/api/units/1819760/?format=api", "priority": 100, "id": 1819760, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=9112154769fe6336", "url": "https://translate-dev.freebsd.org/api/units/1819760/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.969205Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "You now have a new branch called `feature`. This branch combines commits from both branches. You can further curate it with `git rebase`." ], "previous_source": "", "target": [ "You now have a new branch called `feature`. This branch combines commits from both branches. You can further curate it with `git rebase`." ], "id_hash": 7137371724548457637, "content_hash": 7137371724548457637, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1813", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 515, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 23, "source_unit": "https://translate-dev.freebsd.org/api/units/1819762/?format=api", "priority": 100, "id": 1819762, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=e30d09c49fa0c4a5", "url": "https://translate-dev.freebsd.org/api/units/1819762/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.972404Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "% git checkout driver\t\t# Checkout the driver\n% git checkout -b kernel\t# Create kernel branch\n% git checkout -b userland\t# Create userland branch\n" ], "previous_source": "", "target": [ "% git checkout driver\t\t# Checkout the driver\n% git checkout -b kernel\t# Create kernel branch\n% git checkout -b userland\t# Create userland branch\n" ], "id_hash": 1519354023868144507, "content_hash": 1519354023868144507, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1824", "context": "", "note": "type: delimited block . 4", "flags": "no-wrap", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 518, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 26, "source_unit": "https://translate-dev.freebsd.org/api/units/1819764/?format=api", "priority": 100, "id": 1819764, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=9515d46f50b89b7b", "url": "https://translate-dev.freebsd.org/api/units/1819764/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.976860Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "Now you have two identical branches. So, it's time to separate out the commits. We'll assume first that all the commits in `driver` go into either the `kernel` or the `userland` branch, but not both." ], "previous_source": "", "target": [ "Now you have two identical branches. So, it's time to separate out the commits. We'll assume first that all the commits in `driver` go into either the `kernel` or the `userland` branch, but not both." ], "id_hash": 5334895872885982720, "content_hash": 5334895872885982720, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1829", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 519, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 35, "source_unit": "https://translate-dev.freebsd.org/api/units/1819766/?format=api", "priority": 100, "id": 1819766, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=ca095b87e9110600", "url": "https://translate-dev.freebsd.org/api/units/1819766/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.980044Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "% git rebase -i main kernel\n" ], "previous_source": "", "target": [ "% git rebase -i main kernel\n" ], "id_hash": -7269150598536877521, "content_hash": -7269150598536877521, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1833", "context": "", "note": "type: delimited block . 4", "flags": "no-wrap", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 520, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 6, "source_unit": "https://translate-dev.freebsd.org/api/units/1819768/?format=api", "priority": 100, "id": 1819768, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=1b1eca0b53642a2f", "url": "https://translate-dev.freebsd.org/api/units/1819768/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.983232Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "and just include the changes you want (with a 'p' or 'pick' line) and just delete the commits you don't (this sounds scary, but if worse comes to worse, you can throw this all away and start over with the `driver` branch since you've not yet moved it)." ], "previous_source": "", "target": [ "and just include the changes you want (with a 'p' or 'pick' line) and just delete the commits you don't (this sounds scary, but if worse comes to worse, you can throw this all away and start over with the `driver` branch since you've not yet moved it)." ], "id_hash": -5329754168255428370, "content_hash": -5329754168255428370, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1836", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 521, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 48, "source_unit": "https://translate-dev.freebsd.org/api/units/1819770/?format=api", "priority": 100, "id": 1819770, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=3608e8d27cfa48ee", "url": "https://translate-dev.freebsd.org/api/units/1819770/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.986336Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "% git rebase -i main userland\n" ], "previous_source": "", "target": [ "% git rebase -i main userland\n" ], "id_hash": 1105280997569892500, "content_hash": 1105280997569892500, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1840", "context": "", "note": "type: delimited block . 4", "flags": "no-wrap", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 522, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 6, "source_unit": "https://translate-dev.freebsd.org/api/units/1819772/?format=api", "priority": 100, "id": 1819772, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=8f56bf3615249094", "url": "https://translate-dev.freebsd.org/api/units/1819772/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.989595Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "and do the same thing you did with the `kernel` branch." ], "previous_source": "", "target": [ "and do the same thing you did with the `kernel` branch." ], "id_hash": 9206591877958826124, "content_hash": 9206591877958826124, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1843", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 523, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 11, "source_unit": "https://translate-dev.freebsd.org/api/units/1819774/?format=api", "priority": 100, "id": 1819774, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=ffc46288cdbb788c", "url": "https://translate-dev.freebsd.org/api/units/1819774/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.992628Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "% git checkout kernel\n% git log driver\n% git cherry-pick $HASH\n" ], "previous_source": "", "target": [ "% git checkout kernel\n% git log driver\n% git cherry-pick $HASH\n" ], "id_hash": 3365194227491693290, "content_hash": 3365194227491693290, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1855", "context": "", "note": "type: delimited block . 4", "flags": "no-wrap", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 526, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 12, "source_unit": "https://translate-dev.freebsd.org/api/units/1819776/?format=api", "priority": 100, "id": 1819776, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=aeb3925201d662ea", "url": "https://translate-dev.freebsd.org/api/units/1819776/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.996932Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "So let's assume that there's just one commit with a clean tree. You can either use `git rebase` with an `edit` line, or you can use this with the commit on the tip. The steps are the same either way. The first thing we need to do is to back up one commit while leaving the changes uncommitted in the tree:" ], "previous_source": "", "target": [ "So let's assume that there's just one commit with a clean tree. You can either use `git rebase` with an `edit` line, or you can use this with the commit on the tip. The steps are the same either way. The first thing we need to do is to back up one commit while leaving the changes uncommitted in the tree:" ], "id_hash": 534777800277460628, "content_hash": 534777800277460628, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1869", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 529, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 61, "source_unit": "https://translate-dev.freebsd.org/api/units/1819778/?format=api", "priority": 100, "id": 1819778, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=876be993734d8694", "url": "https://translate-dev.freebsd.org/api/units/1819778/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:16.001461Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "% git reset HEAD^\n" ], "previous_source": "", "target": [ "% git reset HEAD^\n" ], "id_hash": 9153652726132543533, "content_hash": 9153652726132543533, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1873", "context": "", "note": "type: delimited block . 4", "flags": "no-wrap", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 530, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 4, "source_unit": "https://translate-dev.freebsd.org/api/units/1819780/?format=api", "priority": 100, "id": 1819780, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=ff084ea8026a902d", "url": "https://translate-dev.freebsd.org/api/units/1819780/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:16.004722Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "Note: Do not, repeat do not, add `--hard` here since that also removes the changes from your tree." ], "previous_source": "", "target": [ "Note: Do not, repeat do not, add `--hard` here since that also removes the changes from your tree." ], "id_hash": 6899949932769278532, "content_hash": 6899949932769278532, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1876", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 531, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 18, "source_unit": "https://translate-dev.freebsd.org/api/units/1819782/?format=api", "priority": 100, "id": 1819782, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=dfc18be806b17a44", "url": "https://translate-dev.freebsd.org/api/units/1819782/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:16.007786Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "Now, if you are lucky, the change needing to be split up falls entirely along file lines. In that case you can just do the usual `git add` for the files in each group than do a `git commit`. Note: when you do this, you'll lose the commit message when you do the reset, so if you need it for some reason, you should save a copy (though `git log $HASH` can recover it)." ], "previous_source": "", "target": [ "Now, if you are lucky, the change needing to be split up falls entirely along file lines. In that case you can just do the usual `git add` for the files in each group than do a `git commit`. Note: when you do this, you'll lose the commit message when you do the reset, so if you need it for some reason, you should save a copy (though `git log $HASH` can recover it)." ], "id_hash": -5324568383695649310, "content_hash": -5324568383695649310, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1880", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 532, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 74, "source_unit": "https://translate-dev.freebsd.org/api/units/1819784/?format=api", "priority": 100, "id": 1819784, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=361b55440b8b85e2", "url": "https://translate-dev.freebsd.org/api/units/1819784/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:16.010879Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "If you are not lucky, you'll need to split apart files. There's another tool to do that which you can apply one file at a time." ], "previous_source": "", "target": [ "If you are not lucky, you'll need to split apart files. There's another tool to do that which you can apply one file at a time." ], "id_hash": 6400906659479200289, "content_hash": 6400906659479200289, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1883", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 533, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 26, "source_unit": "https://translate-dev.freebsd.org/api/units/1819786/?format=api", "priority": 100, "id": 1819786, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=d8d496b17eb0a221", "url": "https://translate-dev.freebsd.org/api/units/1819786/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:16.014173Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "git add -i foo/bar.c\n" ], "previous_source": "", "target": [ "git add -i foo/bar.c\n" ], "id_hash": -5298785128899257331, "content_hash": -5298785128899257331, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1887", "context": "", "note": "type: delimited block . 4", "flags": "no-wrap", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 534, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 4, "source_unit": "https://translate-dev.freebsd.org/api/units/1819788/?format=api", "priority": 100, "id": 1819788, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=3676eeffdad65c0d", "url": "https://translate-dev.freebsd.org/api/units/1819788/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:16.017270Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "will step through the diffs, prompting you, one at time, whether to include or exclude the hunk. Once you're done, `git commit` and you'll have the remainder in your tree. You can run it multiple times as well, and even over multiple files (though I find it easier to do one file at a time and use the `git rebase -i` to fold the related commits together)." ], "previous_source": "", "target": [ "will step through the diffs, prompting you, one at time, whether to include or exclude the hunk. Once you're done, `git commit` and you'll have the remainder in your tree. You can run it multiple times as well, and even over multiple files (though I find it easier to do one file at a time and use the `git rebase -i` to fold the related commits together)." ], "id_hash": -3311876015323881172, "content_hash": -3311876015323881172, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1893", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 535, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 67, "source_unit": "https://translate-dev.freebsd.org/api/units/1819790/?format=api", "priority": 100, "id": 1819790, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=5209da4fa67be12c", "url": "https://translate-dev.freebsd.org/api/units/1819790/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:16.020358Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "% git clone --mirror $URL\n" ], "previous_source": "", "target": [ "% git clone --mirror $URL\n" ], "id_hash": -4179394365697626075, "content_hash": -4179394365697626075, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1911", "context": "", "note": "type: delimited block . 4", "flags": "no-wrap", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 542, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 5, "source_unit": "https://translate-dev.freebsd.org/api/units/1819792/?format=api", "priority": 100, "id": 1819792, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=45ffcef7c052f025", "url": "https://translate-dev.freebsd.org/api/units/1819792/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:16.027175Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "will do the trick. However, there are two disadvantages to this if you want to use it for anything other than a mirror you'll reclone." ], "previous_source": "", "target": [ "will do the trick. However, there are two disadvantages to this if you want to use it for anything other than a mirror you'll reclone." ], "id_hash": -5096324485576193770, "content_hash": -5096324485576193770, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1915", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 543, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 25, "source_unit": "https://translate-dev.freebsd.org/api/units/1819794/?format=api", "priority": 100, "id": 1819794, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=394637e1c11b0916", "url": "https://translate-dev.freebsd.org/api/units/1819794/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:16.030263Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "First, this is a 'bare repository' which has the repository database, but no checked out worktree. This is great for mirroring, but terrible for day to day work. There's a number of ways around this with `git worktree`:" ], "previous_source": "", "target": [ "First, this is a 'bare repository' which has the repository database, but no checked out worktree. This is great for mirroring, but terrible for day to day work. There's a number of ways around this with `git worktree`:" ], "id_hash": 4634419396693819568, "content_hash": 4634419396693819568, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1919", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 544, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 38, "source_unit": "https://translate-dev.freebsd.org/api/units/1819796/?format=api", "priority": 100, "id": 1819796, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=c050c3e3181d80b0", "url": "https://translate-dev.freebsd.org/api/units/1819796/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:16.033428Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "% git clone --mirror https://git.freebsd.org/ports.git ports.git\n% cd ports.git\n% git worktree add ../ports main\n% git worktree add ../quarterly branches/2020Q4\n% cd ../ports\n" ], "previous_source": "", "target": [ "% git clone --mirror https://git.freebsd.org/ports.git ports.git\n% cd ports.git\n% git worktree add ../ports main\n% git worktree add ../quarterly branches/2020Q4\n% cd ../ports\n" ], "id_hash": 6940782060434078769, "content_hash": 6940782060434078769, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1927", "context": "", "note": "type: delimited block . 4", "flags": "no-wrap", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 545, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 24, "source_unit": "https://translate-dev.freebsd.org/api/units/1819798/?format=api", "priority": 100, "id": 1819798, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=e0529c829793bc31", "url": "https://translate-dev.freebsd.org/api/units/1819798/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:16.036694Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "But if you aren't using your mirror for further local clones, then it's a poor match." ], "previous_source": "", "target": [ "But if you aren't using your mirror for further local clones, then it's a poor match." ], "id_hash": 3171705716629670793, "content_hash": 3171705716629670793, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1930", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 546, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 16, "source_unit": "https://translate-dev.freebsd.org/api/units/1819800/?format=api", "priority": 100, "id": 1819800, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=ac04298b7bc98b89", "url": "https://translate-dev.freebsd.org/api/units/1819800/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:16.039850Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "The second disadvantage is that Git normally rewrites the refs (branch name, tags, etc) from upstream so that your local refs can evolve independently of upstream. This means that you'll lose changes if you are committing to this repository on anything other than private project branches." ], "previous_source": "", "target": [ "The second disadvantage is that Git normally rewrites the refs (branch name, tags, etc) from upstream so that your local refs can evolve independently of upstream. This means that you'll lose changes if you are committing to this repository on anything other than private project branches." ], "id_hash": -12765284345658676, "content_hash": -12765284345658676, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1933", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 547, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 46, "source_unit": "https://translate-dev.freebsd.org/api/units/1819802/?format=api", "priority": 100, "id": 1819802, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=7fd2a60aa11ec2cc", "url": "https://translate-dev.freebsd.org/api/units/1819802/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:16.042961Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "which says just fetch the branch refs." ], "previous_source": "", "target": [ "which says just fetch the branch refs." ], "id_hash": -7564791826981452710, "content_hash": -7564791826981452710, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1945", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 551, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 7, "source_unit": "https://translate-dev.freebsd.org/api/units/1819804/?format=api", "priority": 100, "id": 1819804, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=170475e9d0fe045a", "url": "https://translate-dev.freebsd.org/api/units/1819804/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:16.048041Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "However, the FreeBSD repository has a number of other things in it. To see those, you can add explicit refspecs for each ref namespace, or you can fetch everything. To setup your repository to do that:" ], "previous_source": "", "target": [ "However, the FreeBSD repository has a number of other things in it. To see those, you can add explicit refspecs for each ref namespace, or you can fetch everything. To setup your repository to do that:" ], "id_hash": -1875285590814201091, "content_hash": -1875285590814201091, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1949", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 552, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 36, "source_unit": "https://translate-dev.freebsd.org/api/units/1819806/?format=api", "priority": 100, "id": 1819806, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=65f9a5b0db1c6afd", "url": "https://translate-dev.freebsd.org/api/units/1819806/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:16.051090Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "git config --add remote.freebsd.fetch '+refs/*:refs/freebsd/*'\n" ], "previous_source": "", "target": [ "git config --add remote.freebsd.fetch '+refs/*:refs/freebsd/*'\n" ], "id_hash": 4908254414174092902, "content_hash": 4908254414174092902, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1953", "context": "", "note": "type: delimited block . 4", "flags": "no-wrap", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 553, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 5, "source_unit": "https://translate-dev.freebsd.org/api/units/1819808/?format=api", "priority": 100, "id": 1819808, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=c41d9f627816fe66", "url": "https://translate-dev.freebsd.org/api/units/1819808/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:16.054325Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "which will put everything in the upstream repository into your local repository's `refs/freebsd/` namespace. Please note, that this also grabs all the unconverted vendor branches and the number of refs associated with them is quite large." ], "previous_source": "", "target": [ "which will put everything in the upstream repository into your local repository's `refs/freebsd/` namespace. Please note, that this also grabs all the unconverted vendor branches and the number of refs associated with them is quite large." ], "id_hash": 8569014296249727053, "content_hash": 8569014296249727053, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1957", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 554, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 36, "source_unit": "https://translate-dev.freebsd.org/api/units/1819810/?format=api", "priority": 100, "id": 1819810, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=f6eb411a1335784d", "url": "https://translate-dev.freebsd.org/api/units/1819810/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:16.057447Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "You'll need to refer to these 'refs' with their full name because they aren't in and of Git's regular namespaces." ], "previous_source": "", "target": [ "You'll need to refer to these 'refs' with their full name because they aren't in and of Git's regular namespaces." ], "id_hash": 6490199069844117078, "content_hash": 6490199069844117078, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1959", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 555, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 20, "source_unit": "https://translate-dev.freebsd.org/api/units/1819812/?format=api", "priority": 100, "id": 1819812, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=da11d1aadfa11656", "url": "https://translate-dev.freebsd.org/api/units/1819812/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:16.060632Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "git log refs/freebsd/vendor/zlib/1.2.10\n" ], "previous_source": "", "target": [ "git log refs/freebsd/vendor/zlib/1.2.10\n" ], "id_hash": -5081891967131589158, "content_hash": -5081891967131589158, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1963", "context": "", "note": "type: delimited block . 4", "flags": "no-wrap", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 556, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 3, "source_unit": "https://translate-dev.freebsd.org/api/units/1819814/?format=api", "priority": 100, "id": 1819814, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=39797e2e5035e5da", "url": "https://translate-dev.freebsd.org/api/units/1819814/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:16.063743Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "would look at the log for the vendor branch for zlib starting at 1.2.10." ], "previous_source": "", "target": [ "would look at the log for the vendor branch for zlib starting at 1.2.10." ], "id_hash": 5042003186106218340, "content_hash": 5042003186106218340, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1966", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 557, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 14, "source_unit": "https://translate-dev.freebsd.org/api/units/1819816/?format=api", "priority": 100, "id": 1819816, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=c5f8cb2f203fb764", "url": "https://translate-dev.freebsd.org/api/units/1819816/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:16.066809Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "Now add a remote on your local system that points to your fork:" ], "previous_source": "", "target": [ "Now add a remote on your local system that points to your fork:" ], "id_hash": -8639238807912946691, "content_hash": -8639238807912946691, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1988", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 564, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 13, "source_unit": "https://translate-dev.freebsd.org/api/units/1819820/?format=api", "priority": 100, "id": 1819820, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=081b4213ac9463fd", "url": "https://translate-dev.freebsd.org/api/units/1819820/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:16.076348Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "% git remote add github git@github.com:gvnn3/freebsd-src.git\n% git remote -v\ngithub\tgit@github.com:gvnn3/freebsd-src.git (fetch)\ngithub\tgit@github.com:gvnn3/freebsd-src.git (push)\nfreebsd\thttps://git.freebsd.org/src.git (fetch)\nfreebsd\tssh://git@gitrepo.freebsd.org/src.git (push)\n" ], "previous_source": "", "target": [ "% git remote add github git@github.com:gvnn3/freebsd-src.git\n% git remote -v\ngithub\tgit@github.com:gvnn3/freebsd-src.git (fetch)\ngithub\tgit@github.com:gvnn3/freebsd-src.git (push)\nfreebsd\thttps://git.freebsd.org/src.git (fetch)\nfreebsd\tssh://git@gitrepo.freebsd.org/src.git (push)\n" ], "id_hash": -1484060242927240413, "content_hash": -1484060242927240413, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1996", "context": "", "note": "type: delimited block . 4", "flags": "no-wrap", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 565, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 22, "source_unit": "https://translate-dev.freebsd.org/api/units/1819822/?format=api", "priority": 100, "id": 1819822, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=6b678f126b0abb23", "url": "https://translate-dev.freebsd.org/api/units/1819822/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:16.079469Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "With this in place you can create a branch crossref:committers-guide[keeping_a_local_branch,as shown above]." ], "previous_source": "", "target": [ "With this in place you can create a branch crossref:committers-guide[keeping_a_local_branch,as shown above]." ], "id_hash": 4873737164736775124, "content_hash": 4873737164736775124, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1999", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 566, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 12, "source_unit": "https://translate-dev.freebsd.org/api/units/1819824/?format=api", "priority": 100, "id": 1819824, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=c3a2fe2110c143d4", "url": "https://translate-dev.freebsd.org/api/units/1819824/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:16.082681Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "% git checkout -b gnn-pr2001-fix\n" ], "previous_source": "", "target": [ "% git checkout -b gnn-pr2001-fix\n" ], "id_hash": 7238450771754436631, "content_hash": 7238450771754436631, "location": "documentation/content/en/articles/committers-guide/_index.adoc:2003", "context": "", "note": "type: delimited block . 4", "flags": "no-wrap", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 567, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 5, "source_unit": "https://translate-dev.freebsd.org/api/units/1819826/?format=api", "priority": 100, "id": 1819826, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=e47424a03e934817", "url": "https://translate-dev.freebsd.org/api/units/1819826/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:16.085754Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "Make whatever modifications you wish in your branch. Build, test, and once you're ready to collaborate with others it's time to push your changes into your hosted branch. Before you can push you'll have to set the appropriate upstream, as Git will tell you the first time you try to push to your +github+ remote:" ], "previous_source": "", "target": [ "Make whatever modifications you wish in your branch. Build, test, and once you're ready to collaborate with others it's time to push your changes into your hosted branch. Before you can push you'll have to set the appropriate upstream, as Git will tell you the first time you try to push to your +github+ remote:" ], "id_hash": -3600036293348624298, "content_hash": -3600036293348624298, "location": "documentation/content/en/articles/committers-guide/_index.adoc:2007", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 568, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 55, "source_unit": "https://translate-dev.freebsd.org/api/units/1819828/?format=api", "priority": 100, "id": 1819828, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=4e0a1a10a470f856", "url": "https://translate-dev.freebsd.org/api/units/1819828/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:16.088877Z" } ] }