12bc63375d
A few cleanups ( #163 )
...
* Consolidate the name of the subsystem
The name of the subsytem is considered to be 'Git' and not 'git'.
There was inconsistency in the document by referring to the subsystem
using both 'git' and 'Git'.
Consolidate the usages to 'Git' which is generally considered to be
the name of the subsystem.
* Consolidate the name of GitHub
They website is generally called 'GitHub' and not 'github'.
* Quote the git commands correctly
* Avoid fullstops in section names
This is done for the sake of consistency. Most of the section names
don't have a fullstop at the end.
So, ...
* Update the ToC
The Table of Contents seems to have been out of date with the section
titles.
So, update the ToC with 'doctoc'.
* Clarify that the changes are removed only for the previous commit
* Showcase the flexibility of `git fetch -p`
The example for that exhibits the way to 'prune' remote branches that
were deleted upstream wasn't flexible as it relied on the command
defaulting to the upstream of the current branch. This might lead
the reader into overlooking the flexibility of the `git fetch`.
Show that the 'upstream' can be mentioned in the command thus show
casing the flexibility of `git fetch`.
* Exemplify the safer version of branch deletion
It's not good for newbies to start using 'force deletion' when they
want to delete a branch as it might lead them to them into
'accidentally' deleting their branches often without merging them
into other branches or pushing them to an upstream.
So, exemplify the safer version of branch deletion (branch -d) and
warn them about what `git branch -D` does.
* Improve readability of a few phrases
It's not required to use 'git' a lot as this a document about Git,
after all.
* Use HTTPS links for sites that serve using HTTPS
* Clarify that rebasing just re-writes history
Rebasing fast-forwards when the tip of the branch is a descendent of
the tip of the upstream. In other cases it re-writes the history. This
re-write is what actually leads the user to 'force' update the remote.
So, clarify that a user has to force update only when the history is
re-written regardless of whether the branch was fast-forwarded.
* Attribute both the authors of the second edition of Pro Git
* Try a different form of emphasizing text
Capitalizing words seems to be over emphasizing words. Italicize
the words, instead to see if works.
* Mention what 'upstream' means for the sake of clarity
* Simplify the way to create a remote branch from the local one
The commands were needlessly complex by not considering the fact
that the command defaults to HEAD when no branch is specified and
changing configuration when it wasn't required.
Simplify the commands to make readers more happy!
* Remove a character cruft left over while editing
This is an instance of a carelessly edited document getting into
version control. ;)
* Improve a sentence
... by,
- expanding acronyms
- quoting a command line parameter
2017-12-08 11:47:41 -05:00
0e478ad4cc
Show how a newly added file can be removed ( #164 )
...
This shows how the user can remove a newly added file from the
previous commit.
2017-12-04 15:57:20 -05:00
231b474600
Discarding staged changes vs unstaged changes - commands corrected ( #159 )
...
* Discarding staged changes vs unstaged changes - commands corrected
* added space between word and parenthesis
* Added <a> tag and TOC for content
* adding missing backticks
* Updated links in staging section
2017-12-03 11:57:20 -05:00
c128fff050
Iss-150: Fixed section about discarding local uncommitted changes ( #160 )
...
Iss-150: minor fix
2017-11-30 16:28:13 -05:00
045015f66d
Update README.md
...
Added a link to the description to abort the merge
2017-11-28 10:52:16 -03:00
5fc6b2289d
Added command to abort the merge
2017-11-28 00:02:58 -03:00
f4c0fac6ef
Add safety note for `git reset --hard` ( #157 )
...
resolves #155
2017-11-27 15:44:52 -05:00
7440fa32b5
Discard local uncommitted changes ( #156 )
2017-11-27 13:30:38 -05:00
02043187a7
Add githug ( #152 )
...
* Add githug
Githug is a great interactive game for leaning git
* Update README.md
2017-11-26 19:01:08 -05:00
7cdaca391f
Added some common Git screwups and solutions ( #148 )
...
* Added some common Git screwups and solutions
* Added required changes
* Added another way to create new remote branch
* Added required changes
* Added required changes
* Added required changes
* Added required changes
2017-11-26 19:00:03 -05:00
8426f177dd
Fix #149 @RichardLitt comment
...
Fix #149 PR merged
2017-11-23 21:41:39 -03:00
4bf16453c6
flight-rule to stash multiple files at once
2017-11-23 01:11:14 +05:30
11c11ecc21
Update README.md
2017-11-21 13:23:03 -06:00
5088d30821
Add sample of -u option of git stash ( #146 )
2017-11-21 13:13:31 -05:00
adb5a2d250
added command to create a branch from a commit ( #145 )
...
Using this command one can create a branch from a specific commit from current branch.
2017-11-20 13:51:04 -05:00
4cb52c015c
fix typo ( #142 )
2017-11-19 12:56:54 -05:00
9dafe52a63
fix typo ( #141 )
2017-11-19 12:56:42 -05:00
2e5498cd5c
New Topic for 'Stashing' and curated frequent stash workflow ( #140 )
2017-11-19 03:34:21 -05:00
5599a75b7f
added another command to see staged diff ( #139 )
...
This command is an alternative to view all the changes in the staged files.
2017-11-18 13:56:47 -05:00
b7d9be9af9
stash content with a custom message ( #138 )
...
Added command which can be used to stash code marked with a custom message
2017-11-18 10:03:11 -05:00
2637bf010f
Add fork and gmaster ( #137 )
...
* add fork
* add fork
2017-11-16 15:34:47 -05:00
f506073152
change [aliases] to [alias] ( #136 )
...
* change [aliases] to [alias]
Titling the section `aliases` did not work for me. Changing to `[alias]` worked immediately.
Reference: https://git-scm.com/docs/git-config#git-config-alias
* Update README_zh-cn.md
2017-11-15 10:57:11 -05:00
e51ba1db7d
fix formatting
2017-11-15 09:08:38 -05:00
b838720631
Be more specific about HEAD^ vs HEAD~ ( #122 )
...
* Be more specific about HEAD^ vs HEAD~
* add more
* revise again
2017-11-15 09:08:04 -05:00
b244c00a4e
Add Note About --ours and --theirs ( #133 )
...
* add note about --ours and --theirs
* correct error message, add more detail on ours/theirs
2017-11-14 14:36:22 -05:00
fc459528ea
Revert a file to a specific revision ( #131 )
2017-11-13 09:09:15 -05:00
a38b385b03
Merge branch 'toptal-more-specific-removal-of-a-file-from-commit'
2017-11-12 10:31:53 -05:00
186ed0a1e4
docs: small grammar fix
2017-11-12 10:31:50 -05:00
f60cd9d835
Change command to avoid editing commit message
2017-11-12 18:16:13 +03:00
103e920531
Add fetching a GitHub PR ref directly ( #129 )
2017-11-12 08:10:33 -05:00
e2ddb7fe55
Added how to rename a local branch ( #128 )
2017-11-11 09:11:26 -05:00
4547f3ea98
Add git extensions to GUI Clients
2017-11-10 16:50:28 -05:00
17bf6d7cbd
Add Magit ( #126 )
2017-11-10 16:30:45 -05:00
76361c407f
Fix minor typo ( #124 )
2017-11-10 16:04:58 -05:00
545a53e808
Change the command to minimize side effects
2017-11-10 19:18:27 +03:00
9f0a1d2ae3
Recommend --force-with-lease instead of --force ( #117 )
2017-11-07 09:19:44 -05:00
4a654bd90a
Add Tig to the list of clients ( #116 )
...
* Update README.md
* Update README.md
2017-11-07 07:58:24 -05:00
7f2a4bfd03
Minor text update
2017-11-06 20:09:42 -05:00
1883097a8b
add learngitbranching tutorial
2017-11-06 19:22:35 -05:00
20bb62b971
Add another git book
2017-11-06 18:25:54 -05:00
868005ed17
Merge pull request #109 from e-larrambebere/master
...
Fixes minor style issues
2017-11-06 08:42:43 -05:00
051e40b042
Fixes minor style issues
...
Adds some missing closure tags to the section anchors. This was causing some issues rendering the README
2017-11-06 09:12:56 +00:00
485bcf6691
add checkout to remote branch
2017-11-05 21:02:03 -05:00
2a86ef478e
Merge branch 'pr/106'
2017-06-05 12:08:59 +01:00
51d78e43c5
Adding stashes back in
2017-06-05 12:08:56 +01:00
998dd0c7fb
Add git-town, alphabetize
2017-05-24 14:50:55 +01:00
542884da13
Improve "discard specific unstaged changes" steps
2017-04-09 16:20:44 +08:00
5af92eed17
Use 'branch' instead of 'checkout -b'
2017-03-29 11:55:42 +02:00
36c28e5ec2
Add Git Gui Cloent GitKraken
2017-01-11 16:46:43 -05:00
1cb8a5798f
Merge pull request #102 from gaetan-petit/patch-1
...
ADD undo rebase/merge
2017-01-09 21:10:44 +01:00
5bad85aeba
Update README.md
2017-01-08 00:32:15 +01:00
c89b20a3fe
Merge pull request #101 from k88hudson/feat/staging-the-unstaged
...
Added section on staging and unstaging
2017-01-06 23:49:40 +01:00
eb48bfc8ba
add a new rule, how to discard specific unstaged changes
2016-12-29 15:34:11 -05:00
9478da7964
Update README.md
2016-12-21 17:43:59 +01:00
2b34d20485
ADD undo rebase/merge
...
Please correct my broken english :)
2016-12-21 17:42:00 +01:00
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
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
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
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
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
792e0deb23
Fixed typographical error, changed accidentaly to accidentally in README.
2015-09-30 13:11:12 -04: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
1edbba171b
Added workflow for removing file from commit
2015-09-23 11:42:36 -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
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
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
ca934fe3ff
Added example for changing capitalization of a file
2015-08-18 11:11:17 -04:00
a1adec8fe4
Add solution for interactively patching part of a new file
2015-08-09 15:20:45 -04:00
3260154b76
Added git tips
2015-07-16 14:16:06 -04:00
8434388e49
Add GIT utilities
2015-07-16 20:05:27 +08: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
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
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
b8bb75da0f
Added firstaidgit.io
...
Closes #54 .
2015-05-22 09:14:45 +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
67ed4f0ea5
Forgot to run doctoc after adding 'Other Resources' section
2015-05-19 10:52:56 -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
1b4cad1552
Added a section about deleted PRs
2015-05-19 14:23:25 +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
d673566e0d
Rebasing and force pushing
2015-05-15 13:24:00 +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
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
bec92700e4
Merge
2015-04-26 18:18:50 +08:00
ab17fbc6ab
Minor typo fix, remove trailing spaces
2015-04-20 23:39:46 -07: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
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
d718c438ee
Removed second force-push section
...
This commit was in #18 , first.
2015-03-20 20:39:57 +08:00
974505558f
Doctoc fixes. :|
2015-03-16 13:18:19 -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
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
0ecf651254
Doctoc, closes #35
2015-03-16 10:20:18 -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
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
c8e0049af6
Moved header
2015-03-16 09:20:51 -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
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
7ad2b8db96
Merge remote-tracking branch 'upstream/master' into add-missing-anchor-tag
2015-03-13 14:03:03 -07:00
3786c8832d
fixes typo
2015-03-13 14:58:57 -04:00
4f85cb543b
Merge pull request #27 from unixorn/adding-custom-aliases
...
Add example of making command aliases.
2015-03-13 14:50:14 -04:00
87ee391bf1
Merge pull request #29 from unixorn/cleanup-deleted-branches
...
Add instructions for deleting stale branches
2015-03-13 11:36:31 -07:00
c554b2b993
Merge pull request #31 from RichardLitt/force
...
Add stronger language for force push
2015-03-13 14:35:11 -04:00
46c5192659
Merge pull request #34 from Trevoke/patch-1
...
Fix typo
2015-03-13 11:30:06 -07:00
e575e47aaa
Added commit amend simple message
2015-03-07 10:39:30 -08:00
0a2f618d0f
Add a few recipes
2014-11-30 17:21:34 -08:00
177d178c50
Fix typo
2014-11-04 11:52:05 -05:00
Kaartic Sivaraam
Dineshkumar Pandiyan
hgautham
JUAN CALVOPINA M
Tadeu Manoel
Josh
Scott Dutton
Rijul1999
Emmanuel Arias
Ben Yanke
Toshiya Kawasaki
Navneet Singh
Nicolas Dermine
Sergey
Greg Walden
Richard Littauer
Tatsujinichi
Kai Dalgleish
Simon Vocella
Filipp Pirozhkov
Tom V
Gabriel Caruso
Nick Kirby
Raimon Grau (rgrau)
Bence Dányi
Edgar Hipp
Arnav Borborah
Shaya Cohen
Emilio Larrambebere
thomasyimgit
Peter Dave Hello
plsr
Camilo Ramirez
Gaëtan Petit
Carson Wilcox
Jakub Wilk
Alvaro Garcia
Eugene Sharygin
Amir Djavaherian
Ricardo Magalhães
orthographic-pedant
Bo-Yi Wu
Kate Hudson
Joe Block
Arialdo Martini
Cameron Drake
Josh Dutcher
The Gitter Badger
Ciro S. Costa
Dan Dascalescu
Aldric Giacomoni