1
0
mirror of https://github.com/k88hudson/git-flight-rules.git synced 2025-06-16 21:01:45 -03:00

145 Commits

Author SHA1 Message Date
57b67d4843 Added section on staging and unstaging 2016-12-13 13:03:57 -05:00
25bb25a82f Merge pull request #99 from jwilk/spelling
Fix typos
2016-11-13 20:30:03 +09:00
e1d3f10f38 Merge pull request #100 from jwilk/alias-amend
Fix the "amend" alias
2016-11-13 20:29:17 +09:00
c483f0dfda Fix the "amend" alias 2016-11-12 16:11:50 +01:00
4744ae8733 Fix typos 2016-11-12 16:10:29 +01:00
2fa0b60933 Moved note to section 2016-08-01 21:20:33 -04:00
6d0c8e4910 Add rule about bringing changes from another ref-ish 2016-08-01 21:18:59 -04:00
abaa08d04a Update ToC 2016-08-01 21:08:05 -04:00
bc09d52f9c Merge pull request #93 from eush77/additions
Add some simpler ways to do the same things
2016-02-22 10:13:47 -05:00
15fe42de67 add missing preposition 2016-02-22 17:54:12 +03:00
d87d89abfb Merge pull request #94 from alvarogarcia7/patch-1
add another way of seeing the last committed diff
2016-02-15 12:56:47 -05:00
aef9e07efc Merge pull request #95 from alvarogarcia7/patch-2
prefer using official (bogus) domain name
2016-02-15 12:55:57 -05:00
f47b2e66f5 Merge pull request #96 from alvarogarcia7/patch-3
for privacy, hide emails
2016-02-15 12:55:42 -05:00
f852094458 for privacy, hide emails 2016-02-15 00:45:06 +01:00
8ebbb29f48 prefer using official (bogus) domain name 2016-02-15 00:43:35 +01:00
35715611d4 add another way of seeing the last committed diff 2016-02-15 00:38:20 +01:00
7c76618f2e add some simpler ways to do the same things and a bit more info 2016-02-13 01:13:36 +03:00
a289c22e73 Merge pull request #92 from adjavaherian/master
Credential helper
2015-12-17 18:49:13 -05:00
efafa0dec3 Merge pull request #1 from adjavaherian/adjavaherian-credential-helper
Adding a rule for caching username and password
2015-12-17 12:53:22 -08:00
70077dbe9f Adding a rule for caching username and password
This describes how you can cache your username and password with credential helper. ala. https://help.github.com/articles/caching-your-github-password-in-git/
2015-12-17 12:52:19 -08:00
8e4d72dbc8 Added git fire
🔥
2015-10-05 10:40:27 -04:00
9740678d01 Merge branch 'magalhini-recover-deleted-tag' 2015-10-02 08:54:31 -04:00
4dbc241226 Merge branch 'recover-deleted-tag' of https://github.com/magalhini/git-flight-rules into magalhini-recover-deleted-tag 2015-10-02 08:54:13 -04:00
a98fcf9f13 Merge pull request #91 from orthographic-pedant/spell_check/accidentally
Fixed typographical error, changed accidentaly to accidentally in README.
2015-09-30 13:26:26 -04:00
792e0deb23 Fixed typographical error, changed accidentaly to accidentally in README. 2015-09-30 13:11:12 -04:00
7bce1f9570 Merge pull request #88 from RichardLitt/feature/62-restructure-doc
Restructured document, closes #62
2015-09-27 08:46:46 -07:00
01eddd2ca7 Restructured document, closes #62 2015-09-27 11:45:45 -04:00
0bd7dbd106 Consistent naming of tags. 2015-09-27 17:35:43 +02:00
6fa3e0c7d9 Add instructions to recover a deleted tag. 2015-09-27 17:28:04 +02:00
08ac820a33 Merge pull request #87 from RichardLitt/feature/remove-files-from-commit
Added workflow for removing file from commit
2015-09-23 11:43:02 -04:00
1edbba171b Added workflow for removing file from commit 2015-09-23 11:42:36 -04:00
3c736dfa26 Merge pull request #86 from appleboy/patch-1
Add another way to change the commit message.
2015-09-03 22:59:08 -04:00
cb168abd45 update comment. 2015-09-04 10:32:37 +08:00
184bcc1ddf Add another way to change commit message. 2015-09-04 08:55:25 +08:00
d417eedd3b Merge pull request #77 from RichardLitt/feature/edit-amend
Added more text to amend section to explain when it is good to edit a…
2015-09-03 16:07:37 -04:00
65e60c8e89 Merge pull request #79 from RichardLitt/feature/delete-branch
Added explanation for deleting a branch
2015-09-03 16:05:04 -04:00
1798a7d4c0 Added explanation for deleting a branch 2015-09-03 15:56:51 -04:00
5b935d5597 Merge pull request #80 from RichardLitt/feature/reset-single-file
Added explanation for reseting a single file
2015-09-03 15:56:49 -04:00
6f8ab94610 Merge pull request #81 from RichardLitt/feature/standardize-syntax
Standardized branch names to my-branch, added missing dollar signs, a…
2015-09-03 15:50:43 -04:00
21fca93ac2 Merge pull request #82 from RichardLitt/feature/add-gitup
Added GitUp into resources
2015-09-03 15:39:05 -04:00
11cf3c92de Merge pull request #83 from RichardLitt/feature/github-workflow
Added GitHub as a workflow
2015-08-25 14:53:15 -04:00
9029bda973 Merge pull request #84 from RichardLitt/feature/reflog
Added a section about reflog, closes #2
2015-08-25 14:46:04 -04:00
927ca07ff8 Added a section about reflog, closes #2 2015-08-25 14:37:06 -04:00
50780dc043 Added GitHub as a workflow 2015-08-25 14:27:12 -04:00
97cada4381 Added GitUp into resources 2015-08-20 12:09:59 -04:00
48cce8af6c Standardized branch names to my-branch, added missing dollar signs, and fixed some cases where the order wasn't right. Also added sh to all code blocks where needed, and added vim to blocks showing the interactive editor. This closes #76. 2015-08-19 13:48:42 -04:00
eb73619120 Added explanation for reseting a single file 2015-08-18 16:03:44 -04:00
bad8c7f6b0 Merge pull request #78 from RichardLitt/feature/remove-cleanup
Merged two questions, as revert applies to both
2015-08-18 16:01:26 -04:00
a9cb62514a Merged two questions, as revert applies to both 2015-08-18 15:57:09 -04:00
6722c72350 Added more text to amend section to explain when it is good to edit a commit 2015-08-18 15:53:51 -04:00
4622e309f1 Merge pull request #74 from RichardLitt/feature/capitalization
Added example for changing capitalization of a file
2015-08-18 15:27:11 -04:00
4f9e6fff47 Merge pull request #75 from RichardLitt/feature/contribute
Added a contribute file
2015-08-18 15:26:44 -04:00
ad0dd58329 Added a contribute file 2015-08-18 11:24:27 -04:00
ca934fe3ff Added example for changing capitalization of a file 2015-08-18 11:11:17 -04:00
e046ac055c Merge pull request #73 from RichardLitt/feature/add-partial-new-file
Add solution for interactively patching part of a new file
2015-08-09 20:18:37 -04:00
a1adec8fe4 Add solution for interactively patching part of a new file 2015-08-09 15:20:45 -04:00
aefbf8fa39 Merge pull request #71 from RichardLitt/feature/git-tips
Added git tips
2015-07-16 14:16:36 -04:00
3260154b76 Added git tips 2015-07-16 14:16:06 -04:00
1e74631336 Merge pull request #72 from appleboy/patch-1
Add GIT utilities
2015-07-16 14:14:10 -04:00
8434388e49 Add GIT utilities 2015-07-16 20:05:27 +08:00
896d792a27 Merge pull request #70 from RichardLitt/feature/undo-reset-hard
How to undo a hard reset
2015-07-05 11:29:52 -04:00
1bb6a708ec How to undo a hard reset 2015-07-03 16:22:51 -04:00
cdef6a1274 Merged two answers 2015-07-03 16:20:02 -04:00
875c49d0d1 Added good rebase and merge tutorial 2015-06-30 13:29:52 -04:00
02e9ec921f Merge pull request #63 from RichardLitt/feature/merged-commits
Added note about checking for merged branches
2015-06-01 09:48:25 +08:00
84d543db7d Added note about checking for merged branches
This should check if your commits are fully merged or not. Mostly taken from
http://stackoverflow.com/questions/7548926/git-and-the-branch-x-is-not-fully-merged-error.
2015-06-01 09:47:33 +08:00
a4af688a5c Merge pull request #69 from unixorn/master
Break GUI clients out into separate section
2015-05-26 08:21:39 +07:00
7792dac8f7 Doctoc update 2015-05-24 22:35:52 -07:00
34a83f3efa Add GUI Clients section 2015-05-24 22:35:34 -07:00
a02899c748 Add Tower client 2015-05-24 22:26:56 -07:00
a3e2e70fa1 Fixed header 2015-05-22 09:26:54 +07:00
78f470427c Merge pull request #68 from RichardLitt/master
FirstAidGit
2015-05-22 09:16:59 +07:00
a5c51421c3 Merge branch 'feature/first-aid-git' 2015-05-22 09:15:55 +07:00
c0bd172d03 Merge branch 'feature/first-aid-git' of git://github.com/k88hudson/git-flight-rules into feature/first-aid-git 2015-05-22 09:15:19 +07:00
b8bb75da0f Added firstaidgit.io
Closes #54.
2015-05-22 09:14:45 +07:00
a8e6825f90 Merge pull request #67 from unixorn/add-more-resources
Add more git clients, Add Book section to Other Resources
2015-05-22 09:11:05 +07:00
45c63ac9f4 Add book section 2015-05-21 19:02:08 -07:00
ff99d75be1 Add git-cola 2015-05-21 19:00:08 -07:00
44ebb19dbb Add gitx-dev link 2015-05-21 18:58:21 -07:00
eaa3353fa2 Merge pull request #66 from unixorn/update-doctoc
Forgot to run doctoc after adding 'Other Resources' section
2015-05-20 08:42:59 +07:00
67ed4f0ea5 Forgot to run doctoc after adding 'Other Resources' section 2015-05-19 10:52:56 -07:00
f9b72fe495 Added firstaidgit.io
Closes #54.
2015-05-20 00:47:29 +07:00
efb1619f25 Merge pull request #64 from unixorn/master
Add "Other Resources" section
2015-05-20 00:45:32 +07:00
64182bca50 Add Other resources section
* Add link to git-workflow - closes #59
* Add link to git-extra-commands collection of helper scripts
* Add link to source tree
2015-05-19 10:40:24 -07:00
a9b0361a88 Strip trailing spaces 2015-05-19 10:40:03 -07:00
264d3dde33 Merge pull request #61 from RichardLitt/feature/deleted-fork
Added a section about deleted PRs
2015-05-20 00:19:46 +07:00
1b4cad1552 Added a section about deleted PRs 2015-05-19 14:23:25 +07:00
aeaa38e922 Merge pull request #60 from RichardLitt/feature/arialdomartini
`git reset --hard master~1` rather than `git reset --hard a13b85e`
2015-05-19 14:15:27 +07:00
b0c20c4804 Added explanation of HEAD, kept past example 2015-05-19 14:13:19 +07:00
6a23217314 Using git reset --hard HEAD^, as suggested by @konrado0905 2015-05-19 14:11:34 +07:00
e4fe866e14 Merge pull request #56 from RichardLitt/force-push-rebase
Rebasing and force pushing
2015-05-16 01:37:47 +07:00
d673566e0d Rebasing and force pushing 2015-05-15 13:24:00 +07:00
08bbf9a967 Merge pull request #58 from RichardLitt/master
Merge stuartpb-patch-2
2015-05-15 13:21:03 +07:00
a32ec5590e Merge branch 'stuartpb-patch-2' 2015-05-15 13:20:02 +07:00
1a993cec3e Added text, moved to appropriate section 2015-05-15 13:19:52 +07:00
5a0f04c8e9 Merge branch 'patch-2' of https://github.com/stuartpb/git-flight-rules into stuartpb-patch-2 2015-05-15 13:14:04 +07:00
8c4e12be63 Merge pull request #57 from RichardLitt/feature/commits-to-old-branch
Added two sections for moving unstaged edits
2015-05-14 05:31:22 +07:00
9f1fbc5861 Added two sections for moving unstaged edits
I often want to add commits to a new branch, and to an old branch that is empty, but I forget how. Here it is.
2015-05-11 14:00:59 +07:00
0f7027159a Merge pull request #55 from RichardLitt/master
Merge
2015-04-26 18:19:47 +08:00
8c5b442718 Merge branch 'stuartpb-patch-1' 2015-04-26 18:19:00 +08:00
bec92700e4 Merge 2015-04-26 18:18:50 +08:00
2ebceca748 Merge pull request #53 from unixorn/master
Minor typo fix, remove trailing spaces
2015-04-21 14:31:46 +07:00
ab17fbc6ab Minor typo fix, remove trailing spaces 2015-04-20 23:39:46 -07:00
597bde6d7b Merge pull request #52 from RichardLitt/master
Merged in the Delete PR
2015-03-23 11:17:34 +08:00
caf8d3c8b4 Made a deleting category 2015-03-23 11:15:55 +08:00
08ced44cd3 Merge branch 'patch-1' of https://github.com/dandv/git-flight-rules into dandv-patch-1
# Conflicts:
#	README.md
2015-03-23 11:13:54 +08:00
2bf72a4ec4 Merge pull request #51 from RichardLitt/master
RM tips
2015-03-21 10:16:18 +08:00
46aff394db Merge branch 'jm-tips' of https://github.com/xinsight/git-flight-rules into xinsight-jm-tips 2015-03-21 10:13:04 +08:00
0fe348620e Merge pull request #50 from RichardLitt/master
Removed second force-push section
2015-03-20 20:42:15 +08:00
d718c438ee Removed second force-push section
This commit was in #18, first.
2015-03-20 20:39:57 +08:00
17dea4c558 Merge pull request #49 from RichardLitt/master
Doctoc fixes. :|
2015-03-16 13:18:55 -07:00
974505558f Doctoc fixes. :| 2015-03-16 13:18:19 -07:00
6f9d0f8797 Merge pull request #48 from RichardLitt/gitter-badger-gitter-badge
Gitter
2015-03-16 13:15:04 -07:00
fed9948810 Merge branch 'gitter-badge' of https://github.com/gitter-badger/git-flight-rules into gitter-badger-gitter-badge 2015-03-16 13:14:01 -07:00
a9bfc9f52a Merge pull request #47 from RichardLitt/master
PR Feedback
2015-03-16 13:10:29 -07:00
d5d405fbbf Merge branch 'camwes-patch-1' 2015-03-16 13:09:56 -07:00
c108121f94 Doctoc 2015-03-16 13:09:41 -07:00
fc5d15e54c Merge branch 'patch-1' of https://github.com/camwes/git-flight-rules into camwes-patch-1 2015-03-16 13:09:15 -07:00
88252b2d91 PR feedback 2015-03-16 12:15:05 -07:00
b1016fbeb9 Merge pull request #46 from RichardLitt/master
Merge Josh dutcher
2015-03-16 10:21:17 -07:00
0ecf651254 Doctoc, closes #35 2015-03-16 10:20:18 -07:00
a52d5152d8 Merge branch 'joshdutcher-master' 2015-03-16 10:20:05 -07:00
5b0a37cfdd Merge branch 'master' of https://github.com/joshdutcher/git-flight-rules into joshdutcher-master
# Conflicts:
#	README.md
2015-03-16 10:19:49 -07:00
ea87639b03 added 'pulled from/into the wrong branch' 2015-03-16 12:11:41 -05:00
0e64bc4cb5 Merge pull request #45 from RichardLitt/master
Moved doctoc
2015-03-16 09:33:56 -07:00
49c3e94217 Moved doctoc 2015-03-16 09:33:13 -07:00
80854f6e60 Alignment
We're going to have to keep tabs on this, doesn't seem perfect.
2015-03-16 09:22:16 -07:00
50bf10c986 Merge pull request #44 from RichardLitt/master
Moved header
2015-03-16 09:21:27 -07:00
c8e0049af6 Moved header 2015-03-16 09:20:51 -07:00
108aa058f0 Merge pull request #38 from RichardLitt/toc
Added TOC using npm module doctoc
2015-03-16 09:19:25 -07:00
5b6dfb05c9 Added TOC using npm module doctoc
This should automatically update. All it takes on the maintainer's end
is to `npm install -g doctoc`, and run it once in the file. I like
the look of it, and I think this solves the issue in one command nicely.
This is made to deal with #10.
2015-03-16 09:18:49 -07:00
92211c458f Added Gitter badge 2015-03-14 18:51:22 +00:00
19c8ad3ab9 Added then
This makes it clear that `git rebase` is not a check to see if master is up to date. #3
2015-03-14 11:06:23 -07:00
a2d407f12e Merge pull request #42 from RichardLitt/git-commit-wrong-branch-33
Added note about git push
2015-03-14 10:26:29 -07:00
34e4f3e39b Added note about git push
This reflects that your origin will be out of sync with remote if you reset. Just a small note. I noticed this when testing #33
2015-03-14 10:25:34 -07:00
660a9b59ca Merge pull request #28 from unixorn/add-missing-anchor-tag
Add missing anchor tag
2015-03-13 18:01:23 -04:00
7ad2b8db96 Merge remote-tracking branch 'upstream/master' into add-missing-anchor-tag 2015-03-13 14:03:03 -07:00
1ddfc1707d Merge pull request #41 from k88hudson/circosta
fixes typo
2015-03-13 15:00:18 -04:00
0a2f618d0f Add a few recipes 2014-11-30 17:21:34 -08:00
a4a708b9df Add missing anchor tag 2014-08-22 14:08:27 -07:00
a53267fd27 Add "I need to undo my last commit" 2014-08-14 12:01:43 -07:00
abb085de05 Add "Oh crap, what did I just commit" 2014-08-14 11:46:47 -07:00
9f20e13e41 fix prompt to match style guide 2014-07-31 23:21:46 -04:00
36b4aadc11 add 4 tips 2014-07-31 23:16:43 -04:00
978e484967 Update README.md 2014-07-29 11:53:00 -07:00
2 changed files with 778 additions and 217 deletions

