[Guide] How to use Github

Search This thread
By:
Advanced…
eagleeyetom

eagleeyetom

Retired Senior Mod & DC Lead - Active Pole Dancer
Jan 22, 2011
7,709
14,677
37
Gdańsk
xda-developers.com
Samsung Galaxy Watch 4
MikeyCriggz said:
So... This is probably a dumb question that's been asked a million times, but go easy on me.

How would I upload a local repo to Git-Hub?

Sent from my Galaxy Nexus using Tapatalk 2
Click to expand...
Click to collapse

Hey.
You need to create it on the website and follow the instructions. Just create it without README, otherwise you'll have to pull first before pushing.
Good luck.:highfive:
 
The_Wolf91

The_Wolf91

Senior Member
Feb 15, 2012
466
700
Is it possible to use only Github to compile a custom rom?
For example: I want to build on a CM10.1 base ROM adding some features from others ROM (like AOKP). In this case, prefixing that I'll build only for one device, what should I do? In particular, what should I fork from CM10.1? And how to compile on Ubuntu from my own Github account, with my custom modifications (so, not using Cyanogenmod compile guide, which repo's all devices)?
 
The_Wolf91

The_Wolf91

Senior Member
Feb 15, 2012
466
700
The_Wolf91 said:
Is it possible to use only Github to compile a custom rom?
For example: I want to build on a CM10.1 base ROM adding some features from others ROM (like AOKP). In this case, prefixing that I'll build only for one device, what should I do? In particular, what should I fork from CM10.1? And how to compile on Ubuntu from my own Github account, with my custom modifications (so, not using Cyanogenmod compile guide, which repo's all devices)?
Click to expand...
Click to collapse

cowsquad said:
Just modify the manifest and remove all the devices you don't need

Sent from my Galaxy Nexus using Tapatalk 2
Click to expand...
Click to collapse

Ok, can anybody help me for the rest?
 
A

AndroidSlave

Guest
Look at this step by step guide. If your not on one of the devices supported by this guide you will have to find out what settings you need for yours. You need the device specific manifest settings too

http://xdaforums.com/showthread.php?t=2112820

The_Wolf91 said:
Is it possible to use only Github to compile a custom rom?
For example: I want to build on a CM10.1 base ROM adding some features from others ROM (like AOKP). In this case, prefixing that I'll build only for one device, what should I do? In particular, what should I fork from CM10.1? And how to compile on Ubuntu from my own Github account, with my custom modifications (so, not using Cyanogenmod compile guide, which repo's all devices)?
Click to expand...
Click to collapse







The_Wolf91 said:
Ok, can anybody help me for the rest?
Click to expand...
Click to collapse



Sent from my Samsung Galaxy SV using Tapatalk 3
 
C

cowsquad

Senior Member
Aug 31, 2009
1,383
323
Portland, Oregon
OnePlus 9 Pro
asf58967 said:
Look at this step by step guide. If your not on one of the devices supported by this guide you will have to find out what settings you need for yours. You need the device specific manifest settings too

http://xdaforums.com/showthread.php?t=2112820













Sent from my Samsung Galaxy SV using Tapatalk 3
Click to expand...
Click to collapse

But he want to know how to get features from other ROMs and incorporate them into his own build.

Sent from my Galaxy Nexus using Tapatalk 2
 
cj360

cj360

Senior Member
Oct 24, 2011
1,332
709
Hello, not sure if I just messed up paths in my manifest or what but I just started getting HTTP errors when I try to sync:
Code: 
Fetching projects:  96% (312/324)  From https://github.com/cj360/PA_cm_manifest
   eee8bbe..40d10d3  cm_jellybean -> github/cm_jellybean
Fetching projects:  99% (321/324)  cj360
Password for 'https://cj360@github.com': 
fatal: https://github.com/paranoidandroid/android_vendor_pa/info/refs not found: did you run git update-server-info on the server?

When the repo that it can not pull from is here and I can veiw it fine on my web browser.
 
Last edited:
GideonX

GideonX

