Modern update for 2015 and beyond

.gitignore

@@ -0,0 +1,3 @@
+node_modules/
+**/output/
+tiddlers/\$__StoryList.tid

README.md

@@ -0,0 +1,20 @@
+# Git Fix Um
+
+On undoing, fixing, or removing commits in git
+
+## Contributing
+
+1.  Clone this repo.
+2.  `npm install`
+3.  `npm start`
+4.  Edit in browser
+5.  Submit a pull request
+
+This starts the TiddlyWiki server. Open `http://localhost:8080` in your browser
+and make edits. They are saved automatically to the repo so you can easily
+`git add`/`git commit` them.
+
+## Building
+
+To build the stand alone HTML for publication run `npm run build` and it will
+output `wiki-dist/output/index.html`.

package.json

@@ -0,0 +1,23 @@
+{
+  "name": "git-fix-um",
+  "version": "1.0.0",
+  "description": "On undoing, fixing, or removing commits or mistakes in git ",
+  "private": true,
+  "scripts": {
+    "start": "tiddlywiki wiki --server",
+    "build": "tiddlywiki wiki-dist --rendertiddler '$:/core/save/all' index.html text/plain"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/SethRobertson/GitFixUm.git"
+  },
+  "author": "Devin Weaver <[email protected]> (http://tritarget.org/)",
+  "license": "CC BY-SA 3.0",
+  "bugs": {
+    "url": "https://github.com/SethRobertson/GitFixUm/issues"
+  },
+  "homepage": "http://sethrobertson.github.io/GitFixUm/fixup.html",
+  "devDependencies": {
+    "tiddlywiki": "^5.1.8"
+  }
+}

tiddlers/$__DefaultTiddlers.tid

@@ -0,0 +1,7 @@
+created: 20150605123544055
+modified: 20150606052319109
+title: $:/DefaultTiddlers
+type: text/vnd.tiddlywiki
+
+[[First step]]
+[[Are you trying to find that which is lost or fix a change that was made?]]

tiddlers/$__SiteSubtitle.tid

@@ -0,0 +1,6 @@
+created: 20150605123511650
+modified: 20150605123528911
+title: $:/SiteSubtitle
+type: text/vnd.tiddlywiki
+
+On undoing, fixing, or removing commits in git

tiddlers/$__SiteTitle.tid

@@ -0,0 +1,6 @@
+created: 20150605123453728
+modified: 20150606051058239
+title: $:/SiteTitle
+type: text/vnd.tiddlywiki
+
+Git Fix Um

tiddlers/$__config_DefaultSidebarTab.tid

@@ -0,0 +1,6 @@
+created: 20150606145603553
+modified: 20150606055212755
+title: $:/config/DefaultSidebarTab
+type: text/vnd.tiddlywiki
+
+TableOfContents

tiddlers/$__data_BranchName.tid

@@ -0,0 +1,7 @@
+branch: master
+created: 20150606022747695
+modified: 20150606044711776
+tags: 
+title: $:/data/BranchName
+type: text/vnd.tiddlywiki
+

tiddlers/About.tid

