Created
January 14, 2020 17:50
-
-
Save TheoChevalier/cbdd534295099c1f671932b9b24426af to your computer and use it in GitHub Desktop.
git subtree testing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
theochevalier@Theos-MBP:foundation.mozilla.org (subtree)$ git subtree split -P network-api/locale/ -b l10n-sub | |
Created branch 'l10n-sub' | |
c0a9d990bbd15821f77ed16f16c470cd9b63cfcf | |
theochevalier@Theos-MBP:foundation.mozilla.org (subtree)$ git subtree push -P network-api/locale/ git@github.com:TheoChevalier/fomo-l10n.git master | |
git push using: git@github.com:TheoChevalier/fomo-l10n.git master | |
Énumération des objets: 84, fait. | |
Décompte des objets: 100% (84/84), fait. | |
Compression par delta en utilisant jusqu'à 12 fils d'exécution | |
Compression des objets: 100% (41/41), fait. | |
Écriture des objets: 100% (84/84), 15.94 Kio | 2.66 Mio/s, fait. | |
Total 84 (delta 36), réutilisés 9 (delta 3) | |
remote: Resolving deltas: 100% (36/36), done. | |
To github.com:TheoChevalier/fomo-l10n.git | |
* [new branch] c0a9d990bbd15821f77ed16f16c470cd9b63cfcf -> master | |
theochevalier@Theos-MBP:foundation.mozilla.org (subtree)$ git remote add fomo-l10n git@github.com:TheoChevalier/fomo-l10n.git | |
theochevalier@Theos-MBP:foundation.mozilla.org (subtree)$ rm -rf ./network-api/locale/ | |
theochevalier@Theos-MBP:foundation.mozilla.org (subtree)$ git commit -am "Remove locale folder" | |
[subtree 6f0660a2] Remove locale folder | |
7 files changed, 1767 deletions(-) | |
delete mode 100644 network-api/locale/de/LC_MESSAGES/django.po | |
delete mode 100644 network-api/locale/es/LC_MESSAGES/django.po | |
delete mode 100644 network-api/locale/fr/LC_MESSAGES/django.po | |
delete mode 100644 network-api/locale/pl/LC_MESSAGES/django.po | |
delete mode 100644 network-api/locale/pt/LC_MESSAGES/django.po | |
delete mode 100644 network-api/locale/pt_BR/LC_MESSAGES/django.po | |
delete mode 100644 network-api/locale/templates/LC_MESSAGES/django.pot | |
theochevalier@Theos-MBP:foundation.mozilla.org (subtree)$ git subtree add --prefix=network-api/locale/ fomo-l10n master | |
git fetch fomo-l10n master | |
Depuis github.com:TheoChevalier/fomo-l10n | |
* branch master -> FETCH_HEAD | |
* [nouvelle branche] master -> fomo-l10n/master | |
Added dir 'network-api/locale' | |
theochevalier@Theos-MBP:foundation.mozilla.org (subtree)$ cd network-api/ | |
theochevalier@Theos-MBP:network-api (subtree)$ ls | |
__init__.py db.sqlite3 locale manage.py media networkapi | |
theochevalier@Theos-MBP:network-api (subtree)$ cd ../ | |
theochevalier@Theos-MBP:foundation.mozilla.org (subtree)$ git push origin subtree | |
Énumération des objets: 68, fait. | |
Décompte des objets: 100% (68/68), fait. | |
Compression par delta en utilisant jusqu'à 12 fils d'exécution | |
Compression des objets: 100% (39/39), fait. | |
Écriture des objets: 100% (66/66), 12.49 Kio | 3.12 Mio/s, fait. | |
Total 66 (delta 30), réutilisés 3 (delta 1) | |
remote: Resolving deltas: 100% (30/30), completed with 2 local objects. | |
remote: | |
remote: Create a pull request for 'subtree' on GitHub by visiting: | |
remote: https://github.com/TheoChevalier/foundation.mozilla.org/pull/new/subtree | |
remote: | |
To github.com:TheoChevalier/foundation.mozilla.org.git | |
* [new branch] subtree -> subtree | |
theochevalier@Theos-MBP:foundation.mozilla.org (subtree)$ git checkout master | |
Basculement sur la branche 'master' | |
Votre branche est à jour avec 'origin/master'. | |
theochevalier@Theos-MBP:foundation.mozilla.org (master=)$ git pull origin master | |
remote: Enumerating objects: 1, done. | |
remote: Counting objects: 100% (1/1), done. | |
remote: Total 1 (delta 0), reused 0 (delta 0), pack-reused 0 | |
Dépaquetage des objets: 100% (1/1), 632 octets | 632.00 Kio/s, fait. | |
Depuis github.com:TheoChevalier/foundation.mozilla.org | |
* branch master -> FETCH_HEAD | |
4da8eadf..41e980a9 master -> origin/master | |
Mise à jour 4da8eadf..41e980a9 | |
Fast-forward | |
theochevalier@Theos-MBP:foundation.mozilla.org (master=)$ cd network-api/ | |
theochevalier@Theos-MBP:network-api (master=)$ ls | |
__init__.py db.sqlite3 locale manage.py media networkapi | |
theochevalier@Theos-MBP:network-api (master=)$ cd ../ | |
theochevalier@Theos-MBP:foundation.mozilla.org (master=)$ git push origin master | |
Everything up-to-date | |
theochevalier@Theos-MBP:foundation.mozilla.org (master=)$ git fetch fomo-l10n | |
remote: Enumerating objects: 14, done. | |
remote: Counting objects: 100% (14/14), done. | |
remote: Compressing objects: 100% (3/3), done. | |
remote: Total 10 (delta 4), reused 9 (delta 3), pack-reused 0 | |
Dépaquetage des objets: 100% (10/10), 732 octets | 73.00 Kio/s, fait. | |
Depuis github.com:TheoChevalier/fomo-l10n | |
c0a9d990..abafa180 master -> fomo-l10n/master | |
theochevalier@Theos-MBP:foundation.mozilla.org (master=)$ git checkout -b land-14-jan | |
Basculement sur la nouvelle branche 'land-14-jan' | |
theochevalier@Theos-MBP:foundation.mozilla.org (land-14-jan)$ git fetch fomo-l10n | |
theochevalier@Theos-MBP:foundation.mozilla.org (land-14-jan)$ git merge -s subtree --squash fomo-l10n/master --allow-unrelated-histories | |
Validation compressée -- HEAD non mise à jour | |
La fusion automatique a réussi ; stoppée avant la validation comme demandé | |
theochevalier@Theos-MBP:foundation.mozilla.org (land-14-jan)$ git status | |
Sur la branche land-14-jan | |
Modifications qui seront validées : | |
(utilisez "git restore --staged <fichier>..." pour désindexer) | |
modifié : network-api/locale/fr/LC_MESSAGES/django.po | |
theochevalier@Theos-MBP:foundation.mozilla.org (land-14-jan)$ git commit -m "Merging translations from subtree" | |
[land-14-jan a99868c6] Merging translations from subtree | |
1 file changed, 2 insertions(+), 2 deletions(-) | |
theochevalier@Theos-MBP:foundation.mozilla.org (land-14-jan)$ git push origin land-14-jan | |
Énumération des objets: 13, fait. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment