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
0ed6dbf706
Remove typo aliases, add co = checkout
2014-08-29 14:37:42 -07:00
9d45f6a273
Add stronger language for force push
...
It will conflicts in the source history, and may interfere with other branches regardless of amount of developers on the team.
2014-08-27 23:02:00 -07:00
a4a708b9df
Add missing anchor tag
2014-08-22 14:08:27 -07:00
cf111f959c
Add instructions for deleting stale branches
2014-08-22 14:07:36 -07:00
9fba446438
Add example - unpushed aliases to log @{u}
2014-08-22 13:53:19 -07:00
8d2c660b3c
Add some command aliases.
2014-08-22 13:33:56 -07:00
fc2ec9c64a
Merge pull request #21 from jwhear/master
...
Use `branch` instead of `checkout -b`
2014-08-22 14:55:09 -04:00
0b5b0762e3
Merge pull request #19 from sconklin/master
...
add instructions for changing the author of the last commit
2014-08-22 14:54:38 -04:00
b3cbdcc589
Merge pull request #14 from unixorn/show-rebasing-unpushed-commits
...
Add entry for safe rebasing of unpushed commits
2014-08-22 14:52:34 -04:00
2566992128
Merge pull request #24 from robins/master
...
Correct typo - Situations
2014-08-22 14:51:57 -04:00
e001f275ae
avoid force pushing
2014-08-19 14:48:43 -04:00
9b88f428a4
-add section for reflog
2014-08-18 13:28:16 -07:00
e7310f3cff
Correct typo - Situations
...
Correct typo - Situations (not Sitautions)
2014-08-15 06:04:50 +05:30
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
951e37cc2e
Use `branch` instead of `checkout -b`
...
Using `checkout -b` to create a new branch only to immediately checkout the previous branch is kind of pointless.
2014-08-14 10:41:04 -07:00
1b8e378cf4
add instructions for changing the author of the last commit
2014-08-07 07:41:35 -05:00
6526fc148f
Fix typo
2014-08-05 13:39:03 -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
3399886f03
-add section for reflog
2014-07-31 17:19:49 +02:00
7131d015d0
Fix typo
2014-07-30 14:59:12 -07:00
f160a96ef6
Add entry for safe rebasing of unpushed commits
2014-07-30 14:57:27 -07:00
2a01c08c37
Merged #7 with upstream
2014-07-29 17:54:47 -05:00
978e484967
Update README.md
2014-07-29 11:53:00 -07:00
69204cdf0a
Fixes #6 : Force pushing after amending commits
2014-07-29 13:14:46 -04:00
3e6efe1c7e
Added anchor points to sections.
...
Added anchor points so that links can be created to the merge conflict section, etc.
2014-07-29 11:44:39 -05:00
ceaaf34970
Replaced "brackets" with "parentheses"
...
...since the branch name *is* in parentheses, not brackets.
2014-07-29 11:26:16 -05:00
20dc20e9ae
Add note about "care" when force-pushing
...
It wasn't obvious exactly how a user should "be careful" when force-pushing. Being explicit about what exactly it is important to take care to do can improve confidence in the process.
2014-07-28 23:36:06 +01:00
0b1f8fe4b6
Added note about force pushing
2014-07-25 14:31:24 -04:00
69afe5e1ec
Update README.md
2014-07-22 16:55:20 -04:00
29550231a2
Update README.md
2014-07-22 16:52:45 -04:00
354b625966
Defining flight rules
2014-07-22 16:52:19 -04:00
5d5c1324a0
Updated language of titles
2014-07-22 16:50:01 -04:00
6c03b259e8
what are flight rules
2014-07-22 16:47:10 -04:00
1a9c54d73b
updates
2014-07-22 16:46:24 -04:00
45725ed8b9
formatting
2014-07-22 16:35:05 -04:00
68c0e673b1
added readme
2014-07-22 16:33:36 -04:00
Richard Littauer
Joe Block
Arialdo Martini
Cameron Drake
Josh Dutcher
The Gitter Badger
Ciro S. Costa
Kate Hudson
Dan Dascalescu
Aldric Giacomoni
Chris O'Connor
siemiatj
Robins
Stuart P. Bentley
Justin Whear
Steve Conklin
Christophe Naud-Dulude
Jason Moore
Jack Maney
Cameron Drake
Leonard Martin