This is the mail archive of the systemtap@sourceware.org mailing list for the systemtap project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

gitified


Hi -

As of this morning, we're using git as the primary source control
system for systemtap.  Bits other than /src (/htdocs, ...) remain
under CVS control for now.  Here are some hints for the simplest
developer usage:

# to start
% git clone ssh://sources.redhat.com/git/systemtap.git

# to update all remote branches you track
% git pull

# to make changes in mainline
% git checkout master
% vi files.cxx
% git commit -a
% git push

# create private branches
% git branch bazboo # implies git checkout bazboo
% vi; git commit -a

# to create a public branch
% git branch foobar
% git push origin foobar:refs/heads/foobar

# to maintain a public branch
% git branch -r foobar origin/foobar
% git pull # to merge
% vi; git commit -a; git push # also works; it's not read-only

# to merge changes from of another branch
% git checkout bazboo
% git merge foobar
% vi conflicted.cxx; git add conflicted.cxx; git commit  # to fix merge

# other useful commands
% git status
% git stash
% git diff
% git branch; git branch -r


- FChE


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]