Changes between Version 34 and Version 35 of SourceCodeGit

Timestamp:

Feb 8, 2014, 6:08:04 AM (11 years ago)

Author:

Bluefin Tuna

Comment:

Added note about git history dump

SourceCodeGit

@@ -76 +76 @@
    BOINC developers perform long-running work on source code that needs to be visible to other members of the team by working on a 'remote branch'. There are:
       * The '''remote master branch''': This is the most recent version of the source code. It always exists, contains the freshest code and has not necessarily been thoroughly tested.
-      * '''Other branches''': For example, work on version 6.12 of BOINC that is not done in the 'remote master branch', for example due to the need to apply an urgent fix may be done in a remote branch called 'client_release/6/6.12'.
+      * '''Other branches''': For example, work on version 6.12 of BOINC that is not done in the 'remote master branch', (let's say because of the need for a immediate bugfix) may be done in a remote branch called 'client_release/6/6.12'.
         Run `git remote show origin` to list the remote branches.
         
-As you cloned the Git repository, a 'local master branch' was created. This initially corresponds to the 'remote master branch', but once you start editing files, it will evidently deviate from it. 
+As you cloned the Git repository, a 'local master branch' was created. This initially corresponds to the 'remote master branch', but once you start editing files, it will of course deviate from it. 
 
 You can create local branches and tags (both invisible to anyone but yourself). You can check out a specific 'remote tag' to compile, or you can create a local branch based on a specific 'remote tag' to work on the code.
@@ -87 +87 @@
    * See [http://stackoverflow.com/questions/1457103/what-is-the-difference-between-a-tag-and-a-branch-in-git What is the difference between a tag and a branch in git?] for a short intro on 'tags' and 'branches'.
    * See [http://stackoverflow.com/questions/5582208/checkout-git-tag Checkout GIT tag] for an explanation about 'checking out git tags'.
+
+If you want to have an overview of the development history, refer to [http://stackoverflow.com/questions/1057564/pretty-git-branch-graphs - this discussion on stack overflow] about generating pretty pictures of the same. 
+
+For the impatient living on Unix, follow Slipp D. Thompson's idead and edit (or create) your '~/.gitconfig' file, adding the following command aliases:
+
+{{{
+[alias]
+lg1 = log --graph --abbrev-commit --decorate --date=relative --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all
+lg2 = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n''          %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' --all
+lg = !"git lg1"
+}}}
+
+Then run 
+
+{{{
+git lg
+}}}
+
+inside 'boinc_repo' for a quick text-only history dump:
+
+{{{
+* 403afa4 - (14 hours ago) client: work fetch policy tweak - David Anderson (HEAD, origin/master, origin/HEAD, master)
+* 28f7f95 - (17 hours ago) client: Default to /usr/bin when looking for VboxManage. - Rom Walton
+* b4f7e33 - (18 hours ago) client, Android: run CPU-intensive apps in background mode - David Anderson
+* b0504e9 - (24 hours ago) Mac: script builds boinc_zip library when building other BOINC libraries - Charlie Fenton
+* edc96a2 - (24 hours ago) Mac: update build scripts for OS 10.9 - Charlie Fenton
+* 0d04b84 - (24 hours ago) Mac: Update build script for wxWidgets 3.0.0 - Charlie Fenton
+* 04e8f00 - (30 hours ago) client, Win: when running GPU detect, use "boinc.exe" rather than "boinc" on cmdline. - David Anderson
+* be2f175 - (2 days ago) DOC: Add entries for MIPS and x86 for Android. - Rom Walton
+*   cc32c51 - (2 days ago) Merge branch 'master' of ssh://isaac.ssl.berkeley.edu/boinc-v2 - Rom Walton
+|\
+| * 6d78613 - (2 days ago) API: make boinc_api_fortran.cpp compile - David Anderson
+| * 36460bc - (2 days ago) Compile fixes for Ubuntu - David Anderson
+* | 8bb3af6 - (2 days ago) DOC: Update android client to 7.2.41. - Rom Walton
+|/
+* 9b041f7 - (2 days ago) VBOX: Fix case of virtualbox and vboxheadless for platforms that are case sensitive.  The code...
+* 9220ceb - (3 days ago) Admin web: deprecate problem_host.php, which sends a confusing email to user - David Anderson
+}}}
 
 === Development on the bleeding edge ===