Differences
This shows you the differences between two versions of the page.
Both sides previous revisionPrevious revisionNext revision | Previous revisionNext revisionBoth sides next revision | ||
devel:git [2018/06/02 10:40] – bluesabre | devel:git [2018/06/04 09:53] – bluesabre | ||
---|---|---|---|
Line 1: | Line 1: | ||
====== Xubuntu Git Workflow ====== | ====== Xubuntu Git Workflow ====== | ||
- | The Xubuntu team uses Git for all version-controlled projects. While Launchpad' | + | The Xubuntu team uses Git for all version-controlled projects. While Launchpad' |
If this is your first time working with Git, the Xfce Wiki has a great guide for getting started and some typical use cases. \\ | If this is your first time working with Git, the Xfce Wiki has a great guide for getting started and some typical use cases. \\ | ||
https:// | https:// | ||
+ | |||
+ | //**Please note that this change has nothing to do with GitHub and recent related news. GitHub is a different service than Launchpad with the only similarity being the usage of the Git VCS.**// | ||
===== Why Git? ===== | ===== Why Git? ===== | ||
Line 40: | Line 42: | ||
Launchpad does not currently support automatic synchronization to/from Git branches. Instead, you can create an git-to-bzr code import, and import translations from this Bazaar branch. You can periodically download the translations for a project and sync them manually. | Launchpad does not currently support automatic synchronization to/from Git branches. Instead, you can create an git-to-bzr code import, and import translations from this Bazaar branch. You can periodically download the translations for a project and sync them manually. | ||
+ | |||
+ | ===== Examples ===== | ||
+ | |||
+ | We'll use Xubuntu Documentation ([[https:// | ||
+ | |||
+ | ==== Cloning a Repository ==== | ||
+ | |||
+ | < | ||
+ | cd xubuntu-docs</ | ||
+ | |||
+ | ==== Making Changes ==== | ||
+ | |||
+ | < | ||
+ | git status # Shows changed files | ||
+ | git diff # Shows changes to files | ||
+ | git add Makefile # Adds a single file to be committed | ||
+ | # or | ||
+ | git add -u # Adds all changed files to be committed | ||
+ | git commit -m "Some makefile changes" | ||
+ | git push # Pushes the commit to the repository</ | ||
+ | |||
+ | ==== Pushing to a Branch ==== | ||
+ | |||
+ | Say you have some changes you want want to have merged. Instead of pushing directly to the main repository, you can instead push your own branch. In the below example, you tell git about your new " | ||
+ | |||
+ | * " | ||
+ | * " | ||
+ | * " | ||
+ | * Replace these as necessary. | ||
+ | |||
+ | < | ||
+ | git remote add myremote lp: | ||
+ | git push --set-upstream myremote myfeaturebranch</ | ||
===== Git Repositories ===== | ===== Git Repositories ===== |