diff --git a/basics.html b/basics.html index 696c98fe50ad81fb4585d992faa5128f4cfcd30f..e0c516636438f1d496a051a50c8b6b3c88fd7d98 100644 --- a/basics.html +++ b/basics.html @@ -824,6 +824,18 @@ - git commands modify the graph </section> + <section id="branch-when-to-use" data-markdown> + ## when to use branches + + - breaking **master** + - something takes longer + - frequent interruptions + - comment out code + + notes: + - if logical commit without breaking don't branch + </section> + <section id="branch-commands" data-markdown> ## branch commands diff --git a/notes.md b/notes.md deleted file mode 100644 index 74c96a45ec5d710f44216e037e7660c3ba0c6053..0000000000000000000000000000000000000000 --- a/notes.md +++ /dev/null @@ -1,92 +0,0 @@ -Basics -====== - -VCS für mich ------------- - -### config - -### init - -### add - -git add foo bar - -### commit - -git commit -m 'foo bar' - -prima - - -was hat sich nu verändert? --------------------------- - -### log - ---stat - --p - -### diff - -- was ändern -- git diff -- git commit -am - -### repo / stage / working - -- grafik raussuchen -- wofür nutzen - -### add / reset / checkout - -diff und diff --staged und diff HEAD - -vcs mit backup --------------- - -- github neues projekt --> projekteinbindung: clone / remote add origin foo -- push -- pull - - - -## merge - -mergetool linux = meld -mac = ??? -windows = ??? - -Workflows -========= - -branching workflows -------------------- - -was sind branches und wofür brauch ich sie? diese frage sollte eindeutig in diesem kapitel erklärt -werden. - -### nvie successful git branching model - -### multi master - -paper with many journals - -same paper text - different theme file for page layout, graph layout, etc. - -## tips for papers - -git diff -w --ignore-blank-lines --word-diff - -Your Projects -============= - - - - -##### STuff - -- explain all collaboration workflows via github - - -- diff --git a/paper.md b/paper.md new file mode 100644 index 0000000000000000000000000000000000000000..0d98b927759c5de5dbb230aa14a10a4bff3960a8 --- /dev/null +++ b/paper.md @@ -0,0 +1,21 @@ +## branching model + +### multi master + +- paper with many journals, different paper text +- one branch per journal +- carefully **cherry-pick** additions to all masters + +### trunk based development + +- same paper text +- different themes for journals +- journal-themes via sub-module --> make them reusable + +## helpful commands + +Better diff command for text: + +```bash +git diff -w --ignore-blank-lines --word-diff +```