Senior Member
Jun 10, 2010
3,489
3,754
NYC
www.droidhype.com
cj360 said:
Hello, not sure if I just messed up paths in my manifest or what but I just started getting HTTP errors when I try to sync:
Code: 
Fetching projects:  93% (302/324)  error: Failed connect to github.com:443; Connection refused while accessing https://github.com/CyanogenMod/android_external_mesa3d/info/refs
fatal: HTTP request failed
Fetching projects:  96% (312/324)  error: Failed connect to github.com:443; Connection refused while accessing https://github.com/CyanogenMod/android_external_opencv/info/refs
fatal: HTTP request failed
Fetching projects:  97% (315/324)  error: Failed connect to github.com:443; Connection refused while accessing https://github.com/CyanogenMod/android_external_hyphenation/info/refs
fatal: HTTP request failed
error: Failed connect to github.com:443; Connection refused while accessing https://github.com/cj360/PA_cm_manifest/info/refs

Here's the manifest I'm trying to use
Click to expand...
Click to collapse

Try using ssh instead.

Sent from my SCH-I535
 
cj360

cj360

Senior Member
Oct 24, 2011
1,332
709
So change these:
Code: 
<remote  name="aosp"
           fetch="https://android.googlesource.com"
           review="https://android-review.googlesource.com/" />

  <remote  name="github"
           fetch="https://github.com" />

  <remote  name="paranoid"
           fetch="ssh://git@bitbucket.org/paranoidandroid/" 
           revision="jellybean" />

  <remote  name="cm"
           fetch="git://github.com/CyanogenMod/" />

aren't cm and paranoid already using ssh?
 
fabioio

fabioio

Senior Member
Feb 16, 2011
981
2,245
Lrago Marinone
Prawesome said:
No. Read the title
"How to use Github"

Sent from my Nexus 4 using Tapatalk 4 Beta
Click to expand...
Click to collapse

Sorry but i have read the section that explains how to merge code but i'm not a developer so I'm trying to learn how can i add some features to my rom.. I really want to add Halo but from reading the second post (section 6.) i've not a so clear idea how to do that!

I've found the sources on G+ profile of Paranoid so I tryed to follow this guide but i don't know if it's right to fetch all the framework and settings apk or if i need only to change or add some files..
I can't understand if following this guide i will have Halo in my rom or i need to change some files manually..

don't be so rude please! I'm just trying to learn!
 
Prawesome

Prawesome

Senior Member
Sep 26, 2011
9,168
1,723
Error 404- Not found
fabioio said:
Sorry but i have read the section that explains how to merge code but i'm not a developer so I'm trying to learn how can i add some features to my rom.. I really want to add Halo but from reading the second post (section 6.) i've not a so clear idea how to do that!

I've found the sources on G+ profile of Paranoid so I tryed to follow this guide but i don't know if it's right to fetch all the framework and settings apk or if i need only to change or add some files..
I can't understand if following this guide i will have Halo in my rom or i need to change some files manually..

don't be so rude please! I'm just trying to learn!
Click to expand...
Click to collapse

You might have to edit some code. I am not really sure about it.. I don't think its going to be as simple as pulling the required files.. Does your phone have official PA support?
Sorry about that.. I thought you were another one of the noobs who never read anything and just ask random questions.. You are not

Sent from my Nexus 4 using Tapatalk 4 Beta
 
  • Like
Reactions: fabioio
You must log in or register to reply here.

Similar threads

E
  • Poll
[GUIDE]How to reboot to EDL from fastboot
Replies
155
Views
855K
andrewisontop
andrewisontop
M
[GUIDE][HOW-TO]Crack android pattern lock!
Replies
174
Views
740K
A
ashish.9719
gokussjx
  • Locked
[GUIDE][AOSPA:v3.+] How to Compile AOSPA from Source : + Support and Maintenance
Replies
4K
Views
684K
D
Darth
piraterex
  • Poll
[Android][Guide]Hacking And Bypassing Android Password/Pattern/Face/PI
Replies
203
Views
1M
R
rinacreative
AndroidFileHost
  • Poll
BlueStacks Beta 4/3 ROOTED & Play Store Guide
Replies
1K
Views
889K
B
bangjune

