Changes between Version 2 and Version 3 of explainGIT


Ignore:
Timestamp:
Jan 21, 2015, 1:42:06 PM (10 years ago)
Author:
Silvan Scherrer
Comment:

--

Legend:

Unmodified
Added
Removed
Modified

  • explainGIT

    v2 v3  
    11This is a simple guide for developers, to allow a common tree structure and commit messages for every package stored into the main repository.
    22
    3 The below is work in progress.
    4 {{{
     3The below is work in progress:
     4
    55First of all, I want to give you a couple of tricks on how to do house keeping WRT pulling new changes from upstream in our git. According to our workflow, we periodically want to take new changes from the upstream branch we currently base our OS/2 releases on, as well as to switch to a new upstream branch when we think it’s time to do so for the OS/2 version.
    66
    … …  
    4747
    4848It should reset the repository to the state it was before issuing the merge command. Note that the abort command will most likely not work correctly if you execute any other git command that modifies the state of files in between.
    49 }}}