@@ -0,0 +1,13 @@
+created: 20150606134230380
+modified: 20150606140243740
+tags: TableOfContents
+title: About
+type: text/vnd.tiddlywiki
+
+This material was compiled and maintained by [[Seth Robertson]] and converted to this [[TiddlyWiki|http://tiddlywiki.com/]] format by [[Devin Weaver]].
+
+~TiddlyWiki is a wiki based HTML5 application. Each card is called a tiddler.
+
+!! Navigating between open tiddlers
+
+{{Navigating between open tiddlers}}

tiddlers/Answers.tid

@@ -0,0 +1,9 @@
+color: #0080ff
+created: 20150605210829987
+icon: $:/core/images/tip
+modified: 20150606055314970
+tags: TableOfContents
+title: Answers
+type: text/vnd.tiddlywiki
+
+<<list-links filter:"[tag[Answers]] +[nsort[order]]">>

tiddlers/Arbitrarily_changing_all_commits_during_all_of_git's_history.tid

@@ -0,0 +1,9 @@
+created: 20150606033828302
+modified: 20150606055503785
+tags: Answers
+title: Arbitrarily changing all commits during all of git's history
+type: text/vnd.tiddlywiki
+
+`git filter-branch` is a powerful, complex command that allows you to perform arbitary scriptable operations on all commits in git repository history. This flexibility can make it quite slow on big repos, and makes using the command quite difficult, so I will simply point you at the {{ManualPage}} and remind you that {{BestPractice}} is to always use `--tag-name-filter cat -- --all` unless you are really sure you know what you are doing.
+
+BTW, this is the one command I referred to earlier which will update all tags and branches, at least if you use the best practice arguments.

tiddlers/Are_you_trying_to_find_that_which_is_lost_or_fix_a_change_that_was_made_.tid

@@ -0,0 +1,11 @@
+created: 20150605130505209
+modified: 20150606055431278
+order: 1
+tags: Questions
+title: Are you trying to find that which is lost or fix a change that was made?
+type: text/vnd.tiddlywiki
+
+Due to previous activities (thrashing about), you may have lost some work which you would like to find and restore. Alternately, you may have made some changes which you would like to fix. Fixing includes updating, rewording, and deleting or discarding.
+
+* [[Fix a change|Have you committed?]]
+* [[Find what is lost|I have lost some commits I know I made]]

tiddlers/BestPractice.tid

@@ -0,0 +1,9 @@
+created: 20150606034057154
+modified: 20150606040447496
+tags: 
+title: BestPractice
+type: text/vnd.tiddlywiki
+url: http://sethrobertson.github.com/GitBestPractices/
+
+\define ext-link(name, url) [[$name$|$url$]]
+<$macrocall $name="ext-link" name="best practice" url={{!!url}}/>

tiddlers/CCBYSA.png.tid

@@ -0,0 +1,6 @@
+created: 20150606140622923
+modified: 20150606140636196
+title: CCBYSA.png
+type: image/png
+
+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

tiddlers/CC_BY-SA.tid

@@ -0,0 +1,13 @@
+created: 20150606140353318
+modified: 20150606142919605
+tags: 
+title: CC BY-SA
+type: text/vnd.tiddlywiki
+
+\define cc-link(content) <a rel="license" target="_blank" href="http://creativecommons.org/licenses/by-sa/3.0/">$content$</a>
+
+<div style="text-align: center">
+<<cc-link content:"[img[CCBYSA.png]]">>
+</div>
+
+This work is licensed under a <<cc-link content:"Creative Commons Attribution-ShareAlike 3.0 International License">>.

tiddlers/Can_you_make_a_positive_commit_to_fix_the_problem_and_what_is_the_fix_class_.tid

@@ -0,0 +1,15 @@
+created: 20150605215333425
+modified: 20150606055527480
+tags: Questions
+title: Can you make a positive commit to fix the problem and what is the fix class?
+type: text/vnd.tiddlywiki
+
+\define history(url) [[Rewriting public history|$url$#pubonce]]
+<$macrocall $name="history" url={{BestPractice!!url}}/> is a bad idea. It requires everyone else to do special things and you must publicly announce your failure. Ideally you will create either a commit to just fix the problem, or a new `git revert` commit to create a new commit which undoes what the commit target of the revert did.
+
+* [[Yes, I can make a new commit but the bad commit trashed a particular file in error (among other good things I want to keep)|Making a new commit to restore a file deleted earlier]]
+* [[Yes, I can make a new commit and the bad commit is a merge commit I want to totally remove|Reverting a merge commit]]
+* [[Yes, I can make a new commit but the bad commit is a simple commit I want to totally remove|Reverting an old simple pushed commit]]
+* [[Yes, I can make a new commit and the bad commit has an error in it I want to fix|Making a new commit to fix an old commit]]
+* [[Yes, I can make a new commit but history is all messed up and I have a replacement branch|Rewriting an old branch with a new branch with a new commit]]
+* [[No, I am a bad person and must rewrite published history|I am a bad person and must rewrite published history]]

tiddlers/Changing_a_single_commit_involving_a_merge.tid

@@ -0,0 +1,51 @@
+created: 20150606004932529
+modified: 20150606055934225
+tags: Answers
+title: Changing a single commit involving a merge
+type: text/vnd.tiddlywiki
+
+\define git-cmd(branch)
+```sh
+git rebase -p --onto $(git rev-parse nonce) HEAD^ $branch$
+```
+\end
+
+Oh dear. This is going to get a little complicated. It should all work out, though. You will need to use a {{nonce}} branch as a placeholder. I will call the nonce branch "nonce" in the following example. However, you may use any branch name that is not currently in use. You can delete it immediately after you are done.
+
+!! Identify the SHA of the commit you wish to modify.
+
+{{FindingACommit}}
+
+!! Remember the name of the branch you are currently on
+
+The line with a star on it in the `git branch` output is the branch you are currently on. To make things clearer enter in the branch name your interested in: <$edit-text tiddler="$:/data/BranchName" field="branch"/>
+
+!! Create and checkout a nonce branch pointing at that commit.
+
+```sh
+git checkout -b nonce SHA
+```
+
+Obviously replace "SHA" with the reference you want to modify.
+
+!! Modify the commit
+
+You need to get the index into the correct state you wish the commit to reflect. If you are changing the commit message only, you need do nothing. If you are changing the file contents, typically you would modify the working directory and use `git add` as normal.
+
+Note if you wish to restore a file to a known good state, you can use `git checkout GOODSHA -- path/to/filename`.
+
+Once the index is in the correct state, then you can run `git commit --amend` to update the last commit. Yes, you can use "-a" if you want to avoid the `git add` suggested in the previous paragraph.
+
+If the commit you are updating is a merge commit, ensure that the log message reflects that.
+
+!! Put the remaining commits after the new one you just created
+
+<$macrocall $name="git-cmd" branch={{$:/data/BranchName!!branch}}/>
+
+!! Validate that the topology is still good
+
+If some of the commits after the commit you changed are merge commits, please be warned. It is possible that `git rebase -p` will be unable to properly recreate them. Please inspect the resulting merge topology `gitk --date-order HEAD ORIG_HEAD` to ensure that git did want you wanted. If it did not, there is not really any automated recourse. You can reset back to the commit before the SHA you want to get rid of, and then cherry-pick the normal commits and manually re-merge the "bad" merges. Or you can just suffer with the inappropriate topology (perhaps creating fake merges `git merge --ours otherbranch` so that subsequent development work on those branches will be properly merged in with the correct merge-base).
+
+!! Delete the nonce branch
+
+You don't need it. It was just there to communicate an SHA between two steps in the above process. `git branch -d nonce`

tiddlers/Changing_a_single_commit_involving_only_simple_commits.tid

@@ -0,0 +1,17 @@
+created: 20150606041847072
+modified: 20150606055950213
+tags: Answers
+title: Changing a single commit involving only simple commits
+type: text/vnd.tiddlywiki
+
+You must first identify the SHA of the commit you wish to remove. {{FindingACommit}}
+
+```sh
+git rebase -i SHA^
+```
+
+Obviously replace "SHA" with the reference you want to get rid of. The "^" in that command is literal.
+
+You will be dumped in an editor with a bunch of lines starting with pick. The oldest commit, the one you are probably interested in changing, is first. You will want to change the "pick" to "reword" or "edit", or perhaps even "squash" depending on what your goal is. Please read the {{ManualPage}} for more information. A document on [[Post-Production Editing using Git|http://sethrobertson.github.com/GitPostProduction/]] goes through much of the major uses of `git rebase` is some detail. The use case is a little different, but the fundamental techniques are not.
+
+When using "edit", to change contents or author, when you are dumped into the shell to make your change, well make your change, `git add` as normal, and then run `git commit --amend` (including changing the author information with `--author`). When you are satisfied, you should run `git rebase --continue`

tiddlers/Changing_all_commits_during_all_of_git's_history.tid

@@ -0,0 +1,10 @@
+created: 20150606033325591
+modified: 20150606055552392
+tags: Questions
+title: Changing all commits during all of git's history
+type: text/vnd.tiddlywiki
+
+You have not pushed but still somehow want to change all commits in all of git's history? Strange.
+
+* [[Not just removing data (eg. re-arranging directory structure for all commits), or just wanting to use standard tools|Arbitrarily changing all commits during all of git's history]]
+* [[Want to only remove unwanted data (big files, private data, etc) and am willing to use a third party tool to do the job more quickly|Use The BFG to remove unwanted data, like big files or passwords, from Git repository history]]

tiddlers/Comments.tid

@@ -0,0 +1,9 @@
+created: 20150606003851462
+modified: 20150606054334662
+tags: TableOfContents
+title: Comments
+type: text/vnd.tiddlywiki
+
+Comments and improvements welcome.
+
+[[Use the github issue tracker|https://github.com/SethRobertson/GitFixUm/issues]] or discuss with ~SethRobertson (and others) on [[#git|irc://irc.freenode.net/git]]

tiddlers/Copyright.tid

@@ -0,0 +1,26 @@
+created: 20150605123912463
+modified: 20150606142923491
+tags: TableOfContents
+title: Copyright
+type: text/vnd.tiddlywiki
+
+\define center(text) <div style="text-align: center">$text$</div>
+Copyright ⓒ 2012 [[Seth Robertson]]
+
+This original document is licensed and distributed to you through the use of two licenses. You may pick the license you prefer.
+
+----
+
+{{CC BY-SA}}
+
+<<center "''OR''">>
+
+{{GNU FDL}}
+
+----
+
+Conversion from plain HTML to [[TiddlyWiki|http://tiddlywiki.com/]] was done by [[Devin Weaver]].
+
+I and [[Seth Robertson]] would appreciate changes being sent back to me, being notified if this is used or highlighted in some special way, and links being maintained back to the authoritative source. Thanks.
+
+{{Non Afilliation}}

tiddlers/Devin_Weaver.tid

@@ -0,0 +1,8 @@
+created: 20150606051107350
+modified: 20150606141346633
+title: Devin Weaver
+type: text/vnd.tiddlywiki
+
+<$link to="https://github.com/sukima">[img[SukiGravatar]]<br>''@sukima''</$link>
+
+A passionate software developer specialized in ~JavaScript, front end and back end, and mobile iOS development. I dabble in photography, 360 panoramic tours, interactive fiction, and geek culture.