Top Liked Posts

24 Hours All time
  • There are no posts matching your filters.
  • 360
    eagleeyetom
    eagleeyetom
    Hi.
    Today I would like to show you how to use github. I'm not an expert (I'm rather n00b TBH :p) but I learned some things and might help you with simple git commands.

    1. Github? What's that?

    In short it's the web-based hosting service for software development projects that use the Git revision control system. In English - the place where you store your sources.

    c826ad7b.png


    2. Creating an account.

    • 2.0 Download the required libs
      Code: 
      sudo apt-get install git
    • 2.1 Create an account on github.com website
    • 2.2 In terminal type:
      Code: 
      git config --global user.name "Your Name Here"
git config --global user.email "your_email@youremail.com"

      NOTE: use the e-mail used in the website account creation
      2.3 Create your unique SSH public key
      Code: 
      ssh-keygen -t rsa -C "your_email@youremail.com"
# Creates a new ssh key using the provided email
# Generating public/private rsa key pair.
# Enter file in which to save the key (/c/Users/you/.ssh/id_rsa): [Press enter]
      Now you need to enter a passphrase.
      Code: 
      # Enter passphrase (empty for no passphrase): [Type a passphrase]
# Enter same passphrase again: [Type passphrase again]

      Which should give you something like this:
      Code: 
      # Your identification has been saved in /c/Users/you/.ssh/id_rsa.
# Your public key has been saved in /c/Users/you/.ssh/id_rsa.pub.
# The key fingerprint is:
# 01:0f:f4:3b:ca:85:d6:17:a1:7d:f0:68:9d:f0:a2:db your_email@youremail.com

      Now go to ~/.ssh folder and copy your id_rsa.pub content into account administration on github.com
      7326e529.png


      ... and check if everything works

      Code: 
      ssh -T git@github.com
      Code: 
      The authenticity of host 'github.com (207.97.227.239)' can't be established.
# RSA key fingerprint is 16:27:ac:a5:76:28:2d:36:63:1b:56:4d:eb:df:a6:48.
# Are you sure you want to continue connecting (yes/no)?

      Duh?! Sure I want! Yes! Yes! Yessss!

      Code: 
      # Hi username! You've successfully authenticated, but GitHub does not
# provide shell access.

    And we are ready to do some serious things! :highfive:

    3. Forking a repo

    As an example I'll use https://github.com/CyanogenMod/android_packages_apps_Settings
    Open this link in the browser and click fork.

    3a2b3915.png


    • 3.1 Clone the source from your fork.
      I use my account as an example.

      Code: 
      git clone git://github.com/eagleeyetom/android_packages_apps_Settings.git -b gingerbread

      -b gingerbread let us to choose what branch are we going to download

      d8305e5d.png

    • 3.2 Do some changes!

      For example add files, remove them etc.
    • 3.3 Commit the changes

      OPTIONAL I created new branch at my project and named it "xda"
      To do this go to the cloned folder and type:
      Code: 
      git branch xda
git checkout xda

      Now it's time to see what's going on:
      Magic command
      Code: 
      git status

      987e44ce.png


      As you can see I removed few files and added one.

      Now it's time to tell the git what we want to do.

      4. Pushing the changes

      Add all modified files:
      Code: 
      git add .

      Add all removed files
      Code: 
      git add -u

      You can also add/rm one file
      Code: 
      git add name_of_file
git rm name_of_file

      After git status we should get something like this:

      cda04609.png


      Now it's time to commit:

      Code: 
      git commit -m 'my first commit'

      And finally to push:

      Code: 
      git push

      If you'll get some errors use the following:

      Code: 
      git push git@github.com:eagleeyetom/android_packages_apps_Settings.git xda
      I used the name of my github and the name of the branch in the end.

      f4c5b1cf.png


      Woo hoo! Now let's check the website.

      a123383f.png

    That's the most basic basics :p
    In the next posts I will show you some more advanced commands like merge, cherry-pick, removing branches etc.
    :)

    Credits:
    Google :D
    Github Team
    All my friends from GingerDX IRC channel

    If you find it useful hit thanks button. You can also consider a small donation ;)
    View
    158
    eagleeyetom
    eagleeyetom
    5. Removing branch.
    This one took me a lot of googleing and many bad words has been said :p

    I'll make a test branch 'deleteme'

    Code: 
    git branch deleteme
