Changes between Version 4 and Version 5 of WorkingConventions/GitSPJ
- Timestamp:
- 04/28/11 01:49:47 (2 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
WorkingConventions/GitSPJ
v4 v5 3 3 Here are notes about using Git that Simon PJ has found useful. 4 4 5 ------------------------------ 5 6 == Configuration == 6 7 … … 28 29 == Looking at the current state of affairs == 29 30 31 === Show one-line-per-file diff summary === 32 30 33 Show a one-line-per-file summary of diffs between working files and the local repo: 31 34 {{{ … … 33 36 }}} 34 37 35 ------------------ 38 === Show delta between branch and trunk === 39 36 40 Show the commits that are on branch `my-test` but not on the main trunk: 37 41 {{{ … … 42 46 -------------- 43 47 == Doing useful things == 48 49 === Create a branch after doing some edits === 44 50 45 51 You 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.
