git-flight-rules

alvaro/git-flight-rules

Fork 0

mirror of https://github.com/k88hudson/git-flight-rules.git synced 2025-08-04 06:27:43 -03:00

Commit Graph

Select branches

Hide Pull Requests

YaaMe-master

circosta

feat/common-screwups-40

feat/staging-the-unstaged

feature/first-aid-git

master

#1

#100

#101

#102

#103

#104

#105

#106

#108

#109

#11

#11

#110

#110

#111

#113

#114

#115

#116

#117

#119

#12

#121

#122

#123

#124

#125

#125

#126

#127

#128

#129

#13

#131

#133

#134

#134

#136

#137

#138

#139

#14

#140

#141

#142

#143

#143

#144

#144

#145

#146

#147

#148

#149

#15

#151

#151

#152

#153

#153

#154

#154

#156

#157

#158

#159

#16

#160

#161

#163

#164

#165

#166

#167

#168

#169

#17

#17

#170

#171

#172

#172

#174

#175

#176

#177

#177

#178

#179

#18

#18

#180

#181

#182

#182

#183

#185

#186

#187

#188

#189

#19

#190

#191

#191

#195

#196

#197

#198

#199

#199

#200

#201

#202

#203

#205

#206

#208

#21

#210

#212

#213

#215

#217

#218

#219

#22

#220

#221

#223

#224

#226

#227

#228

#229

#23

#231

#232

#233

#235

#236

#237

#238

#239

#24

#240

#241

#242

#243

#244

#245

#246

#247

#248

#249

#25

#250

#251

#252

#253

#254

#255

#256

#257

#258

#259

#260

#261

#262

#263

#265

#266

#269

#27

#270

#271

#273

#274

#275

#278

#279

#28

#280

#281

#282

#283

#285

#286

#287

#289

#29

#290

#292

#294

#295

#297

#299

#301

#302

#303

#305

#306

#307

#309

#31

#311

#314

#315

#318

#319

#32

#32

#320

#321

#322

#323

#324

#325

#326

#327

#328

#329

#330

#331

#334

#334

#335

#336

#337

#339

#34

#341

#342

#343

#344

#345

#346

#347

#35

#350

#352

#354

#356

#357

#358

#36

#360

#361

#362

#363

#364

#365

#367

#367

#368

#368

#369

#369

#370

#38

#39

#41

#42

#43

#44

#45

#46

#47

#48

#49

#5

#50

#51

#52

#53

#55

#56

#57

#58

#60

#61

#63

#64

#65

#66

#67

#68

#69

#7

#70

#71

#72

#73

#74

#75

#77

#78

#79

#80

#81

#82

#83

#84

#86

#87

#88

#89

#9

#9

#91

#92

#93

#94

#95

#96

#98

#98

#99