git checkout deleteme
git push git@github.com:eagleeyetom/android_packages_apps_Settings.git deleteme

    And I have new remote branch now.
    But I want to delete it.
    Here's the answer.
    First:
    Check the branches:
    Code: 
    git branch -a
    And I'll get:
    Code: 
      remotes/origin/HEAD -> origin/gingerbread
  remotes/origin/deleteme
  remotes/origin/donut
  remotes/origin/eclair
  remotes/origin/froyo
  remotes/origin/froyo-stable
  remotes/origin/gb-release-7.2
  remotes/origin/gingerbread
  remotes/origin/gingerbread-release
  remotes/origin/ics
  remotes/origin/icsify
  remotes/origin/wip
  remotes/origin/xda

    I want to delete this branch.
    Type:
    Code: 
    git branch -rd origin/deleteme
# Deleted remote branch origin/deleteme (was 808ffbb).
    Code: 
    git push git@github.com:eagleeyetom/android_packages_apps_Settings.git :refs/heads/deleteme

    And the remote branch is gone! Yeah!

    6. Merging the commits
    Imagine the situation that you want to add a commits created by someone else. Let's use our great Recognized Developer nobodyAtall

    We need to add the source:
    Code: 
    git remote add upstream https://github.com/MiniCM/android_packages_apps_Settings.git

    Download the branch:
    Code: 
    git fetch upstream
    Code: 
    * [new branch]      cm-9.0.0   -> upstream/cm-9.0.0
 * [new branch]      donut      -> upstream/donut
 * [new branch]      eclair     -> upstream/eclair
 * [new branch]      froyo      -> upstream/froyo
 * [new branch]      froyo-stable -> upstream/froyo-stable
 * [new branch]      gb-release-7.2 -> upstream/gb-release-7.2
 * [new branch]      gingerbread -> upstream/gingerbread
 * [new branch]      gingerbread-release -> upstream/gingerbread-release
 * [new branch]      ics        -> upstream/ics
 * [new branch]      jellybean  -> upstream/jellybean
 * [new branch]      master     -> upstream/master
 * [new branch]      wip        -> upstream/wip


    You'll get a message to resolve the conflicts. In short and most n00b friendly way is to open pointed files and delete the:
    <<<<<<<<
    =======
    >>>>>>>>
    symbols.

    Don't forget to test make before pushing!

    Now standard procedure:
    Code: 
    git add .
git commit -m 'test merge'
git push git@github.com:eagleeyetom/android_packages_apps_Settings.git xda

    7. Cherry-pick the single commit
    Now it's time to add specific commit to our build. I'm going to use this one.
    Code: 
    git remote add upstream https://github.com/MiniCM/android_packages_apps_Settings.git
git fetch upstream
git cherry-pick c95854e8c91ec279bd3719c637f531491855278a

    And we're good :highfive:
    Now commit should be added. All you need now is to push - no need to commit :)

    8. Changing the branch
    While using git you may noticed that sometimes after fresh sync there is no branch selected. Imagine the situation when you are on a branch A and want to check to branch B, because it uses a different method (like framework patch etc.)
    The solution is pretty simple.
    Code: 
    git checkout -t remote_name/remote_branch
    It allows you to change the branch to remote one without cloning the whole repo again.
    View
    124
    eagleeyetom
    eagleeyetom
    Pull request

    If you feel that you have fixed a problem and want to help the developer to make his own ROM/kernel etc. you should consider to make a pull request. Pull request adds the changes you have made to the others repo.

    First of all.
    Fork and clone destined repo.
    Check the previous post about forking and cloning.
    Now make some changes and upload it to your own remote git.

    Then, go to your forked repo using browser and click on Pull request.

    ca9c75ac.png


    Then choose the account and branch to pull-request.

    e72882aa.png


    Click and wait for your request to be merged :)

    Merging a pull request.
    Sometimes someone wants to add something to your code.
    You'll be notified by e-mail and also see the notification on your github website.

    Go there and click Open

    be8d06e7.png


    When the changes can't be merged you'll see such message:

    f927eafa.png


    But when it's green, you are ready to merge it :)

    4c803a33.png


    Don't forget to review the code. In other way you'll be forced to delete the commit.

    You can also use text method:

    Code: 
    git checkout master
