Changes between Version 1 and Version 2 of WorkingConventions/GitSPJ


Ignore:
Timestamp:
Apr 27, 2011 12:41:10 PM (4 years ago)
Author:
simonpj
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • WorkingConventions/GitSPJ

    v1 v2  
    2222}}}
    2323
     24-------------
     25
    2426== Looking at the current state of affairs ==
    2527
    26  * `git diff --stat` gives you a one-line-per-file summary of diffs.
    27  * `git-merge
     28Show a one-line-per-file summary of diffs between working files and the local repo:
     29{{{
     30git diff --stat
     31}}}
    2832
     33------------------
     34Show the commits that are on branch `my-test` but not on the main trunk:
     35{{{
     36git log `git merge-base master my-test`..my-test
     37}}}
     38The `git merge-base b1 b2` thing returns the name of the commit that is the common ancestor of branches `b1` and `b2`.
     39
     40--------------
    2941== `git gui` on Windows ==
    3042