5b935d5597 Merge pull request #80 from RichardLitt/feature/reset-single-file Kate Hudson 2015-09-03 15:56:49 -04:00
6f8ab94610 Merge pull request #81 from RichardLitt/feature/standardize-syntax Kate Hudson 2015-09-03 15:50:43 -04:00
21fca93ac2 Merge pull request #82 from RichardLitt/feature/add-gitup Kate Hudson 2015-09-03 15:39:05 -04:00
11cf3c92de Merge pull request #83 from RichardLitt/feature/github-workflow Richard Littauer 2015-08-25 14:53:15 -04:00
9029bda973 Merge pull request #84 from RichardLitt/feature/reflog Kate Hudson 2015-08-25 14:46:04 -04:00
927ca07ff8 Added a section about reflog, closes #2 Richard Littauer 2015-08-25 14:37:06 -04:00
50780dc043 Added GitHub as a workflow Richard Littauer 2015-08-25 14:27:12 -04:00
97cada4381 Added GitUp into resources Richard Littauer 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. Richard Littauer 2015-08-19 13:48:26 -04:00
eb73619120 Added explanation for reseting a single file Richard Littauer 2015-08-18 16:03:44 -04:00
bad8c7f6b0 Merge pull request #78 from RichardLitt/feature/remove-cleanup Kate Hudson 2015-08-18 16:01:26 -04:00
a9cb62514a Merged two questions, as revert applies to both Richard Littauer 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 Richard Littauer 2015-08-18 15:53:51 -04:00
4622e309f1 Merge pull request #74 from RichardLitt/feature/capitalization Richard Littauer 2015-08-18 15:27:11 -04:00
4f9e6fff47 Merge pull request #75 from RichardLitt/feature/contribute Richard Littauer 2015-08-18 15:26:44 -04:00
ad0dd58329 Added a contribute file Richard Littauer 2015-08-18 11:24:27 -04:00
ca934fe3ff Added example for changing capitalization of a file Richard Littauer 2015-08-18 11:11:17 -04:00
e046ac055c Merge pull request #73 from RichardLitt/feature/add-partial-new-file Kate Hudson 2015-08-09 20:18:37 -04:00
a1adec8fe4 Add solution for interactively patching part of a new file Richard Littauer 2015-08-09 15:20:45 -04:00
aefbf8fa39 Merge pull request #71 from RichardLitt/feature/git-tips Richard Littauer 2015-07-16 14:16:36 -04:00
3260154b76 Added git tips Richard Littauer 2015-07-16 07:07:23 -04:00
1e74631336 Merge pull request #72 from appleboy/patch-1 Richard Littauer 2015-07-16 14:14:10 -04:00
8434388e49 Add GIT utilities Bo-Yi Wu 2015-07-16 20:05:27 +08:00
896d792a27 Merge pull request #70 from RichardLitt/feature/undo-reset-hard Richard Littauer 2015-07-05 11:29:52 -04:00
1bb6a708ec How to undo a hard reset Richard Littauer 2015-07-03 16:22:51 -04:00
cdef6a1274 Merged two answers Richard Littauer 2015-07-03 16:20:02 -04:00
875c49d0d1 Added good rebase and merge tutorial Richard Littauer 2015-06-30 13:29:52 -04:00
02e9ec921f Merge pull request #63 from RichardLitt/feature/merged-commits Richard Littauer 2015-06-01 09:48:25 +08:00
84d543db7d Added note about checking for merged branches Richard Littauer 2015-05-20 00:31:53 +07:00
a4af688a5c Merge pull request #69 from unixorn/master Richard Littauer 2015-05-26 08:21:39 +07:00
7792dac8f7 Doctoc update Joe Block 2015-05-24 22:35:52 -07:00
34a83f3efa Add GUI Clients section Joe Block 2015-05-24 22:35:34 -07:00
a02899c748 Add Tower client Joe Block 2015-05-24 22:26:56 -07:00
a3e2e70fa1 Fixed header Richard Littauer 2015-05-22 09:26:54 +07:00
78f470427c Merge pull request #68 from RichardLitt/master Richard Littauer 2015-05-22 09:16:59 +07:00
a5c51421c3 Merge branch 'feature/first-aid-git' Richard Littauer 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 Richard Littauer 2015-05-22 09:15:19 +07:00
b8bb75da0f Added firstaidgit.io Richard Littauer 2015-05-20 00:47:29 +07:00
a8e6825f90 Merge pull request #67 from unixorn/add-more-resources Richard Littauer 2015-05-22 09:11:05 +07:00
45c63ac9f4 Add book section Joe Block 2015-05-21 19:02:08 -07:00
ff99d75be1 Add git-cola Joe Block 2015-05-21 19:00:08 -07:00
44ebb19dbb Add gitx-dev link Joe Block 2015-05-21 18:58:21 -07:00
eaa3353fa2 Merge pull request #66 from unixorn/update-doctoc Richard Littauer 2015-05-20 08:42:59 +07:00
67ed4f0ea5 Forgot to run doctoc after adding 'Other Resources' section Joe Block 2015-05-19 10:52:39 -07:00
f9b72fe495 Added firstaidgit.io feature/first-aid-git Richard Littauer 2015-05-20 00:47:29 +07:00
efb1619f25 Merge pull request #64 from unixorn/master Richard Littauer 2015-05-20 00:45:32 +07:00
64182bca50 Add Other resources section Joe Block 2015-05-19 10:40:24 -07:00
a9b0361a88 Strip trailing spaces Joe Block 2015-05-19 10:40:03 -07:00
264d3dde33 Merge pull request #61 from RichardLitt/feature/deleted-fork Richard Littauer 2015-05-20 00:19:46 +07:00
1b4cad1552 Added a section about deleted PRs Richard Littauer 2015-05-19 14:23:25 +07:00
aeaa38e922 Merge pull request #60 from RichardLitt/feature/arialdomartini Richard Littauer 2015-05-19 14:15:27 +07:00
b0c20c4804 Added explanation of HEAD, kept past example Richard Littauer 2015-05-19 14:12:28 +07:00
6a23217314 Using git reset --hard HEAD^, as suggested by @konrado0905 Arialdo Martini 2015-05-19 14:09:55 +07:00
e4fe866e14 Merge pull request #56 from RichardLitt/force-push-rebase Richard Littauer 2015-05-16 01:37:47 +07:00
d673566e0d Rebasing and force pushing Richard Littauer 2015-05-04 10:42:00 +07:00
08bbf9a967 Merge pull request #58 from RichardLitt/master Richard Littauer 2015-05-15 13:21:03 +07:00
a32ec5590e Merge branch 'stuartpb-patch-2' Richard Littauer 2015-05-15 13:20:02 +07:00
1a993cec3e Added text, moved to appropriate section Richard Littauer 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 Richard Littauer 2015-05-15 13:14:04 +07:00
8c4e12be63 Merge pull request #57 from RichardLitt/feature/commits-to-old-branch Richard Littauer 2015-05-14 05:31:22 +07:00
9f1fbc5861 Added two sections for moving unstaged edits Richard Littauer 2015-05-11 14:00:10 +07:00
0f7027159a Merge pull request #55 from RichardLitt/master Richard Littauer 2015-04-26 18:19:47 +08:00
8c5b442718 Merge branch 'stuartpb-patch-1' Richard Littauer 2015-04-26 18:19:00 +08:00
bec92700e4 Merge Richard Littauer 2015-04-26 18:18:50 +08:00
2ebceca748 Merge pull request #53 from unixorn/master Richard Littauer 2015-04-21 14:31:46 +07:00
ab17fbc6ab Minor typo fix, remove trailing spaces Joe Block 2015-04-20 23:39:46 -07:00
597bde6d7b Merge pull request #52 from RichardLitt/master Richard Littauer 2015-03-23 11:17:34 +08:00
caf8d3c8b4 Made a deleting category Richard Littauer 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 Richard Littauer 2015-03-23 11:13:54 +08:00
2bf72a4ec4 Merge pull request #51 from RichardLitt/master Richard Littauer 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 Richard Littauer 2015-03-21 10:13:04 +08:00
0fe348620e Merge pull request #50 from RichardLitt/master Richard Littauer 2015-03-20 20:42:15 +08:00
d718c438ee Removed second force-push section Richard Littauer 2015-03-20 20:36:52 +08:00
17dea4c558 Merge pull request #49 from RichardLitt/master Richard Littauer 2015-03-16 13:18:55 -07:00
974505558f Doctoc fixes. :| Richard Littauer 2015-03-16 13:18:19 -07:00
6f9d0f8797 Merge pull request #48 from RichardLitt/gitter-badger-gitter-badge Richard Littauer 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 Richard Littauer 2015-03-16 13:14:01 -07:00
a9bfc9f52a Merge pull request #47 from RichardLitt/master Richard Littauer 2015-03-16 13:10:29 -07:00
d5d405fbbf Merge branch 'camwes-patch-1' Richard Littauer 2015-03-16 13:09:56 -07:00
c108121f94 Doctoc Richard Littauer 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 Richard Littauer 2015-03-16 13:09:15 -07:00
88252b2d91 PR feedback Cameron Drake 2015-03-16 12:15:05 -07:00
b1016fbeb9 Merge pull request #46 from RichardLitt/master Richard Littauer 2015-03-16 10:21:17 -07:00
0ecf651254 Doctoc, closes #35 Richard Littauer 2015-03-16 10:20:18 -07:00
a52d5152d8 Merge branch 'joshdutcher-master' Richard Littauer 2015-03-16 10:20:05 -07:00
5b0a37cfdd Merge branch 'master' of https://github.com/joshdutcher/git-flight-rules into joshdutcher-master Richard Littauer 2015-03-16 10:19:49 -07:00
ea87639b03 added 'pulled from/into the wrong branch' Josh Dutcher 2014-11-12 14:33:03 -06:00
0e64bc4cb5 Merge pull request #45 from RichardLitt/master Richard Littauer 2015-03-16 09:33:56 -07:00
49c3e94217 Moved doctoc Richard Littauer 2015-03-16 09:33:13 -07:00
80854f6e60 Alignment Richard Littauer 2015-03-16 09:22:16 -07:00
50bf10c986 Merge pull request #44 from RichardLitt/master Richard Littauer 2015-03-16 09:21:27 -07:00
c8e0049af6 Moved header Richard Littauer 2015-03-16 09:20:51 -07:00
108aa058f0 Merge pull request #38 from RichardLitt/toc Richard Littauer 2015-03-16 09:19:25 -07:00
5b6dfb05c9 Added TOC using npm module doctoc Richard Littauer 2014-12-11 12:30:41 -08:00
92211c458f Added Gitter badge The Gitter Badger 2015-03-14 18:51:22 +00:00
19c8ad3ab9 Added then Richard Littauer 2015-03-14 11:06:23 -07:00
a2d407f12e Merge pull request #42 from RichardLitt/git-commit-wrong-branch-33 Richard Littauer 2015-03-14 10:26:29 -07:00
34e4f3e39b Added note about git push Richard Littauer 2015-03-14 10:25:34 -07:00
660a9b59ca Merge pull request #28 from unixorn/add-missing-anchor-tag Kate Hudson 2015-03-13 18:01:23 -04:00
7ad2b8db96 Merge remote-tracking branch 'upstream/master' into add-missing-anchor-tag Joe Block 2015-03-13 14:03:03 -07:00