28
CONTRIBUTE.md Normal file
View File

@ -0,0 +1,28 @@
# Contributing
This is a community built document. Dive in and help out!
### Issues
- Please jump in and help us out by making PRs for open issues.
- If you see anything you'd think could be improved, feel free to open an issue. This doesn't just mean for new additions you'd like to see - although those are very appreciated, too.
### Pull Requests
- Please title your pull requests appropriately, summing up what your commits are about.
- Make sure that your submission doesn't exist somewhere else in the document.
- If you can, run `doctoc README.md` before adding a new section, or after editing a section - this keeps the Table of Contents up to date. If you don't have it, you can install [DocToc here](https://github.com/thlorenz/doctoc).
- Include the relevant branch before the `$` in a shell command, if needed. If not needed, please do not include a branch name.
- Please label code blocks as `sh` to help out [linguist](https://github.com/github/linguist), unless the language is different.
- Try and put relevant flight rules in the same general area of the document - deletes with deletes, commit amends with commit amends, and so on. We're working on making this better, so no worries if it is confusing - just throw the submission on the end.
- Link to places you found answers or procedures if especially complicated, or if linking to a larger discussion of how to do something. This normally means linking to Stack Overflow.
- Generally, conform to this schema:
<a name="example-title"></a>
# Example Title
Brief description of the problem.
```sh
(relevant branch)$ git blah blah
```

967
README.md

File diff suppressed because it is too large Load Diff