projects / swc-workshop.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 26aa42c d97debc)
Merge branch 'master' into namespaced
authorW. Trevor King <wking@tremily.us>
Tue, 29 Apr 2014 22:11:15 +0000 (15:11 -0700)
committerW. Trevor King <wking@tremily.us>
Tue, 29 Apr 2014 22:11:15 +0000 (15:11 -0700)
* master:
  cheat-sheet.md: Mention the default root for 'git branch ...'
  cheat-sheet.md: Explicitly list the branch to push

1  2 
version-control/git/cheat-sheet.md patch | diff1 | diff2 | blob | history

diff --cc version-control/git/cheat-sheet.md
Simple merge
Base material for Software Carpentry, holding subject-level submodules