git-flight-rules

alvaro/git-flight-rules

Fork 0

mirror of https://github.com/k88hudson/git-flight-rules.git synced 2025-03-10 12:48: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

#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

5fc6b2289d Added command to abort the merge Juan Calvopina 2017-11-28 00:02:58 -03:00
f4c0fac6ef Add safety note for git reset --hard (#157) Tadeu Manoel 2017-11-27 18:44:52 -02:00
7440fa32b5 Discard local uncommitted changes (#156) Josh 2017-11-27 13:30:38 -05:00
02043187a7 Add githug (#152) Scott Dutton 2017-11-27 00:01:08 +00:00
7cdaca391f Added some common Git screwups and solutions (#148) Rijul1999 2017-11-27 05:30:03 +05:30
8426f177dd

Fix #149 @RichardLitt comment Emmanuel Arias 2017-11-23 21:41:39 -03:00
71f2ab2917

Merge pull request #149 from flexdinesh/master Emmanuel Arias 2017-11-23 12:05:22 -03:00
4bf16453c6 flight-rule to stash multiple files at once Dinesh 2017-11-23 01:11:14 +05:30
7412b89d42

Merge pull request #147 from benyanke/patch-1 Kate Hudson 2017-11-21 16:33:36 -05:00
11c11ecc21

Update README.md Ben Yanke 2017-11-21 13:23:03 -06:00
5088d30821 Add sample of -u option of git stash (#146) Toshiya Kawasaki 2017-11-22 03:13:31 +09:00
adb5a2d250 added command to create a branch from a commit (#145) Navneet Singh 2017-11-21 00:21:04 +05:30
4cb52c015c fix typo (#142) Nicolas Dermine 2017-11-19 18:56:54 +01:00
9dafe52a63 fix typo (#141) Nicolas Dermine 2017-11-19 18:56:42 +01:00
2e5498cd5c New Topic for 'Stashing' and curated frequent stash workflow (#140) Dineshkumar Pandiyan 2017-11-19 14:04:21 +05:30
5599a75b7f added another command to see staged diff (#139) Navneet Singh 2017-11-19 00:26:47 +05:30
b7d9be9af9 stash content with a custom message (#138) Navneet Singh 2017-11-18 20:33:11 +05:30
2637bf010f Add fork and gmaster (#137) Sergey 2017-11-16 23:34:47 +03:00
f506073152 change [aliases] to [alias] (#136) Greg Walden 2017-11-15 10:57:11 -05:00
e51ba1db7d fix formatting Richard Littauer 2017-11-15 09:08:38 -05:00
b838720631 Be more specific about HEAD^ vs HEAD~ (#122) Tatsujinichi 2017-11-15 23:08:04 +09:00
b244c00a4e Add Note About --ours and --theirs (#133) Kai Dalgleish 2017-11-14 11:36:22 -08:00
fc459528ea Revert a file to a specific revision (#131) Simon Vocella 2017-11-13 15:09:15 +01:00
a38b385b03 Merge branch 'toptal-more-specific-removal-of-a-file-from-commit' Richard Littauer 2017-11-12 10:31:53 -05:00
186ed0a1e4 docs: small grammar fix Richard Littauer 2017-11-12 10:31:50 -05:00
f60cd9d835 Change command to avoid editing commit message Filipp Pirozhkov 2017-11-10 19:20:46 +03:00
103e920531 Add fetching a GitHub PR ref directly (#129) Tom V 2017-11-12 13:10:33 +00:00
e2ddb7fe55 Added how to rename a local branch (#128) Gabriel Caruso 2017-11-11 12:11:26 -02:00
4547f3ea98 Add git extensions to GUI Clients Nick Kirby 2017-11-10 21:41:56 +00:00
17bf6d7cbd Add Magit (#126) Raimon Grau (rgrau) 2017-11-10 21:30:45 +00:00
76361c407f Fix minor typo (#124) Nick Kirby 2017-11-10 21:04:58 +00:00
545a53e808 Change the command to minimize side effects Filipp Pirozhkov 2017-11-10 19:18:27 +03:00
88e905a4c2 Add Chinese translation (#121) jparser 2017-11-09 07:18:10 -06:00
9f0a1d2ae3 Recommend --force-with-lease instead of --force (#117) Bence Dányi 2017-11-07 15:19:44 +01:00
4a654bd90a Add Tig to the list of clients (#116) Edgar Hipp 2017-11-07 13:58:24 +01:00
cf82e4d95e

Merge pull request #115 from k88hudson/license Richard Littauer 2017-11-06 21:07:24 -05:00
1e80224456

Merge pull request #114 from arnavb/update-text Kate Hudson 2017-11-06 20:16:13 -05:00
4bc70b6aab fix #112: Add cc-by-sa-4.0 license k88hudson 2017-11-06 20:11:46 -05:00
7f2a4bfd03

Minor text update Arnav Borborah 2017-11-06 20:09:42 -05:00
7ebe86b76e

Merge pull request #113 from Shayac/master Richard Littauer 2017-11-06 19:42:30 -05:00
1883097a8b add learngitbranching tutorial Shaya Cohen 2017-11-06 19:22:35 -05:00
bfb67fc369

Merge pull request #111 from Shayac/master Richard Littauer 2017-11-06 19:06:43 -05:00
20bb62b971

Add another git book Shaya Cohen 2017-11-06 18:25:54 -05:00
868005ed17

Merge pull request #109 from e-larrambebere/master Richard Littauer 2017-11-06 08:42:43 -05:00
688ab59c2c

Merge pull request #108 from thomasyimgit/checkout-remote-branch Richard Littauer 2017-11-06 08:42:19 -05:00
051e40b042 Fixes minor style issues Emilio Larrambebere 2017-11-06 09:10:21 +00:00
485bcf6691 add checkout to remote branch thomasyimgit 2017-11-05 20:31:09 -05:00
2a86ef478e Merge branch 'pr/106' Richard Littauer 2017-06-05 12:08:59 +01:00
51d78e43c5 Adding stashes back in Richard Littauer 2017-06-05 12:08:56 +01:00
998dd0c7fb Add git-town, alphabetize Richard Littauer 2017-05-24 14:50:55 +01:00
542884da13 Improve "discard specific unstaged changes" steps Peter Dave Hello 2017-04-09 16:20:44 +08:00
f3428ed7af Merge pull request #105 from Plsr/master Richard Littauer 2017-03-29 16:13:45 -04:00
5af92eed17 Use 'branch' instead of 'checkout -b' plsr 2017-03-29 11:55:42 +02:00
a5d7eea0d5 Merge pull request #104 from camilortte/patch-1 Richard Littauer 2017-01-16 14:40:08 -03:00
36c28e5ec2 Add Git Gui Cloent GitKraken Camilo Ramirez 2017-01-11 16:46:43 -05:00
1cb8a5798f Merge pull request #102 from gaetan-petit/patch-1 Richard Littauer 2017-01-09 21:10:44 +01:00
5bad85aeba Update README.md Gaëtan Petit 2017-01-08 00:32:15 +01:00
c89b20a3fe Merge pull request #101 from k88hudson/feat/staging-the-unstaged Richard Littauer 2017-01-06 23:49:40 +01:00
bad1b36f56 Merge pull request #103 from codeofcarson/master Richard Littauer 2016-12-29 15:39:13 -05:00
eb48bfc8ba add a new rule, how to discard specific unstaged changes Carson Wilcox 2016-12-28 16:51:49 -05:00
9478da7964 Update README.md Gaëtan Petit 2016-12-21 17:43:59 +01:00
2b34d20485 ADD undo rebase/merge Gaëtan Petit 2016-12-21 17:42:00 +01:00
57b67d4843 Added section on staging and unstaging feat/staging-the-unstaged Richard Littauer 2016-12-13 13:03:57 -05:00
25bb25a82f Merge pull request #99 from jwilk/spelling Richard Littauer 2016-11-13 20:30:03 +09:00
e1d3f10f38 Merge pull request #100 from jwilk/alias-amend Richard Littauer 2016-11-13 20:29:17 +09:00
c483f0dfda Fix the "amend" alias Jakub Wilk 2016-11-12 16:11:50 +01:00
4744ae8733 Fix typos Jakub Wilk 2016-11-12 16:10:29 +01:00
2fa0b60933 Moved note to section Richard Littauer 2016-08-01 21:20:33 -04:00
6d0c8e4910 Add rule about bringing changes from another ref-ish Alvaro Garcia 2016-07-26 15:50:41 +02:00
abaa08d04a Update ToC Richard Littauer 2016-08-01 21:08:05 -04:00
bc09d52f9c Merge pull request #93 from eush77/additions Richard Littauer 2016-02-22 10:13:47 -05:00
15fe42de67 add missing preposition Eugene Sharygin 2016-02-22 17:54:12 +03:00
d87d89abfb Merge pull request #94 from alvarogarcia7/patch-1 Richard Littauer 2016-02-15 12:56:47 -05:00
aef9e07efc Merge pull request #95 from alvarogarcia7/patch-2 Richard Littauer 2016-02-15 12:55:57 -05:00
f47b2e66f5 Merge pull request #96 from alvarogarcia7/patch-3 Richard Littauer 2016-02-15 12:55:42 -05:00
f852094458 for privacy, hide emails Alvaro Garcia 2016-02-15 00:45:06 +01:00
8ebbb29f48 prefer using official (bogus) domain name Alvaro Garcia 2016-02-15 00:43:35 +01:00
35715611d4 add another way of seeing the last committed diff Alvaro Garcia 2016-02-15 00:38:20 +01:00
7c76618f2e add some simpler ways to do the same things and a bit more info Eugene Sharygin 2016-02-13 01:13:21 +03:00
a289c22e73 Merge pull request #92 from adjavaherian/master Richard Littauer 2015-12-17 18:49:13 -05:00
efafa0dec3 Merge pull request #1 from adjavaherian/adjavaherian-credential-helper Amir Djavaherian 2015-12-17 12:53:22 -08:00
70077dbe9f Adding a rule for caching username and password Amir Djavaherian 2015-12-17 12:52:19 -08:00
8e4d72dbc8 Added git fire Richard Littauer 2015-10-05 10:40:27 -04:00
9740678d01 Merge branch 'magalhini-recover-deleted-tag' Richard Littauer 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 Ricardo Magalhães 2015-10-02 08:53:40 -04:00
a98fcf9f13 Merge pull request #91 from orthographic-pedant/spell_check/accidentally Richard Littauer 2015-09-30 13:26:26 -04:00
792e0deb23 Fixed typographical error, changed accidentaly to accidentally in README. orthographic-pedant 2015-09-30 13:11:12 -04:00
7bce1f9570 Merge pull request #88 from RichardLitt/feature/62-restructure-doc Richard Littauer 2015-09-27 08:46:46 -07:00
01eddd2ca7 Restructured document, closes #62 Richard Littauer 2015-09-24 11:13:56 -04:00
0bd7dbd106 Consistent naming of tags. Ricardo Magalhães 2015-09-27 17:35:43 +02:00
6fa3e0c7d9 Add instructions to recover a deleted tag. Ricardo Magalhães 2015-09-27 17:28:04 +02:00
08ac820a33 Merge pull request #87 from RichardLitt/feature/remove-files-from-commit Richard Littauer 2015-09-23 11:43:02 -04:00
1edbba171b Added workflow for removing file from commit Richard Littauer 2015-09-23 11:26:28 -04:00
3c736dfa26 Merge pull request #86 from appleboy/patch-1 Richard Littauer 2015-09-03 22:59:08 -04:00
cb168abd45 update comment. Bo-Yi Wu 2015-09-04 10:32:37 +08:00
184bcc1ddf Add another way to change commit message. Bo-Yi Wu 2015-09-04 08:55:25 +08:00
d417eedd3b Merge pull request #77 from RichardLitt/feature/edit-amend Kate Hudson 2015-09-03 16:07:37 -04:00
65e60c8e89 Merge pull request #79 from RichardLitt/feature/delete-branch Kate Hudson 2015-09-03 16:05:04 -04:00
1798a7d4c0 Added explanation for deleting a branch Richard Littauer 2015-08-18 16:00:45 -04:00
5b935d5597 Merge pull request #80 from RichardLitt/feature/reset-single-file Kate Hudson 2015-09-03 15:56:49 -04:00