[COLOR="DeepSkyBlue"]# Check out your master branch[/COLOR]
git remote add TeamFun git://github.com/TeamFun/android_packages_apps_Settings.git
[COLOR="deepskyblue"]# Add a new remote named 'TeamFun'[/COLOR]
git fetch TeamFun
[COLOR="deepskyblue"]# Pull in all the commits from the 'cameronmcefee' remote[/COLOR]
git merge TeamFun/gingerbread
[COLOR="deepskyblue"]# Merge your master branch into the 'gingerbread' branch from the 'TeamFun' remote[/COLOR]
git push git@github.com:eagleeyetom/android_packages_apps_Settings.git master
[COLOR="deepskyblue"]# Push your newly-merged branch back to GitHub[/COLOR]

    or

    Code: 
    git checkout master
[COLOR="DeepSkyBlue"]# Check out your master branch[/COLOR]
$ curl http://github.com/octocat/Spoon-Knife/pull/25.patch | git am
[COLOR="deepskyblue"]# Grab the patch generated by a pull request and feed it into a new commit[/COLOR]
$ git push git@github.com:eagleeyetom/android_packages_apps_Settings.git master
[COLOR="deepskyblue"]# Push your newly-updated commit back to GitHub[/COLOR]

    TIPS AND TRICKS

    REVERT CHANGES

    To discard all unstaged changes e.g. failed merge etc. type:
    Code: 
    git checkout .
# to delete all changes

git checkout path/to/file

# to discard changes for a specific file

    You can also use:
    Code: 
    rm -rf ./ 

[COLOR="Cyan"]# deletes all of the files in the directory[/COLOR]

git reset --hard

[COLOR="cyan"]#This is going to restore the git to the previous state[/COLOR]

    HOW TO REMOVE COMMITTED CHANGES?

    To remove committed changes you have to revert the commit. But how to do that? It's your answer

    Code: 
    git reset HEAD --hard
    HEAD is the previous commit. To revert to previous state use HEAD~1, HEAD~2 etc. you can also use the code taken from git log.

    GIT PATCH AND GIT APPLY

    Now I want to make a patch file to e.g. send an e-mail with my commited changes.

    First I need to find a changes made by a commit. To do this I need to know commit ID.
    Code: 
    git log --oneline #This would show the commit ID's

    Now pick the commit for example 22a95d1 and use git show to make a patch

    Code: 
    git show 22a95d1 > patchname.patch

    And I got patch, but how to apply it?
    The answer is easy. Use git apply.

    Code: 
    git apply patchname.patch
# --check checks if the patch can be applied

    FORCE PUSH
    Sometimes github doesn't want to cooperate - just like some people :D
    You can force it by adding --force or -f
    Code: 
    git push -f git@github.com:eagleeyetom/android_packages_apps_Settings.git master
    n00b method to add changes after failed push.
    Clone the repo and delete everything but .git directory. Then copy modified content, commit and push :p
    View
    3
    sgt. slaughter
    sgt. slaughter
    Stickied this...

    good learning guide to show people how to use github when starting out for sure. :)
    View
    3
    eagleeyetom
    eagleeyetom
    Mysteryagr said:
    First of all, I'm new to this :D
    I setup everything according to the tutorial.
    Now I'm upstreaming sony 2011 stock kernel 2.6.32.9 on local repo and I want to sync changes to github repo.
    Acording to "git status" command I've modified and deleted files.
    should I use this command " git add . " then " git add -u"
    or just "git add ." ??
    Excuse me for being noob , Just want to make sure that I do the right thing.
    Thanks in advance.
    Click to expand...
    Click to collapse

    You should execute both commands. And no need to apologize, mate :) We're here to learn :)
    View

New posts