diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..9e48a4f --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +node_modules/ +**/output/ +tiddlers/\$__StoryList.tid diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..604209a --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,359 @@ +Creative Commons Legal Code + +Attribution-ShareAlike 3.0 Unported + + CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE + LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN + ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS + INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES + REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR + DAMAGES RESULTING FROM ITS USE. + +License + +THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE +COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY +COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS +AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED. + +BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE +TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY +BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS +CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND +CONDITIONS. + +1. Definitions + + a. "Adaptation" means a work based upon the Work, or upon the Work and + other pre-existing works, such as a translation, adaptation, + derivative work, arrangement of music or other alterations of a + literary or artistic work, or phonogram or performance and includes + cinematographic adaptations or any other form in which the Work may be + recast, transformed, or adapted including in any form recognizably + derived from the original, except that a work that constitutes a + Collection will not be considered an Adaptation for the purpose of + this License. For the avoidance of doubt, where the Work is a musical + work, performance or phonogram, the synchronization of the Work in + timed-relation with a moving image ("synching") will be considered an + Adaptation for the purpose of this License. + b. "Collection" means a collection of literary or artistic works, such as + encyclopedias and anthologies, or performances, phonograms or + broadcasts, or other works or subject matter other than works listed + in Section 1(f) below, which, by reason of the selection and + arrangement of their contents, constitute intellectual creations, in + which the Work is included in its entirety in unmodified form along + with one or more other contributions, each constituting separate and + independent works in themselves, which together are assembled into a + collective whole. A work that constitutes a Collection will not be + considered an Adaptation (as defined below) for the purposes of this + License. + c. "Creative Commons Compatible License" means a license that is listed + at https://creativecommons.org/compatiblelicenses that has been + approved by Creative Commons as being essentially equivalent to this + License, including, at a minimum, because that license: (i) contains + terms that have the same purpose, meaning and effect as the License + Elements of this License; and, (ii) explicitly permits the relicensing + of adaptations of works made available under that license under this + License or a Creative Commons jurisdiction license with the same + License Elements as this License. + d. "Distribute" means to make available to the public the original and + copies of the Work or Adaptation, as appropriate, through sale or + other transfer of ownership. + e. "License Elements" means the following high-level license attributes + as selected by Licensor and indicated in the title of this License: + Attribution, ShareAlike. + f. "Licensor" means the individual, individuals, entity or entities that + offer(s) the Work under the terms of this License. + g. "Original Author" means, in the case of a literary or artistic work, + the individual, individuals, entity or entities who created the Work + or if no individual or entity can be identified, the publisher; and in + addition (i) in the case of a performance the actors, singers, + musicians, dancers, and other persons who act, sing, deliver, declaim, + play in, interpret or otherwise perform literary or artistic works or + expressions of folklore; (ii) in the case of a phonogram the producer + being the person or legal entity who first fixes the sounds of a + performance or other sounds; and, (iii) in the case of broadcasts, the + organization that transmits the broadcast. + h. "Work" means the literary and/or artistic work offered under the terms + of this License including without limitation any production in the + literary, scientific and artistic domain, whatever may be the mode or + form of its expression including digital form, such as a book, + pamphlet and other writing; a lecture, address, sermon or other work + of the same nature; a dramatic or dramatico-musical work; a + choreographic work or entertainment in dumb show; a musical + composition with or without words; a cinematographic work to which are + assimilated works expressed by a process analogous to cinematography; + a work of drawing, painting, architecture, sculpture, engraving or + lithography; a photographic work to which are assimilated works + expressed by a process analogous to photography; a work of applied + art; an illustration, map, plan, sketch or three-dimensional work + relative to geography, topography, architecture or science; a + performance; a broadcast; a phonogram; a compilation of data to the + extent it is protected as a copyrightable work; or a work performed by + a variety or circus performer to the extent it is not otherwise + considered a literary or artistic work. + i. "You" means an individual or entity exercising rights under this + License who has not previously violated the terms of this License with + respect to the Work, or who has received express permission from the + Licensor to exercise rights under this License despite a previous + violation. + j. "Publicly Perform" means to perform public recitations of the Work and + to communicate to the public those public recitations, by any means or + process, including by wire or wireless means or public digital + performances; to make available to the public Works in such a way that + members of the public may access these Works from a place and at a + place individually chosen by them; to perform the Work to the public + by any means or process and the communication to the public of the + performances of the Work, including by public digital performance; to + broadcast and rebroadcast the Work by any means including signs, + sounds or images. + k. "Reproduce" means to make copies of the Work by any means including + without limitation by sound or visual recordings and the right of + fixation and reproducing fixations of the Work, including storage of a + protected performance or phonogram in digital form or other electronic + medium. + +2. Fair Dealing Rights. Nothing in this License is intended to reduce, +limit, or restrict any uses free from copyright or rights arising from +limitations or exceptions that are provided for in connection with the +copyright protection under copyright law or other applicable laws. + +3. License Grant. Subject to the terms and conditions of this License, +Licensor hereby grants You a worldwide, royalty-free, non-exclusive, +perpetual (for the duration of the applicable copyright) license to +exercise the rights in the Work as stated below: + + a. to Reproduce the Work, to incorporate the Work into one or more + Collections, and to Reproduce the Work as incorporated in the + Collections; + b. to create and Reproduce Adaptations provided that any such Adaptation, + including any translation in any medium, takes reasonable steps to + clearly label, demarcate or otherwise identify that changes were made + to the original Work. For example, a translation could be marked "The + original work was translated from English to Spanish," or a + modification could indicate "The original work has been modified."; + c. to Distribute and Publicly Perform the Work including as incorporated + in Collections; and, + d. to Distribute and Publicly Perform Adaptations. + e. For the avoidance of doubt: + + i. Non-waivable Compulsory License Schemes. In those jurisdictions in + which the right to collect royalties through any statutory or + compulsory licensing scheme cannot be waived, the Licensor + reserves the exclusive right to collect such royalties for any + exercise by You of the rights granted under this License; + ii. Waivable Compulsory License Schemes. In those jurisdictions in + which the right to collect royalties through any statutory or + compulsory licensing scheme can be waived, the Licensor waives the + exclusive right to collect such royalties for any exercise by You + of the rights granted under this License; and, + iii. Voluntary License Schemes. The Licensor waives the right to + collect royalties, whether individually or, in the event that the + Licensor is a member of a collecting society that administers + voluntary licensing schemes, via that society, from any exercise + by You of the rights granted under this License. + +The above rights may be exercised in all media and formats whether now +known or hereafter devised. The above rights include the right to make +such modifications as are technically necessary to exercise the rights in +other media and formats. Subject to Section 8(f), all rights not expressly +granted by Licensor are hereby reserved. + +4. Restrictions. The license granted in Section 3 above is expressly made +subject to and limited by the following restrictions: + + a. You may Distribute or Publicly Perform the Work only under the terms + of this License. You must include a copy of, or the Uniform Resource + Identifier (URI) for, this License with every copy of the Work You + Distribute or Publicly Perform. You may not offer or impose any terms + on the Work that restrict the terms of this License or the ability of + the recipient of the Work to exercise the rights granted to that + recipient under the terms of the License. You may not sublicense the + Work. You must keep intact all notices that refer to this License and + to the disclaimer of warranties with every copy of the Work You + Distribute or Publicly Perform. When You Distribute or Publicly + Perform the Work, You may not impose any effective technological + measures on the Work that restrict the ability of a recipient of the + Work from You to exercise the rights granted to that recipient under + the terms of the License. This Section 4(a) applies to the Work as + incorporated in a Collection, but this does not require the Collection + apart from the Work itself to be made subject to the terms of this + License. If You create a Collection, upon notice from any Licensor You + must, to the extent practicable, remove from the Collection any credit + as required by Section 4(c), as requested. If You create an + Adaptation, upon notice from any Licensor You must, to the extent + practicable, remove from the Adaptation any credit as required by + Section 4(c), as requested. + b. You may Distribute or Publicly Perform an Adaptation only under the + terms of: (i) this License; (ii) a later version of this License with + the same License Elements as this License; (iii) a Creative Commons + jurisdiction license (either this or a later license version) that + contains the same License Elements as this License (e.g., + Attribution-ShareAlike 3.0 US)); (iv) a Creative Commons Compatible + License. If you license the Adaptation under one of the licenses + mentioned in (iv), you must comply with the terms of that license. If + you license the Adaptation under the terms of any of the licenses + mentioned in (i), (ii) or (iii) (the "Applicable License"), you must + comply with the terms of the Applicable License generally and the + following provisions: (I) You must include a copy of, or the URI for, + the Applicable License with every copy of each Adaptation You + Distribute or Publicly Perform; (II) You may not offer or impose any + terms on the Adaptation that restrict the terms of the Applicable + License or the ability of the recipient of the Adaptation to exercise + the rights granted to that recipient under the terms of the Applicable + License; (III) You must keep intact all notices that refer to the + Applicable License and to the disclaimer of warranties with every copy + of the Work as included in the Adaptation You Distribute or Publicly + Perform; (IV) when You Distribute or Publicly Perform the Adaptation, + You may not impose any effective technological measures on the + Adaptation that restrict the ability of a recipient of the Adaptation + from You to exercise the rights granted to that recipient under the + terms of the Applicable License. This Section 4(b) applies to the + Adaptation as incorporated in a Collection, but this does not require + the Collection apart from the Adaptation itself to be made subject to + the terms of the Applicable License. + c. If You Distribute, or Publicly Perform the Work or any Adaptations or + Collections, You must, unless a request has been made pursuant to + Section 4(a), keep intact all copyright notices for the Work and + provide, reasonable to the medium or means You are utilizing: (i) the + name of the Original Author (or pseudonym, if applicable) if supplied, + and/or if the Original Author and/or Licensor designate another party + or parties (e.g., a sponsor institute, publishing entity, journal) for + attribution ("Attribution Parties") in Licensor's copyright notice, + terms of service or by other reasonable means, the name of such party + or parties; (ii) the title of the Work if supplied; (iii) to the + extent reasonably practicable, the URI, if any, that Licensor + specifies to be associated with the Work, unless such URI does not + refer to the copyright notice or licensing information for the Work; + and (iv) , consistent with Ssection 3(b), in the case of an + Adaptation, a credit identifying the use of the Work in the Adaptation + (e.g., "French translation of the Work by Original Author," or + "Screenplay based on original Work by Original Author"). The credit + required by this Section 4(c) may be implemented in any reasonable + manner; provided, however, that in the case of a Adaptation or + Collection, at a minimum such credit will appear, if a credit for all + contributing authors of the Adaptation or Collection appears, then as + part of these credits and in a manner at least as prominent as the + credits for the other contributing authors. For the avoidance of + doubt, You may only use the credit required by this Section for the + purpose of attribution in the manner set out above and, by exercising + Your rights under this License, You may not implicitly or explicitly + assert or imply any connection with, sponsorship or endorsement by the + Original Author, Licensor and/or Attribution Parties, as appropriate, + of You or Your use of the Work, without the separate, express prior + written permission of the Original Author, Licensor and/or Attribution + Parties. + d. Except as otherwise agreed in writing by the Licensor or as may be + otherwise permitted by applicable law, if You Reproduce, Distribute or + Publicly Perform the Work either by itself or as part of any + Adaptations or Collections, You must not distort, mutilate, modify or + take other derogatory action in relation to the Work which would be + prejudicial to the Original Author's honor or reputation. Licensor + agrees that in those jurisdictions (e.g. Japan), in which any exercise + of the right granted in Section 3(b) of this License (the right to + make Adaptations) would be deemed to be a distortion, mutilation, + modification or other derogatory action prejudicial to the Original + Author's honor and reputation, the Licensor will waive or not assert, + as appropriate, this Section, to the fullest extent permitted by the + applicable national law, to enable You to reasonably exercise Your + right under Section 3(b) of this License (right to make Adaptations) + but not otherwise. + +5. Representations, Warranties and Disclaimer + +UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR +OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY +KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, +INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, +FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF +LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, +WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION +OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU. + +6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE +LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR +ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES +ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS +BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +7. Termination + + a. This License and the rights granted hereunder will terminate + automatically upon any breach by You of the terms of this License. + Individuals or entities who have received Adaptations or Collections + from You under this License, however, will not have their licenses + terminated provided such individuals or entities remain in full + compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will + survive any termination of this License. + b. Subject to the above terms and conditions, the license granted here is + perpetual (for the duration of the applicable copyright in the Work). + Notwithstanding the above, Licensor reserves the right to release the + Work under different license terms or to stop distributing the Work at + any time; provided, however that any such election will not serve to + withdraw this License (or any other license that has been, or is + required to be, granted under the terms of this License), and this + License will continue in full force and effect unless terminated as + stated above. + +8. Miscellaneous + + a. Each time You Distribute or Publicly Perform the Work or a Collection, + the Licensor offers to the recipient a license to the Work on the same + terms and conditions as the license granted to You under this License. + b. Each time You Distribute or Publicly Perform an Adaptation, Licensor + offers to the recipient a license to the original Work on the same + terms and conditions as the license granted to You under this License. + c. If any provision of this License is invalid or unenforceable under + applicable law, it shall not affect the validity or enforceability of + the remainder of the terms of this License, and without further action + by the parties to this agreement, such provision shall be reformed to + the minimum extent necessary to make such provision valid and + enforceable. + d. No term or provision of this License shall be deemed waived and no + breach consented to unless such waiver or consent shall be in writing + and signed by the party to be charged with such waiver or consent. + e. This License constitutes the entire agreement between the parties with + respect to the Work licensed here. There are no understandings, + agreements or representations with respect to the Work not specified + here. Licensor shall not be bound by any additional provisions that + may appear in any communication from You. This License may not be + modified without the mutual written agreement of the Licensor and You. + f. The rights granted under, and the subject matter referenced, in this + License were drafted utilizing the terminology of the Berne Convention + for the Protection of Literary and Artistic Works (as amended on + September 28, 1979), the Rome Convention of 1961, the WIPO Copyright + Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 + and the Universal Copyright Convention (as revised on July 24, 1971). + These rights and subject matter take effect in the relevant + jurisdiction in which the License terms are sought to be enforced + according to the corresponding provisions of the implementation of + those treaty provisions in the applicable national law. If the + standard suite of rights granted under applicable copyright law + includes additional rights not granted under this License, such + additional rights are deemed to be included in the License; this + License is not intended to restrict the license of any rights under + applicable law. + + +Creative Commons Notice + + Creative Commons is not a party to this License, and makes no warranty + whatsoever in connection with the Work. Creative Commons will not be + liable to You or any party on any legal theory for any damages + whatsoever, including without limitation any general, special, + incidental or consequential damages arising in connection to this + license. Notwithstanding the foregoing two (2) sentences, if Creative + Commons has expressly identified itself as the Licensor hereunder, it + shall have all rights and obligations of Licensor. + + Except for the limited purpose of indicating to the public that the + Work is licensed under the CCPL, Creative Commons does not authorize + the use by either party of the trademark "Creative Commons" or any + related trademark or logo of Creative Commons without the prior + written consent of Creative Commons. Any permitted use will be in + compliance with Creative Commons' then-current trademark usage + guidelines, as may be published on its website or otherwise made + available upon request from time to time. For the avoidance of doubt, + this trademark restriction does not form part of the License. + + Creative Commons may be contacted at https://creativecommons.org/. diff --git a/README.md b/README.md new file mode 100644 index 0000000..4ca5cc1 --- /dev/null +++ b/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`. diff --git a/package.json b/package.json new file mode 100644 index 0000000..c1b1229 --- /dev/null +++ b/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 (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" + } +} diff --git a/tiddlers/$__DefaultTiddlers.tid b/tiddlers/$__DefaultTiddlers.tid new file mode 100644 index 0000000..c2c4ebf --- /dev/null +++ b/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?]] diff --git a/tiddlers/$__SiteSubtitle.tid b/tiddlers/$__SiteSubtitle.tid new file mode 100644 index 0000000..c6b9df2 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/tiddlers/$__SiteTitle.tid b/tiddlers/$__SiteTitle.tid new file mode 100644 index 0000000..8fdcbb2 --- /dev/null +++ b/tiddlers/$__SiteTitle.tid @@ -0,0 +1,6 @@ +created: 20150605123453728 +modified: 20150606051058239 +title: $:/SiteTitle +type: text/vnd.tiddlywiki + +Git Fix Um \ No newline at end of file diff --git a/tiddlers/$__config_DefaultSidebarTab.tid b/tiddlers/$__config_DefaultSidebarTab.tid new file mode 100644 index 0000000..ca73012 --- /dev/null +++ b/tiddlers/$__config_DefaultSidebarTab.tid @@ -0,0 +1,6 @@ +created: 20150606145603553 +modified: 20150606055212755 +title: $:/config/DefaultSidebarTab +type: text/vnd.tiddlywiki + +TableOfContents \ No newline at end of file diff --git a/tiddlers/$__data_BranchName.tid b/tiddlers/$__data_BranchName.tid new file mode 100644 index 0000000..66f93ce --- /dev/null +++ b/tiddlers/$__data_BranchName.tid @@ -0,0 +1,7 @@ +branch: master +created: 20150606022747695 +modified: 20150606044711776 +tags: +title: $:/data/BranchName +type: text/vnd.tiddlywiki + diff --git a/tiddlers/About.tid b/tiddlers/About.tid new file mode 100644 index 0000000..be18733 --- /dev/null +++ b/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}} \ No newline at end of file diff --git a/tiddlers/Answers.tid b/tiddlers/Answers.tid new file mode 100644 index 0000000..9e13e1e --- /dev/null +++ b/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 + +<> \ No newline at end of file diff --git a/tiddlers/Arbitrarily_changing_all_commits_during_all_of_git's_history.tid b/tiddlers/Arbitrarily_changing_all_commits_during_all_of_git's_history.tid new file mode 100644 index 0000000..5f6f2ac --- /dev/null +++ b/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. diff --git a/tiddlers/Are_you_trying_to_find_that_which_is_lost_or_fix_a_change_that_was_made_.tid b/tiddlers/Are_you_trying_to_find_that_which_is_lost_or_fix_a_change_that_was_made_.tid new file mode 100644 index 0000000..fcd6146 --- /dev/null +++ b/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]] diff --git a/tiddlers/BestPractice.tid b/tiddlers/BestPractice.tid new file mode 100644 index 0000000..19c1dd5 --- /dev/null +++ b/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}}/> \ No newline at end of file diff --git a/tiddlers/CCBYSA.png.tid b/tiddlers/CCBYSA.png.tid new file mode 100644 index 0000000..f256b5f --- /dev/null +++ b/tiddlers/CCBYSA.png.tid @@ -0,0 +1,6 @@ +created: 20150606140622923 +modified: 20150606140636196 +title: CCBYSA.png +type: image/png + +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 \ No newline at end of file diff --git a/tiddlers/CC_BY-SA.tid b/tiddlers/CC_BY-SA.tid new file mode 100644 index 0000000..9e2ba23 --- /dev/null +++ b/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) $content$ + +
+<> +
+ +This work is licensed under a <>. \ No newline at end of file diff --git a/tiddlers/Can_you_make_a_positive_commit_to_fix_the_problem_and_what_is_the_fix_class_.tid b/tiddlers/Can_you_make_a_positive_commit_to_fix_the_problem_and_what_is_the_fix_class_.tid new file mode 100644 index 0000000..db74fdb --- /dev/null +++ b/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]] diff --git a/tiddlers/Changing_a_single_commit_involving_a_merge.tid b/tiddlers/Changing_a_single_commit_involving_a_merge.tid new file mode 100644 index 0000000..3522ca2 --- /dev/null +++ b/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` diff --git a/tiddlers/Changing_a_single_commit_involving_only_simple_commits.tid b/tiddlers/Changing_a_single_commit_involving_only_simple_commits.tid new file mode 100644 index 0000000..e26bdb6 --- /dev/null +++ b/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` diff --git a/tiddlers/Changing_all_commits_during_all_of_git's_history.tid b/tiddlers/Changing_all_commits_during_all_of_git's_history.tid new file mode 100644 index 0000000..ce7b3ac --- /dev/null +++ b/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]] diff --git a/tiddlers/Comments.tid b/tiddlers/Comments.tid new file mode 100644 index 0000000..84bfed5 --- /dev/null +++ b/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]] \ No newline at end of file diff --git a/tiddlers/Copyright.tid b/tiddlers/Copyright.tid new file mode 100644 index 0000000..7a40ddd --- /dev/null +++ b/tiddlers/Copyright.tid @@ -0,0 +1,26 @@ +created: 20150605123912463 +modified: 20150606142923491 +tags: TableOfContents +title: Copyright +type: text/vnd.tiddlywiki + +\define center(text)
$text$
+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}} + +<
> + +{{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}} \ No newline at end of file diff --git a/tiddlers/Devin_Weaver.tid b/tiddlers/Devin_Weaver.tid new file mode 100644 index 0000000..fdcdb75 --- /dev/null +++ b/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]]
''@sukima'' + +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. \ No newline at end of file diff --git a/tiddlers/Discard_everything_or_just_some_things_.tid b/tiddlers/Discard_everything_or_just_some_things_.tid new file mode 100644 index 0000000..c42a840 --- /dev/null +++ b/tiddlers/Discard_everything_or_just_some_things_.tid @@ -0,0 +1,12 @@ +created: 20150605132914983 +modified: 20150606055608329 +order: 3 +tags: Questions +title: Discard everything or just some things? +type: text/vnd.tiddlywiki + +So you have not yet committed, the question is now whether you want to undo everything which you have done since the last commit or just some things, or just save what you have done? + +* [[Discard everything|How to undo all uncommitted changes]] +* [[Discard some things|How to undo some uncommitted changes]] +* [[I want to save my changes|How to save uncommitted changes]] \ No newline at end of file diff --git a/tiddlers/Discarding_all_local_commits_on_this_branch.tid b/tiddlers/Discarding_all_local_commits_on_this_branch.tid new file mode 100644 index 0000000..5fbe24b --- /dev/null +++ b/tiddlers/Discarding_all_local_commits_on_this_branch.tid @@ -0,0 +1,7 @@ +created: 20150605222146810 +modified: 20150606060030165 +tags: Answers +title: Discarding all local commits on this branch +type: text/vnd.tiddlywiki + +In order to discard all local commits on this branch, to make the local branch identical to the "upstream" of this branch, simply run `git reset --hard @{u}` \ No newline at end of file diff --git a/tiddlers/Disclaimer.tid b/tiddlers/Disclaimer.tid new file mode 100644 index 0000000..25fa1f2 --- /dev/null +++ b/tiddlers/Disclaimer.tid @@ -0,0 +1,7 @@ +created: 20150606003716856 +modified: 20150606054433330 +tags: TableOfContents +title: Disclaimer +type: text/vnd.tiddlywiki + +Information is not promised or guaranteed to be correct, current, or complete, and may be out of date and may contain technical inaccuracies or typographical errors. Any reliance on this material is at your own risk. No one assumes any responsibility (and everyone expressly disclaims responsibility) for updates to keep information current or to ensure the accuracy or completeness of any posted information. Accordingly, you should confirm the accuracy and completeness of all posted information before making any decision related to any and all matters described. \ No newline at end of file diff --git a/tiddlers/Do_you_have_uncommitted_stuff_in_your_working_directory_.tid b/tiddlers/Do_you_have_uncommitted_stuff_in_your_working_directory_.tid new file mode 100644 index 0000000..97c75b8 --- /dev/null +++ b/tiddlers/Do_you_have_uncommitted_stuff_in_your_working_directory_.tid @@ -0,0 +1,13 @@ +created: 20150605212049691 +modified: 20150606055622042 +tags: Questions +title: Do you have uncommitted stuff in your working directory? +type: text/vnd.tiddlywiki + +So you have committed. However, before we go about fixing or removing whatever is wrong, you should first ensure that any uncommitted changes are safe, by either committing them (`git commit`) or by stashing them (`git stash save "message"`) or getting rid of them. + +`git status` will help you understand whether your working directory is clean or not. It should report nothing for perfect safety ("Untracked files" only are sometimes safe.) + +* [[No, I have no changes/working directory is clean|Have you pushed?]] +* [[Yes, I have bad changes/working directory is dirty: discard it|How to undo uncommitted changes]] +* [[Yes, I have good changes/working directory is dirty: save it|How to save uncommitted changes]] diff --git a/tiddlers/Do_you_want_to_discard_all_unpushed_changes_on_this_branch_.tid b/tiddlers/Do_you_want_to_discard_all_unpushed_changes_on_this_branch_.tid new file mode 100644 index 0000000..42ae0fc --- /dev/null +++ b/tiddlers/Do_you_want_to_discard_all_unpushed_changes_on_this_branch_.tid @@ -0,0 +1,11 @@ +created: 20150605221807755 +modified: 20150606055636555 +tags: Questions +title: Do you want to discard all unpushed changes on this branch? +type: text/vnd.tiddlywiki + +There is a shortcut in case you want to discard all changes made on this branch since you have last pushed or in any event, to make your local branch identical to "upstream". Upstream, for local tracking branches, is the place you get history from when you `git pull`: typically for master it might be origin/master. There is a variant of this option which lets you make your local branch identical to some other branch or ref. + +* [[Yes, I want to discard all unpushed changes|Discarding all local commits on this branch]] +* [[Yes, and I want to make my branch identical to some non-upstream ref|Replacing all branch history/contents]] +* [[No, I want to fix some unpushed changes|Is the commit you want to fix the most recent?]] diff --git a/tiddlers/Do_you_want_to_remove_an_entire_commit_.tid b/tiddlers/Do_you_want_to_remove_an_entire_commit_.tid new file mode 100644 index 0000000..173465b --- /dev/null +++ b/tiddlers/Do_you_want_to_remove_an_entire_commit_.tid @@ -0,0 +1,8 @@ +created: 20150606031806104 +modified: 20150606055649013 +tags: Questions +title: Do you want to remove an entire commit? +type: text/vnd.tiddlywiki + +* [[Yes, I want to remove an entire commit|Removing an entire commit]] +* [[No, I want to change an older commit|Do you want to remove/change/rename a particular file/directory from all commits during all of git's history]] \ No newline at end of file diff --git a/tiddlers/Do_you_want_to_remove_change_rename_a_particular_file_directory_from_all_commits_during_all_of_git's_history.tid b/tiddlers/Do_you_want_to_remove_change_rename_a_particular_file_directory_from_all_commits_during_all_of_git's_history.tid new file mode 100644 index 0000000..32956e8 --- /dev/null +++ b/tiddlers/Do_you_want_to_remove_change_rename_a_particular_file_directory_from_all_commits_during_all_of_git's_history.tid @@ -0,0 +1,8 @@ +created: 20150606033227091 +modified: 20150606055823333 +tags: Questions +title: Do you want to remove/change/rename a particular file/directory from all commits during all of git's history +type: text/vnd.tiddlywiki + +* [[Yes please, I want to make a change involving all git commits|Changing all commits during all of git's history]] +* [[No, I only want to change a single commit|Is a merge commit involved?]] \ No newline at end of file diff --git a/tiddlers/Do_you_want_to_remove_or_change_the_commit_message_contents_of_the_last_commit_.tid b/tiddlers/Do_you_want_to_remove_or_change_the_commit_message_contents_of_the_last_commit_.tid new file mode 100644 index 0000000..04371fc --- /dev/null +++ b/tiddlers/Do_you_want_to_remove_or_change_the_commit_message_contents_of_the_last_commit_.tid @@ -0,0 +1,9 @@ +created: 20150606030903029 +modified: 20150606055703075 +tags: Questions +title: Do you want to remove or change the commit message/contents of the last commit? +type: text/vnd.tiddlywiki + +* [[I want to remove the last commit|Removing the last commit]] +* [[I want to update the author/message/contents of the last commit|Updating the last commit's contents or commit message]] +* [[I want to reorder, split, merge, or significantly rework the last commit(s)|Reworking the last commit]] \ No newline at end of file diff --git a/tiddlers/FindingACommit.tid b/tiddlers/FindingACommit.tid new file mode 100644 index 0000000..e990e72 --- /dev/null +++ b/tiddlers/FindingACommit.tid @@ -0,0 +1,7 @@ +created: 20150605220124213 +modified: 20150605220219158 +tags: +title: FindingACommit +type: text/vnd.tiddlywiki + +You can do this using `gitk --date-order` or using `git log --graph --decorate --oneline` or perhaps `git log --oneline -- filename` You are looking for the 40 character SHA-1 hash ID (or the 7 character abbreviation). Yes, if you know the "^" or "~" shortcuts you may use those. \ No newline at end of file diff --git a/tiddlers/First_step.tid b/tiddlers/First_step.tid new file mode 100644 index 0000000..1655fa5 --- /dev/null +++ b/tiddlers/First_step.tid @@ -0,0 +1,16 @@ +created: 20150605123636039 +modified: 20150606054149032 +tags: TableOfContents +title: First step +type: text/vnd.tiddlywiki + +\define backup(url) [[backup|$url$#backups]] +A git [[choose-your-own-adventure!ⓡ|Non Afilliation]] + +This document is an attempt to be a fairly comprehensive guide to recovering from what you did not mean to do when using git. It isn't that git is so complicated that you need a large document to take care or your particular problem, it is more that the set of things that you might have done is so large that different techniques are needed depending on exactly what you have done and what you want to have happen. + +If you have problems after clicking through this document, please copy-paste the "Path" you took (what links you clicked on, automatically presented to you if javascript is available) when asking for further help, since doing so will explain very precisely what you were trying to do, and that you at least tried to help yourself. + +Strongly consider taking a <$macrocall $name="backup" url={{BestPractice!!url}}/> of your current working directory and .git to avoid any possibility of losing data as a result of the use or misuse of these instructions. We promise to laugh at you if you fail to take a backup and regret it later. + +Answer the questions posed by clicking the link for that section. A section with no links is a terminal node and you should have solved your problem by completing the suggestions posed by that node (if not, then report the chain of answers you made on #git or some other git resource and explain further why the proposed answer doesn't help). This is not a document to read linearly. \ No newline at end of file diff --git a/tiddlers/GNU_FDL.tid b/tiddlers/GNU_FDL.tid new file mode 100644 index 0000000..b2a5a06 --- /dev/null +++ b/tiddlers/GNU_FDL.tid @@ -0,0 +1,7 @@ +created: 20150606142306908 +modified: 20150606142327725 +tags: +title: GNU FDL +type: text/vnd.tiddlywiki + +[[GNU Free Documentation v1.3|http://www.gnu.org/licenses/fdl.html]] with no Invariant, Front, or Back Cover texts. \ No newline at end of file diff --git a/tiddlers/Have_you_committed_.tid b/tiddlers/Have_you_committed_.tid new file mode 100644 index 0000000..cdd40f9 --- /dev/null +++ b/tiddlers/Have_you_committed_.tid @@ -0,0 +1,13 @@ +created: 20150605132135076 +modified: 20150606055835668 +order: 2 +tags: Questions +title: Have you committed? +type: text/vnd.tiddlywiki + +If you have not yet committed that which you do not want, git does not know anything about what you have done yet, so it is pretty easy to undo what you have done. + +* [[I am in the middle of a bad merge|Recovering from a borked/stupid/moribund merge]] +* [[I am in the middle of a bad rebase|Recovering from a borked/stupid/moribund rebase]] +* [[Yes, commits were made|Do you have uncommitted stuff in your working directory?]] +* [[No, I have not yet committed|Discard everything or just some things?]] \ No newline at end of file diff --git a/tiddlers/Have_you_pushed_.tid b/tiddlers/Have_you_pushed_.tid new file mode 100644 index 0000000..973b3ea --- /dev/null +++ b/tiddlers/Have_you_pushed_.tid @@ -0,0 +1,16 @@ +created: 20150605213557369 +modified: 20150606055848564 +tags: Questions +title: Have you pushed? +type: text/vnd.tiddlywiki + +So you have committed, the question is now whether you have made your changes (or at least the changes you are interesting in "fixing") publicly available or not. Publishing history is a seminal event. + +If you are dealing with commits someone else made, then this question covers whether they have pushed, and since you have their commits, the answer is almost certainly "yes". + +Please note in any and all events, the recipes provided here will typically (only one exception which will self-notify) only modify the current branch you are on. Specifically any tags or branches involving the commit you are changing or a child of that commit will not be modified. You must deal with those separately. Look at `gitk --all --date-order` to help visualize everything what other git references might need to be updated. + +Also note that these commands will fix up the referenced commits in your repository. There will be reflog'd and dangling commits holding the state you just corrected. This is normally a good thing and it will eventually go away by itself, but if for some reason you want to cut your seat belts, you can expire the reflog now and garbage collect with immediate pruning. + +* [[Yes, pushes were made|Can you make a positive commit to fix the problem and what is the fix class?]] +* [[No pushes|Do you want to discard all unpushed changes on this branch?]] diff --git a/tiddlers/How_to_save_uncommitted_changes.tid b/tiddlers/How_to_save_uncommitted_changes.tid new file mode 100644 index 0000000..6d15992 --- /dev/null +++ b/tiddlers/How_to_save_uncommitted_changes.tid @@ -0,0 +1,11 @@ +created: 20150606023420818 +modified: 20150606060044683 +tags: Answers +title: How to save uncommitted changes +type: text/vnd.tiddlywiki + +There are five ways you can save your uncommitted change. I also suggest you read [[Pro Git|http://git-scm.com/book/]] as these are pretty basic git operations. + +{{UncommittedChangesCheatSheet}} + +Using `git add -p` to add/commit only some changes to make multiple commits is left as an exercise for the reader. diff --git a/tiddlers/How_to_undo_all_uncommitted_changes.tid b/tiddlers/How_to_undo_all_uncommitted_changes.tid new file mode 100644 index 0000000..17f90b1 --- /dev/null +++ b/tiddlers/How_to_undo_all_uncommitted_changes.tid @@ -0,0 +1,9 @@ +created: 20150605212624370 +modified: 20150606060059196 +tags: Answers +title: How to undo all uncommitted changes +type: text/vnd.tiddlywiki + +So you have not yet committed and you want to undo everything. Well, {{BestPractice}} is for you to stash the changes in case you were mistaken and later decide that you really wanted them after all. `git stash save "description of changes"`. You can revisit those stashes later `git stash list` and decide whether to `git stash drop` them after some time has past. Please note that untracked and ignored files are not stashed by default. See "--include-untracked" and "--all" for stash options to handle those two cases. + +However, perhaps you are confident (or arrogant) enough to know for sure that you will never ever want the uncommitted changes. If so, you can run `git reset --hard`, however please be quite aware that this is almost certainly a completely unrecoverable operation. Any changes which are removed here cannot be restored later. This will not delete untracked or ignored files. Those can be deleted with `git clean -nd` or `git clean -ndX` respectively, or `git clean -ndx` for both at once. Well, actually those command do not delete the files. They show what files will be deleted. Replace the "n" in "-nd…" with "f" to actually delete the files. {{BestPractice}} is to ensure you are not deleting what you should not by looking at the moribund filenames first. \ No newline at end of file diff --git a/tiddlers/How_to_undo_some_uncommitted_changes.tid b/tiddlers/How_to_undo_some_uncommitted_changes.tid new file mode 100644 index 0000000..fa9e865 --- /dev/null +++ b/tiddlers/How_to_undo_some_uncommitted_changes.tid @@ -0,0 +1,11 @@ +created: 20150605213006215 +modified: 20150606060111915 +tags: Answers +title: How to undo some uncommitted changes +type: text/vnd.tiddlywiki + +So you have not yet committed and you want to undo some things, well `git status` will tell you exactly what you need to do. For example: + +{{SampleGitStatus}} + +However, the `git checkout` in file mode is a command that cannot be recovered from—the changes which are discarded most probably cannot be recovered. Perhaps you should run `git stash save -p "description"` instead, and select the changes you no longer want to be stashed instead of zapping them. diff --git a/tiddlers/How_to_undo_uncommitted_changes.tid b/tiddlers/How_to_undo_uncommitted_changes.tid new file mode 100644 index 0000000..70916ef --- /dev/null +++ b/tiddlers/How_to_undo_uncommitted_changes.tid @@ -0,0 +1,13 @@ +created: 20150605212641932 +modified: 20150606060124985 +tags: Answers +title: How to undo uncommitted changes +type: text/vnd.tiddlywiki + +!! How to undo all uncommitted changes + +{{How to undo all uncommitted changes}} + +!! How to undo some uncommitted changes + +{{How to undo some uncommitted changes}} \ No newline at end of file diff --git a/tiddlers/I_am_a_bad_person_and_must_rewrite_published_history.tid b/tiddlers/I_am_a_bad_person_and_must_rewrite_published_history.tid new file mode 100644 index 0000000..c7aaf05 --- /dev/null +++ b/tiddlers/I_am_a_bad_person_and_must_rewrite_published_history.tid @@ -0,0 +1,9 @@ +created: 20150605221421477 +modified: 20150606060138091 +tags: Answers +title: I am a bad person and must rewrite published history +type: text/vnd.tiddlywiki + +Hopefully you read the previous reference and fully understand why this is bad and what you have to tell everyone else to do in order to recover from this condition. Assuming this, you simply need to go to the parts of this document which assume that you have not yet pushed and do them as normal. Then you need to do a "force push" `git push -f` to thrust your updated history upon everyone else. As you read in the reference, this may be denied by default by your upstream repository (see `git config receive.denyNonFastForwards`, but can be disabled (temporarily I suggest) if you have access to the server. You then will need to send mail to everyone who might have pulled the history telling them that history was rewritten and they need to `git pull --rebase` and do a bit of history rewriting of their own if they branched or tagged from the now outdated history. + +Proceed with [[fixing the old commit|Do you want to discard all unpushed changes on this branch?]]. diff --git a/tiddlers/I_have_lost_some_commits_I_know_I_made.tid b/tiddlers/I_have_lost_some_commits_I_know_I_made.tid new file mode 100644 index 0000000..0ded367 --- /dev/null +++ b/tiddlers/I_have_lost_some_commits_I_know_I_made.tid @@ -0,0 +1,32 @@ +created: 20150605211409956 +modified: 20150606044140428 +title: I have lost some commits I know I made +type: text/vnd.tiddlywiki + +First make sure that it was not on a different branch. Try `git log -Sfoo --all` where "foo" is replaced with something unique in the commits you made. You can also search with `gitk --all --date-order` to see if anything looks likely. + +Check your stashes, `git stash list`, to see if you might have stashed instead of committing. You can also visualize what the stashes might be associated with via: + +```sh +gitk --all --date-order $(git stash list | awk -F: '{print $1};') +``` + +Next, you should probably look in other repositories you have lying around including ones on other hosts and in testing environments, and in your backups. + +Once you are fully convinced that it is well and truly lost, you can start looking elsewhere in git. Specifically, you should first look at the reflog which contains the history of what happened to the tip of your branches for the past two weeks or so. You can of course say `git log -g` or `git reflog` to view it, but it may be best visualized with: + +```sh +gitk --all --date-order $(git reflog --pretty=%H) +``` + +Next you can look in git's lost and found. Dangling commits get generated for many good reasons including resets and rebases. Still those activities might have mislaid the commits you were interested in. These might be best visualized with `gitk --all --date-order $(git fsck | grep "dangling commit" | awk '{print $3;}')` + +The last place you can look is in dangling blobs. These are files which have been `git add`ed but not attached to a commit for some (usually innocuous) reason. To look at the files, one at a time, run: + +```sh +git fsck | grep "dangling blob" | while read x x s; do + git show $s | less; +done +``` + +Once you find the changes you are interested in, there are several ways you can proceed. You can `git reset --hard SHA` your current branch to the history and current state of that SHA (probably not recommended for stashes), you can `git branch newbranch SHA` to link the old history to a new branch name (also not recommended for stashes), you can `git stash apply SHA` (for the non-index commit in a git-stash), you can `git stash merge SHA` or `git cherry-pick SHA` (for either part of a stash or non-stashes), etc. diff --git a/tiddlers/Is_a_merge_commit_involved_.tid b/tiddlers/Is_a_merge_commit_involved_.tid new file mode 100644 index 0000000..78a98d7 --- /dev/null +++ b/tiddlers/Is_a_merge_commit_involved_.tid @@ -0,0 +1,10 @@ +created: 20150606041758313 +modified: 20150606055901501 +tags: Questions +title: Is a merge commit involved? +type: text/vnd.tiddlywiki + +If the commit you are trying to change is a merge commit, or if there is a merge commit between the commit you are trying to change and the tip of the branch you are on, then you need to do some special handling of the situation. + +* [[Yes, a merge commit is involved|Changing a single commit involving a merge]] +* [[No, only simple commits|Changing a single commit involving only simple commits]] diff --git a/tiddlers/Is_the_commit_you_want_to_fix_the_most_recent_.tid b/tiddlers/Is_the_commit_you_want_to_fix_the_most_recent_.tid new file mode 100644 index 0000000..d1ae311 --- /dev/null +++ b/tiddlers/Is_the_commit_you_want_to_fix_the_most_recent_.tid @@ -0,0 +1,14 @@ +created: 20150606003058224 +modified: 20150606055913790 +tags: Questions +title: Is the commit you want to fix the most recent? +type: text/vnd.tiddlywiki + +While the techniques mentioned to deal with deeper commits will work on the most recent, there are some convenient shortcuts you can take with the most recent commit. + +* [[Yes, I want to change the most recent commit|Do you want to remove or change the commit message/contents of the last commit?]] +* [[Yes, I want to discard the most recent commit(s)|Removing the last commit]] +* [[Yes, I want to undo the last git operation(s) affecting the HEAD/tip of my branch (most useful for rebase, reset, or --amend)|Undoing the last few git operations affecting HEAD/my branch's tip]] +* [[No, I want to change an older commit|Do you want to remove an entire commit?]] +* [[No, I want to restore a older version of/deleted file as a new commit|Making a new commit to restore a file deleted earlier]] +* [[Either way, I want to move a commit from one branch to another|Moving a commit from one branch to another]] diff --git a/tiddlers/Making_a_new_commit_to_fix_an_old_commit.tid b/tiddlers/Making_a_new_commit_to_fix_an_old_commit.tid new file mode 100644 index 0000000..8baebda --- /dev/null +++ b/tiddlers/Making_a_new_commit_to_fix_an_old_commit.tid @@ -0,0 +1,7 @@ +created: 20150605220951394 +modified: 20150606060149818 +tags: Answers +title: Making a new commit to fix an old commit +type: text/vnd.tiddlywiki + +If the problem in the old commit is just something was done incorrectly, go ahead and make a normal commit to fix the problem. Feel free to reference the old commit SHA in the commit message, and if you are into the blame-based development methodology, make fun of the person who made the mistake (or someone who recently left if you made the mistake). \ No newline at end of file diff --git a/tiddlers/Making_a_new_commit_to_restore_a_file_deleted_earlier.tid b/tiddlers/Making_a_new_commit_to_restore_a_file_deleted_earlier.tid new file mode 100644 index 0000000..2785434 --- /dev/null +++ b/tiddlers/Making_a_new_commit_to_restore_a_file_deleted_earlier.tid @@ -0,0 +1,15 @@ +created: 20150605215655631 +modified: 20150606060201897 +tags: Answers +title: Making a new commit to restore a file deleted earlier +type: text/vnd.tiddlywiki + +The file may have been deleted or every change to that file in that commit (and all commits since then) should be destroyed. If so, you can simply checkout a version of the file which you know is good. + +You must first identify the SHA of the commit containing the good version of the file. {{FindingACommit}} + +```sh +git checkout SHA -- path/to/filename +``` + +Obviously replace "SHA" with the reference that is good. You can then add and commit as normal to fix the problem. diff --git a/tiddlers/ManualPage.tid b/tiddlers/ManualPage.tid new file mode 100644 index 0000000..0b3e31e --- /dev/null +++ b/tiddlers/ManualPage.tid @@ -0,0 +1,7 @@ +created: 20150606042210220 +modified: 20150606042222075 +tags: +title: ManualPage +type: text/vnd.tiddlywiki + +[[manual page|http://jk.gs/git-filter-branch.html]] \ No newline at end of file diff --git a/tiddlers/Moving_a_commit_from_one_branch_to_another.tid b/tiddlers/Moving_a_commit_from_one_branch_to_another.tid new file mode 100644 index 0000000..e5abf6b --- /dev/null +++ b/tiddlers/Moving_a_commit_from_one_branch_to_another.tid @@ -0,0 +1,32 @@ +created: 20150606032514573 +modified: 20150606060213728 +tags: Answers +title: Moving a commit from one branch to another +type: text/vnd.tiddlywiki + +So, you have a commit which is in the wrong place and you want to move it from one branch to another. In order to do this, you will need to know the SHA of the first and last commit (in a continuous series of commits) you want to move (those values are the same if you are moving only one commit), the name of the branch you are moving the commit from, and the name of the branch you are moving the commit to. In the example below, I will name these four values $first, $last, $source, and $destination (respectively). Additionally, 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. + +```sh +git branch nonce $last +git rebase -p --onto $destination $first^ nonce +``` + +Remember that when you substitute $first in the command above, leave the "^" alone, it is literal. + +Use `gitk --all --date-order` to check to make sure the move looks correct (pretending that nonce is the destination branch). Please check very carefully if you were trying to move a merge, it may have been recreated improperly. If you //don't// like the result, you may delete the nonce branch (`git branch -D nonce`) and try again. + +However, if everything looks good, we can move the actual destination branch pointer to where nonce is: + +```sh +git checkout $destination +git reset --hard nonce +git branch -d nonce +``` + +If you double-checked with `gitk --all --date-order`, you would see that the destination branch looks correct. However, the commits are still on the source branch as well. We can get rid of those now: + +```sh +git rebase -p --onto $first^ $last $source +``` + +Using `gitk --all --date-order` one last time, you should now see that the commits on the source branch have gone away. You have successfully moved the commits. Please check very carefully if merges occurred after the commits which were deleted. They may have been recreated incorrectly. If so you can either [[undo the delete|Undoing the last few git operations affecting HEAD/my branch's tip]] or try to delete the bad merge and try to recreate it manually, or create a fake (`--ours`) merge from the same SHA so that git is aware that the merge occurred. diff --git a/tiddlers/Navigating_between_open_tiddlers.tid b/tiddlers/Navigating_between_open_tiddlers.tid new file mode 100644 index 0000000..d4c88ea --- /dev/null +++ b/tiddlers/Navigating_between_open_tiddlers.tid @@ -0,0 +1,20 @@ +created: 20150606140030032 +modified: 20150606140051362 +tags: +title: Navigating between open tiddlers +type: text/vnd.tiddlywiki + +In the default "classic" storyview mode, open tiddlers are displayed in a vertical column called the "story river". There are a number of ways you can navigate the story river - that is, how you can jump back and forth between the open tiddlers. + +* The best approach is to ''use the Open tab'' in the sidebar to click on the open tiddler to which you wish to navigate. + +** The ''Open'' tab contains a list of all the open tiddlers. You can click on any tiddler in the list to jump to it, or click the "×" next to a tiddler link to close it. There is also a handy ''close all'' button at the bottom of the list of open tiddlers. + +* Another way is to simply ''scroll the page up and down'' using the story river scrollbar to the right. + +** Note that when both the story river and the sidebar extend below the visible screen, there will be //two// scrollbars. The outer or far-right scrollbar controls the story river. The inner scrollbar controls the sidebar. + +* A clunky approach that many new users try is to ''close tiddlers one by one'' until they get to the tiddler they are looking for. +** Closing any tiddler at the top or in the middle of the story river will cause all the tiddlers below it to slide up the river. The tiddler immediately below the tiddler you closed will slide up to take its place. + +** Closing the bottom tiddler will close it and the bottom of the tiddler above it will come into view. diff --git a/tiddlers/Non_Afilliation.tid b/tiddlers/Non_Afilliation.tid new file mode 100644 index 0000000..e9a0a4e --- /dev/null +++ b/tiddlers/Non_Afilliation.tid @@ -0,0 +1,6 @@ +created: 20150605123858545 +modified: 20150605123902709 +title: Non Afilliation +type: text/vnd.tiddlywiki + +Not affiliated with Chooseco, LLC's "Choose Your Own Adventure"ⓡ. Good books, but a little light on the details of recovering from git merge errors to my taste. \ No newline at end of file diff --git a/tiddlers/Questions.tid b/tiddlers/Questions.tid new file mode 100644 index 0000000..6ea22d5 --- /dev/null +++ b/tiddlers/Questions.tid @@ -0,0 +1,9 @@ +color: #ffcc66 +created: 20150605210750047 +icon: $:/core/images/help +modified: 20150606055333607 +tags: TableOfContents +title: Questions +type: text/vnd.tiddlywiki + +<> \ No newline at end of file diff --git a/tiddlers/Recovering_from_a_borked_stupid_moribund_merge.tid b/tiddlers/Recovering_from_a_borked_stupid_moribund_merge.tid new file mode 100644 index 0000000..0b38184 --- /dev/null +++ b/tiddlers/Recovering_from_a_borked_stupid_moribund_merge.tid @@ -0,0 +1,9 @@ +created: 20150605210552666 +modified: 20150606060227931 +tags: Answers +title: Recovering from a borked/stupid/moribund merge +type: text/vnd.tiddlywiki + +So, you were in the middle of a merge, have encountered one or more conflicts, and you have now decided that it was a big mistake and want to get out of the merge. + +The fastest way out of the merge is `git merge --abort` \ No newline at end of file diff --git a/tiddlers/Recovering_from_a_borked_stupid_moribund_rebase.tid b/tiddlers/Recovering_from_a_borked_stupid_moribund_rebase.tid new file mode 100644 index 0000000..62e697a --- /dev/null +++ b/tiddlers/Recovering_from_a_borked_stupid_moribund_rebase.tid @@ -0,0 +1,9 @@ +created: 20150605210637999 +modified: 20150606060240821 +tags: Answers +title: Recovering from a borked/stupid/moribund rebase +type: text/vnd.tiddlywiki + +So, you were in the middle of a rebase, have encountered one or more conflicts, and you have now decided that it was a big mistake and want to get out of the merge. + +The fastest way out of the merge is `git rebase --abort` \ No newline at end of file diff --git a/tiddlers/Removing_an_entire_commit.tid b/tiddlers/Removing_an_entire_commit.tid new file mode 100644 index 0000000..4c66eb9 --- /dev/null +++ b/tiddlers/Removing_an_entire_commit.tid @@ -0,0 +1,15 @@ +created: 20150606031856578 +modified: 20150606133826057 +tags: Answers +title: Removing an entire commit +type: text/vnd.tiddlywiki + +I call this operation //cherry-pit// since it is the inverse of a //cherry-pick//. {{FindingACommit}} + +```sh +git rebase -p --onto SHA^ SHA +``` + +Obviously replace "SHA" with the reference you want to get rid of. The "^" in that command is literal. + +However, please be warned. If some of the commits between SHA and the tip of your branch are merge commits, 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` and contents 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). diff --git a/tiddlers/Removing_the_last_commit.tid b/tiddlers/Removing_the_last_commit.tid new file mode 100644 index 0000000..7d4f623 --- /dev/null +++ b/tiddlers/Removing_the_last_commit.tid @@ -0,0 +1,11 @@ +created: 20150606030957326 +modified: 20150606133842612 +tags: Answers +title: Removing the last commit +type: text/vnd.tiddlywiki + +To remove the last commit from git, you can simply run `git reset --hard HEAD^` If you are removing multiple commits from the top, you can run `git reset --hard HEAD~2` to remove the last two commits. You can increase the number to remove even more commits. + +If you want to "uncommit" the commits, but keep the changes around for [[reworking|Reworking the last commit]], remove the "--hard": `git reset HEAD^` which will evict the commits from the branch and from the index, but leave the working tree around. + +If you want to save the commits on a new branch name, then run `git branch newbranchname` before doing the git reset. diff --git a/tiddlers/Replacing_all_branch_history_contents.tid b/tiddlers/Replacing_all_branch_history_contents.tid new file mode 100644 index 0000000..f76a3de --- /dev/null +++ b/tiddlers/Replacing_all_branch_history_contents.tid @@ -0,0 +1,17 @@ +created: 20150605222251580 +modified: 20150606133857957 +tags: Answers +title: Replacing all branch history/contents +type: text/vnd.tiddlywiki + +If instead of discarding all local commits, you can make your branch identical to some other branch, tag, ref, or SHA that exists on your system. + +The first thing you need to do is identify the SHA or ref of the good state of your branch. {{FindingACommit}} + +Once you have found the correct state of your branch, you can get to that state by running: + +```sh +git reset --hard REF +``` + +Obviously replace "REF" with the reference or SHA you want to get back to. diff --git a/tiddlers/Reverting_a_merge_commit.tid b/tiddlers/Reverting_a_merge_commit.tid new file mode 100644 index 0000000..bf0c506 --- /dev/null +++ b/tiddlers/Reverting_a_merge_commit.tid @@ -0,0 +1,31 @@ +created: 20150605215904208 +modified: 20150606133914742 +tags: Answers +title: Reverting a merge commit +type: text/vnd.tiddlywiki + +Oh dear. This is going to get complicated. + +To create an positive commit to remove the effects of a merge commit, you must first identify the SHA of the commit you want to revert. {{FindingACommit}} + +Undoing the file modifications caused by the merge is about as simple as you might hope. `git revert -m 1 SHA`. (Obviously replace "SHA" with the reference you want to revert; `-m 1` will revert changes from all but the first parent, which is almost always what you want.) Unfortunately, this is just the tip of the iceberg. The problem is, what happens months later, long after you have exiled this problem from your memory, when you try again to merge these branches (or any other branches they have been merged into)? Because git has it tracked in history that a merge occurred, it is not going to attempt to remerge what it has already merged, and even worse, if you merge from the branch where you did the revert you will undo the changes on the branch where they were made. (Imagine you revert a premature merge of a long-lived topic branch into master and later merge master into the topic branch to get other changes for testing.) + +One option is actually to do this reverse merge immediately, annihilating any changes before the bad merge, and then to "revert the revert" to restore them. This leaves the changes removed from the branch you mistakenly merged to, but present on their original branch, and allows merges in either direction without loss. This is the simplest option, and in many cases, can be the best. + +A disadvantage of this approach is that `git blame` output is not as useful (all the changes will be attributed to the revert of the revert) and `git bisect` is similarly impaired. Another disadvantage is that you must merge all current changes in the target of the bad merge back into the source; if your development style is to keep branches clean, this may be undesirable, and if you rebase your branches (e.g. with `git pull --rebase`), it could cause complications unless you are careful to use `git rebase -p` to preserve merges. + +In the following example please replace $destination with the name of the branch that was the destination of the bad merge, $source with the name of the branch that was the source of the bad merge, and $sha with the SHA-1 hash ID of the bad merge itself. + +```sh +git checkout $destination +git revert $sha +# save the SHA-1 of the revert commit to un-revert it later +revert=`git rev-parse HEAD` +git checkout $source +git merge $destination +git revert $revert +``` + +Another option is to abandon the branch you merged from, recreate it from the previous merge-base with the commits since then rebased or cherry-picked over, and use the recreated branch from now on. Then the new branch is unrelated and will merge properly. Of course, if you have pushed the donor branch you cannot use the same name (that would be rewriting public history and is bad) so everyone needs to remember to use the new branch. Hopefully you have something like [[gitolite|https://github.com/sitaramc/gitolite]] where you can close the old branch name. + +This approach has the advantage that the recreated donor branch will have cleaner history, but especially if there have been many commits (and especially merges) to the branch, it can be a lot of work. At this time, I will not walk you through the process of recreating the donor branch. Given sufficient demand I can try to add that. However, if you look at howto/revert-a-faulty-merge.txt (also shipped as part of the git distribution) it will provide more words than you can shake a stick at. diff --git a/tiddlers/Reverting_an_old_simple_pushed_commit.tid b/tiddlers/Reverting_an_old_simple_pushed_commit.tid new file mode 100644 index 0000000..15d4b45 --- /dev/null +++ b/tiddlers/Reverting_an_old_simple_pushed_commit.tid @@ -0,0 +1,13 @@ +created: 20150605220607986 +modified: 20150606133930557 +tags: Answers +title: Reverting an old simple pushed commit +type: text/vnd.tiddlywiki + +To create an positive commit to remove the effects of a simple (non-merge) commit, you must first identify the SHA of the commit you want to revert. {{FindingACommit}} + +```sh +git revert SHA +``` + +Obviously replace "SHA" with the reference you want to revert. If you want to revert multiple SHA, you may specify a range or a list of SHA. diff --git a/tiddlers/Reworking_the_last_commit.tid b/tiddlers/Reworking_the_last_commit.tid new file mode 100644 index 0000000..d11ba5d --- /dev/null +++ b/tiddlers/Reworking_the_last_commit.tid @@ -0,0 +1,13 @@ +created: 20150606031342816 +modified: 20150606133943863 +tags: Answers +title: Reworking the last commit +type: text/vnd.tiddlywiki + +''WARNING:'' These techniques should only be used for non-merge commits. If you have a merge commit, you are better off deleting the merge and recreating it. + +If you want to perform significant work on the last commit, you can simply `git reset HEAD^`. This will undo the commit (peel it off) and restore the index to the state it was in before that commit, leaving the working directory with the changes uncommitted, and you can fix whatever you need to fix and try again. + +You can do this with multiple (non-merge) commits in a row (using `HEAD^^` or similar techniques), but then of course you lose the separation between the commits and are left with an undifferentiated working directory. If you are trying to squash all of the commits together, or rework which bits are in which commits, this may be what you want. + +If you want to reorder commits, split them, merge them together, or otherwise perfect the commits, you should explore [[Post Production Editing Using Git|http://sethrobertson.github.com/GitPostProduction]]. diff --git a/tiddlers/Rewriting_an_old_branch_with_a_new_branch_with_a_new_commit.tid b/tiddlers/Rewriting_an_old_branch_with_a_new_branch_with_a_new_commit.tid new file mode 100644 index 0000000..082392c --- /dev/null +++ b/tiddlers/Rewriting_an_old_branch_with_a_new_branch_with_a_new_commit.tid @@ -0,0 +1,35 @@ +created: 20150605221301106 +modified: 20150606134000820 +tags: Answers +title: Rewriting an old branch with a new branch with a new commit +type: text/vnd.tiddlywiki + +If the state of a branch is contaminated beyond repair and you have pushed that branch or otherwise do not want to rewrite the existing history, then you can make a new commit which overwrites the original branch with the new one and pretends this was due to a merge. The command is a bit complicated, and will get rid of all ignored or untracked files in your working directory, so please be sure you have properly backed up everything. + +In the following example please replace $destination with the name of the branch whose contents you want to overwrite. $source should be replaced with the name of the branch whose contents are good. + +You actually are being provided with two methods. The first set is more portable but generates two commits. The second knows about the current internal files git uses to do the necessary work in one commit. Only one command is different and a second command runs at a different time. + +```sh +# Portable method to overwrite one branch with another in two commits +git clean -dfx +git checkout $destination +git reset --hard $source +git reset --soft ORIG_HEAD +git add -fA . +git commit -m "Rewrite $destination with $source" +git merge -s ours $source +``` + +or + +```sh +# Hacky method to overwrite one branch with another in one commit +git clean -dfx +git checkout $destination +git reset --hard $source +git reset --soft ORIG_HEAD +git add -fA . +git rev-parse $source > .git/MERGE_HEAD +git commit -m "Rewrite $destination with $source" +``` diff --git a/tiddlers/SampleGitStatus.tid b/tiddlers/SampleGitStatus.tid new file mode 100644 index 0000000..e6f79ff --- /dev/null +++ b/tiddlers/SampleGitStatus.tid @@ -0,0 +1,23 @@ +created: 20150606045637198 +modified: 20150606045850731 +tags: +title: SampleGitStatus +type: text/vnd.tiddlywiki + +
On branch master
+Changes to be committed:
+  (use "git reset HEAD <file>..." to unstage)
+
+      new file:   .gitignore
+
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git checkout -- <file>..." to discard changes in working directory)
+
+      modified:   A
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+
+      C
+
diff --git a/tiddlers/Seth_Robertson.tid b/tiddlers/Seth_Robertson.tid new file mode 100644 index 0000000..d6b604d --- /dev/null +++ b/tiddlers/Seth_Robertson.tid @@ -0,0 +1,8 @@ +created: 20150606042656671 +modified: 20150606042741719 +tags: +title: Seth Robertson +type: text/vnd.tiddlywiki + +; Homepage +: http://sethrobertson.github.io/ \ No newline at end of file diff --git a/tiddlers/SukiGravatar.tid b/tiddlers/SukiGravatar.tid new file mode 100644 index 0000000..0e39d0e --- /dev/null +++ b/tiddlers/SukiGravatar.tid @@ -0,0 +1,9 @@ +_canonical_uri: http://gravatar.com/avatar/a33233f156a5531707f130c28565de69 +created: 20150606051510231 +height: 80 +modified: 20150606051608860 +tags: +title: SukiGravatar +type: image/png +width: 80 + diff --git a/tiddlers/TableOfContents.tid b/tiddlers/TableOfContents.tid new file mode 100644 index 0000000..f19c3d2 --- /dev/null +++ b/tiddlers/TableOfContents.tid @@ -0,0 +1,13 @@ +caption: {{$:/language/SideBar/Contents/Caption}} +color: #66ccff +created: 20150606052850055 +list: [[First step]] Questions Answers Comments Thanks Disclaimer Copyright About +list-after: $:/core/ui/SideBar/Open +modified: 20150606134323938 +tags: $:/tags/SideBar +title: TableOfContents +type: text/vnd.tiddlywiki + +
+<> +
\ No newline at end of file diff --git a/tiddlers/Thanks.tid b/tiddlers/Thanks.tid new file mode 100644 index 0000000..bc5ff3e --- /dev/null +++ b/tiddlers/Thanks.tid @@ -0,0 +1,7 @@ +created: 20150606003826255 +modified: 20150606054445526 +tags: TableOfContents +title: Thanks +type: text/vnd.tiddlywiki + +Thanks to the experts on #git and my coworkers for review, feedback, and ideas. \ No newline at end of file diff --git a/tiddlers/UncommittedChangesCheatSheet.tid b/tiddlers/UncommittedChangesCheatSheet.tid new file mode 100644 index 0000000..adbec68 --- /dev/null +++ b/tiddlers/UncommittedChangesCheatSheet.tid @@ -0,0 +1,60 @@ +created: 20150606024958984 +modified: 20150606030104503 +tags: +title: UncommittedChangesCheatSheet +type: text/vnd.tiddlywiki + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
DescriptionCommand
Commit them on the local branch. +
+git commit -am "My descriptive message"
+
+
Commit them on another branch, no checkout conflicts. +
+git checkout otherbranch && git commit -am "My descriptive message"
+
+
Commit them on another branch, conflicts. +
+git stash
+git checkout otherbranch
+git stash apply # Resolve any conflicts
+git commit      # Write a well worded/formatted commit message
+git stash drop
+
+
Commit them on a new branch. +
+git checkout -b newbranch; git commit -am "My descriptive message"
+
+
Stash them for a rainy day. +
+git stash save "my descriptive name"
+
+
diff --git a/tiddlers/Undoing_the_last_few_git_operations_affecting_HEAD_my_branch's_tip.tid b/tiddlers/Undoing_the_last_few_git_operations_affecting_HEAD_my_branch's_tip.tid new file mode 100644 index 0000000..473f983 --- /dev/null +++ b/tiddlers/Undoing_the_last_few_git_operations_affecting_HEAD_my_branch's_tip.tid @@ -0,0 +1,27 @@ +created: 20150606004401538 +modified: 20150606134015599 +tags: Answers +title: Undoing the last few git operations affecting HEAD/my branch's tip +type: text/vnd.tiddlywiki + +Practically every git operation which affects the repository is recorded in the `git reflog`. You may then use the reflog to look at the state of the branches at previous times or even go back to the state of the local branch at the time. + +While this happens for every git command affecting HEAD, it is usually most interesting when attempting to recover from a bad rebase or reset or an --amend'ed commit. There are better ways (listed by the rest of this document) from recovering from the more mundane reflog updates. + +The first thing you need to do is identify the SHA of the good state of your branch. You can do this by looking at the output of `git log -g` or, my preference, you can look graphically at `gitk --all --date-order $(git log -g --pretty=%H)` + +Once you have found the correct state of your branch, you can get back to that state by running + +```sh +git reset --hard SHA +``` + +You could also link that old state to a new branch name using + +```sh +git checkout -b newbranch SHA +``` + +Obviously replace "SHA" in both commands with the reference you want to get back to. + +Note that any other commits you have performed since you did that "bad" operation will then be lost. You could `git cherry-pick` or `git rebase -p --onto` those other commits over. diff --git a/tiddlers/Updating_the_last_commit's_contents_or_commit_message.tid b/tiddlers/Updating_the_last_commit's_contents_or_commit_message.tid new file mode 100644 index 0000000..ec62233 --- /dev/null +++ b/tiddlers/Updating_the_last_commit's_contents_or_commit_message.tid @@ -0,0 +1,13 @@ +created: 20150606031550308 +modified: 20150606134030576 +tags: Answers +title: Updating the last commit's contents or commit message +type: text/vnd.tiddlywiki + +To update the last commit's contents, author, or commit message for a commit which you have not pushed or otherwise published, first 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. You can also use `--author` to change the author information. + +If you want to do something more sophisticated that what `--amend` allows, please investigate [[reworking|Reworking the last commit]] the last commit. diff --git a/tiddlers/Use_The_BFG_to_remove_unwanted_data,_like_big_files_or_passwords,_from_Git_repository_history.tid b/tiddlers/Use_The_BFG_to_remove_unwanted_data,_like_big_files_or_passwords,_from_Git_repository_history.tid new file mode 100644 index 0000000..20932c7 --- /dev/null +++ b/tiddlers/Use_The_BFG_to_remove_unwanted_data,_like_big_files_or_passwords,_from_Git_repository_history.tid @@ -0,0 +1,21 @@ +created: 20150606033437797 +modified: 20150606134059276 +tags: Answers +title: Use The BFG to remove unwanted data, like big files or passwords, from Git repository history +type: text/vnd.tiddlywiki + +''Disclaimer'', the author of this document has not qualified this tool (including for safety or usability for any purpose), but recognizes the need which this tool fills for large repositories. + +[[The BFG|http://rtyley.github.io/bfg-repo-cleaner/]] is a simpler, faster alternative to `git filter-branch`, specifically designed for cleansing bad data out of your Git repository history - it operates over all branches and tags in your project to purge data you don't want retained ''anywhere''. Some [[examples|http://rtyley.github.io/bfg-repo-cleaner/#examples]]: + +Remove all blobs bigger than 1 megabyte (to make your repo take up less space): + +```sh +$ bfg --strip-blobs-bigger-than 1M my-repo.git +``` + +Replace all passwords listed in a file with `***REMOVED***` wherever they occur in your repository : + +```sh +$ bfg --replace-text passwords.txt my-repo.git +``` diff --git a/tiddlers/nonce.tid b/tiddlers/nonce.tid new file mode 100644 index 0000000..520d8dc --- /dev/null +++ b/tiddlers/nonce.tid @@ -0,0 +1,7 @@ +created: 20150606032638910 +modified: 20150606032644672 +tags: +title: nonce +type: text/vnd.tiddlywiki + +[[nonce|http://en.wiktionary.org/wiki/nonce]] \ No newline at end of file diff --git a/wiki-dist/tiddlers b/wiki-dist/tiddlers new file mode 120000 index 0000000..031bfe3 --- /dev/null +++ b/wiki-dist/tiddlers @@ -0,0 +1 @@ +../tiddlers \ No newline at end of file diff --git a/wiki-dist/tiddlywiki.info b/wiki-dist/tiddlywiki.info new file mode 100644 index 0000000..9a96e3e --- /dev/null +++ b/wiki-dist/tiddlywiki.info @@ -0,0 +1,10 @@ +{ + "description": "Basic HTML edition", + "plugins": [ + "tiddlywiki/highlight" + ], + "themes": [ + "tiddlywiki/vanilla", + "tiddlywiki/snowwhite" + ] +} diff --git a/wiki/tiddlers b/wiki/tiddlers new file mode 120000 index 0000000..031bfe3 --- /dev/null +++ b/wiki/tiddlers @@ -0,0 +1 @@ +../tiddlers \ No newline at end of file diff --git a/wiki/tiddlywiki.info b/wiki/tiddlywiki.info new file mode 100644 index 0000000..39957d6 --- /dev/null +++ b/wiki/tiddlywiki.info @@ -0,0 +1,12 @@ +{ + "description": "Basic client-server edition", + "plugins": [ + "tiddlywiki/tiddlyweb", + "tiddlywiki/filesystem", + "tiddlywiki/highlight" + ], + "themes": [ + "tiddlywiki/vanilla", + "tiddlywiki/snowwhite" + ] +}