Changes between Version 11 and Version 12 of Developer/Git/Users


Ignore:
Timestamp:
Nov 21, 2013, 2:58:22 AM (6 years ago)
Author:
JoelSherrill
Comment:

/* Using the GIT Repository */

Legend:

Unmodified
Added
Removed
Modified
  • Developer/Git/Users

    v11 v12  
    3333}}}
    3434This will create a local branch named "rtems410", containing the rtems-4.10 release, that will track the remote branch "rtems-4-10-branch" in origin (git://git.rtems.org/rtems.git). The 'git branch' command prints a list of the current local branches, indicating the one currently checked out.
     35
     36Another way to do this which pushes directly to the upstream is shown here in an example which simply (and quickly) applies a patch to the branch:
     37
     38{{{
     39git checkout -b rtems4.10 --track remotes/upstream/4.10
     40cat /tmp/sp.diff | patch
     41vi sparc.t
     42git add sparc.t
     43git commit -m "sparc.t: Correct for V8/V9"
     44git push upstream rtems4.10:4.10
     45git checkout master
     46git log
     47git branch -d rtems4.10
     48}}}
    3549
    3650If you want to switch between local branches: