Changes between Version 4 and Version 5 of WorkingConventions/GitSPJ


Ignore:
Timestamp:
Apr 28, 2011 8:49:47 AM (4 years ago)
Author:
simonpj
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • WorkingConventions/GitSPJ

    v4 v5  
    33Here are notes about using Git that Simon PJ has found useful.
    44
     5------------------------------
    56== Configuration ==
    67
     
    2829== Looking at the current state of affairs ==
    2930
     31=== Show one-line-per-file diff summary ===
     32
    3033Show a one-line-per-file summary of diffs between working files and the local repo:
    3134{{{
     
    3336}}}
    3437
    35 ------------------
     38=== Show delta between branch and trunk ===
     39
    3640Show the commits that are on branch `my-test` but not on the main trunk:
    3741{{{
     
    4246--------------
    4347== Doing useful things ==
     48
     49=== Create a branch after doing some edits ===
    4450
    4551You are sitting on a branch (say master), and do some edits. Now you decide it wasn't as simple as you thought so you want to create a branch to keep your edits safe while you do something else.