Windows – Alex Arriaga

alex-arriaga April 19, 2016

My personal .gitignore file

Enterprise Development, Git, GNU/Linux, Mac OSX, Operating Systems, Web Development, Windows No Reply

Lesson learned

After doing this file many times, I decided to build my personal .gitignore file; I use to add it in my very fist commit as a good practice in every single git repository I create.

Currently we are ignoring:

Operating systems’ temporary files: Mac OS X, GNU/Linux, Windows.
IDEs and editors’ configuration: Vim, Sublime Text, Notepad++, Eclipse, Netbeans, Xcode, IntelliJIDEA.
Other Control Version Systems: CVS, SVN

More information about ignoring files: https://help.github.com/articles/ignoring-files

Note: if you want to create your own configuration in your .gitignore you could use: http://www.gitignore.io/

How to integrate this file into my project

Download or copy following file/content in the root directory of your project with the name .gitignore (gitignore.txt)
If you download gitignore.txt file, please rename it to .gitignore
Common issue: “OS X doesn’t let me to rename my gitignore.txt to .gitignore”:

“You can’t use a name that begins with a dot “.”, because these names are reserved for the system. Please choose another name”.

A workaround for this is to:
1. Open the terminal
2. cd to the directory with gitignore.txt and run the following command
3. mv gitignore.txt .gitignore
Add .gitignore file to your repository (git add)
Commit (git commit)
Upload your commit to remote server (git push)

REMEMBER!

Once Git starts to watch/track any file, for example hello.txt in the repository, it is NOT possible to say “Hey git! now, ignore my file hello.txt“. Unless you read this post: How to force Git to “ignore” tracked files.

# Read about how to use .gitignore: https://help.github.com/articles/ignoring-files
# Improved by Alex Arriaga (@alex_arriaga_m) - http://www.alex-arriaga.com
 
# Include your project-specific ignores in this section
# ----- Project ignores
 

bower_components
node_modules
.idea

 
 
# ----- Operating Systems
# OS X
# https://github.com/github/gitignore/blob/master/Global/OSX.gitignore
.DS_Store
.AppleDouble
.LSOverride
# Icon must ends with two \r.
Icon
 
# Thumbnails
._*
# Files that might appear on external disk
.Spotlight-V100
.Trashes
 
 
# GNU/Linux
# https://github.com/github/gitignore/blob/master/Global/Linux.gitignore
*~
!.gitignore
#*~
 
# KDE directory preferences
.directory
 
 
# Windows
# https://github.com/github/gitignore/blob/master/Global/Windows.gitignore
# Windows image file caches
Thumbs.db
ehthumbs.db
 
# Folder config file
Desktop.ini
 
# Recycle Bin used on file shares
$RECYCLE.BIN/
 
# Windows Installer files
*.cab
*.msi
*.msm
*.msp
 
 
 
#  ----- Other Control Version Systems
# SVN
# https://github.com/github/gitignore/blob/master/Global/SVN.gitignore
.svn/
 
# CVS
# https://github.com/github/gitignore/blob/master/Global/CVS.gitignore
/CVS/*
*/CVS/*
.cvsignore
*/.cvsignore
 
 
 
 
#  ----- IDEs and editors
# VIM
# https://github.com/github/gitignore/blob/master/Global/vim.gitignore
[._]*.s[a-w][a-z]
[._]s[a-w][a-z]
*.un~
Session.vim
.netrwhist
# *~
 
 
# Sublime Text
# https://github.com/github/gitignore/blob/master/Global/SublimeText.gitignore
# workspace files are user-specific
*.sublime-workspace
 
# project files should be checked into the repository, unless a significant
# proportion of contributors will probably not be using SublimeText
# *.sublime-project
 
 
# Notepad++
# https://github.com/github/gitignore/blob/master/Global/NotepadPP.gitignore
# Notepad++ backups #
*.bak
 
 
# Eclipse
# https://github.com/github/gitignore/blob/master/Global/Eclipse.gitignore
*.pydevproject
.metadata
.gradle
bin/
tmp/
*.tmp
#*.bak
*.swp
*~.nib
local.properties
.settings/
.loadpath
 
# External tool builders
.externalToolBuilders/
 
# Locally stored "Eclipse launch configurations"
*.launch
 
# CDT-specific
.cproject
 
# PDT-specific
.buildpath
 
# sbteclipse plugin 
.target
 
# TeXlipse plugin
.texlipse
 
 
# Netbeans
# https://github.com/github/gitignore/blob/master/Global/NetBeans.gitignore
nbproject/private/
build/
nbbuild/
dist/
nbdist/
nbactions.xml
nb-configuration.xml
 
 
# Xcode
# https://github.com/github/gitignore/blob/master/Global/Xcode.gitignore
# build/
*.pbxuser
!default.pbxuser
*.mode1v3
!default.mode1v3
*.mode2v3
!default.mode2v3
*.perspectivev3
!default.perspectivev3
xcuserdata
*.xccheckout
profile
*.moved-aside
DerivedData
*.hmap
*.ipa

# IDEA
.idea

100

101

102

103

104

105

106

107

108

109

110

111

112

113

114

115

116

117

118

119

120

121

122

123

124

125

126

127

128

129

130

131

132

133

134

135

136

137

138

139

140

141

142

143

144

145

146

147

148

149

150

151

152

153

154

155

156

157

158

159

160

161

162

163

164

165

166

167

# Read about how to use .gitignore: https://help.github.com/articles/ignoring-files

# Improved by Alex Arriaga (@alex_arriaga_m) - http://www.alex-arriaga.com

# Include your project-specific ignores in this section

# ----- Project ignores

bower_components

node_modules

.idea

# ----- Operating Systems

# OS X

# https://github.com/github/gitignore/blob/master/Global/OSX.gitignore

.DS_Store

.AppleDouble

.LSOverride

# Icon must ends with two \r.

Icon

# Thumbnails

._*

# Files that might appear on external disk

.Spotlight-V100

.Trashes

# GNU/Linux

# https://github.com/github/gitignore/blob/master/Global/Linux.gitignore

!.gitignore

#*~

# KDE directory preferences

.directory

# Windows

# https://github.com/github/gitignore/blob/master/Global/Windows.gitignore

# Windows image file caches

Thumbs.db

ehthumbs.db

# Folder config file

Desktop.ini

# Recycle Bin used on file shares

$RECYCLE.BIN/

# Windows Installer files

*.cab

*.msi

*.msm

*.msp

# ----- Other Control Version Systems

# SVN

# https://github.com/github/gitignore/blob/master/Global/SVN.gitignore

.svn/

# CVS

# https://github.com/github/gitignore/blob/master/Global/CVS.gitignore

/CVS/*

*/CVS/*

.cvsignore

*/.cvsignore

# ----- IDEs and editors

# VIM

# https://github.com/github/gitignore/blob/master/Global/vim.gitignore

[._]*.s[a-w][a-z]

[._]s[a-w][a-z]

*.un~

Session.vim

.netrwhist

# *~

# Sublime Text

# https://github.com/github/gitignore/blob/master/Global/SublimeText.gitignore

# workspace files are user-specific

*.sublime-workspace

# project files should be checked into the repository, unless a significant

# proportion of contributors will probably not be using SublimeText

# *.sublime-project

# Notepad++

# https://github.com/github/gitignore/blob/master/Global/NotepadPP.gitignore

# Notepad++ backups #

*.bak

# Eclipse

# https://github.com/github/gitignore/blob/master/Global/Eclipse.gitignore

*.pydevproject

.metadata

.gradle

bin/

tmp/

*.tmp

#*.bak

*.swp

*~.nib

local.properties

.settings/

.loadpath

# External tool builders

.externalToolBuilders/

# Locally stored "Eclipse launch configurations"

*.launch

# CDT-specific

.cproject

# PDT-specific

.buildpath

# sbteclipse plugin

.target

# TeXlipse plugin

.texlipse

# Netbeans

# https://github.com/github/gitignore/blob/master/Global/NetBeans.gitignore

nbproject/private/

build/

nbbuild/

dist/

nbdist/

nbactions.xml

nb-configuration.xml

# Xcode

# https://github.com/github/gitignore/blob/master/Global/Xcode.gitignore

# build/

*.pbxuser

!default.pbxuser

*.mode1v3

!default.mode1v3

*.mode2v3

!default.mode2v3

*.perspectivev3

!default.perspectivev3

xcuserdata

*.xccheckout

profile

*.moved-aside

DerivedData

*.hmap

*.ipa

# IDEA

.idea

Hope you find this .gitignore useful, see you next time!

alex-arriaga April 10, 2015

Solving Drupal error: PDOException: SQLSTATE[HY000]: General error: 2006 MySQL server has gone away

Databases, Drupal, GNU/Linux, Mac OSX, MySQL, Operating Systems, PHP, Web Development, Windows No Reply

The problem

After downloading a Drupal project I am working on, and importing its database I got this kind of message related with a PDO Exception:

Additional uncaught exception thrown while handling exception.

PDOException: SQLSTATE[HY000]: General error: 2006 MySQL server has gone away: SELECT s.lid, t.translation, s.version FROM {locales_source} s LEFT JOIN {locales_target} t ON s.lid = t.lid AND t.language = :language WHERE s.source = :source AND s.context = :context AND s.textgroup = 'default'; Array ( [:language] => es [:source] => Configure how content input by users is filtered, including allowed HTML tags. Also allows enabling of module-provided filters. [:context] => ) in locale() (line 720 of /Applications/AMPPS/www/sites/drupal/modules/locale/locale.module).

Solution

This is an issue related with the MySQL configuration, for solving it,

1) Go to your MySQL configuration file: my.cnf. In my case that file is in /Applications/AMPPS/conf (I use AMPPS on OS X Yosemite).

2) Look for max_allowed_packet parameter and increase it as in this example (you will usually find this parameter twice in my.cnf file).

// My default value
max_allowed_packet = 1M

// The new value
max_allowed_packet = 256M

// My default value

max_allowed_packet = 1M

// The new value

max_allowed_packet = 256M

3) Restart your MySQL server.

I hope you find this post useful, see you next time!

alex-arriaga April 10, 2015

SOLVED: Git remote ref does not exist when trying to delete branches

Git, GNU/Linux, Mac OSX, Operating Systems, Web Development, Windows 1 Reply

The problem

Today, I was updating an old git repository but when I tried to delete some branches in my local environment and in the remote, I received this kind

“remote ref does not exist”

And that is because some remote branches didn’t exist anymore.

Solution

In order to update the references in our local machine we can use the git fetch command in this format:

git fetch -p MY_REMOTE

// Example
git fetch -p origin

git fetch -p MY_REMOTE

// Example

git fetch -p origin

From Stack Overflow:

“The -p option tells fetch to delete any tracking branches that no longer exist in the corresponding remotes; by default they are kept around”.

That’s it for today enjoy your work!

alex-arriaga July 6, 2014

Some useful Git commands

GNU/Linux, Mac OSX, Operating Systems, Windows 1 Reply

Hi friends,

Today I would like to share you a list of Git commands that I consider really useful when we work with this great version control system. Enjoy it!

Configuring your Git

// Disable autocrlf to avoid warnings in command line
git config --global core.autocrlf false

1 2	// Disable autocrlf to avoid warnings in command line git config --global core.autocrlf false

// Set username and email (global)
git config --global user.name “My user name” 
git config --global user.email “my-email@awesome.com” 

// Display configuration
git config -l 

// Get some help :)
git contig -h

// Set username and email (global)

git config --global user.name “My user name”

git config --global user.email “my-email@awesome.com”

// Display configuration

git config -l

// Get some help :)

git contig -h

Managing Git repositories

Initializing a repo

git init

git init

Adding files for tracking or to the staging area

// Add all .txt files
git add *.txt

// Add all in the current directory
git add .

// Add a single file
git add README.md

// Add all .txt files

git add *.txt

// Add all in the current directory

git add .

// Add a single file

git add README.md

Resetting your files in the staging area to the working directory

git reset HEAD <file>
git reset HEAD -- <path/to/file>

// Examples
git reset HEAD index.html
git reset HEAD .

git reset HEAD <file>

git reset HEAD -- <path/to/file>

// Examples

git reset HEAD index.html

git reset HEAD .

Doing your changes persistent in the local repository

// Do a commit with all files in staging area
git commit -m "My custom message for this commit"

1 2	// Do a commit with all files in staging area git commit -m "My custom message for this commit"

Watching previos version of files

// Watch a version of a very specific file (using the commit ID)
git checkout YOUR_COMMIT_ID -- path/my_file.js

// Return to the version of that file in HEAD
git checkout HEAD -- path/my_file.js

// Watch a version of a very specific file (using the commit ID)

git checkout YOUR_COMMIT_ID -- path/my_file.js

// Return to the version of that file in HEAD

git checkout HEAD -- path/my_file.js

Watching logs

// Watch the log (details)
git log 

// Watch the log in one line per commit
git log --oneline 

// See two last commits
git log --oneline -2

// Show diff between files
git show

// Watch the log (details)

git log

// Watch the log in one line per commit

git log --oneline

// See two last commits

git log --oneline -2

// Show diff between files

git show

Merging a branch (my-branch) into other (master)

// Where do you want to merge?
git checkout master

// Which branch do you want to merge?
git merge my-branch

// Where do you want to merge?

git checkout master

// Which branch do you want to merge?

git merge my-branch

Restoring files

See the stored version of an specific file in a commit:

git checkout COMMIT_ID "path/to/the/file"

// Example
git checkout 6881326  "widgets/Awesome Widget/MyAwesomeWidget.dust.tpl.htm"

git checkout COMMIT_ID "path/to/the/file"

// Example

git checkout 6881326 "widgets/Awesome Widget/MyAwesomeWidget.dust.tpl.htm"

Working with branches

Creating, deleting and switching to a branch

// Get a list of branches in the repository
git branch

// Create a new branch
git branch my-branch

// Switch to a branch
git checkout my-branch

// A shorthand for two previous commands (create and switch)
git checkout -b other-branch 

// Delete a branch
git branch -d my-branch

// Get a list of branches in the repository

git branch

// Create a new branch

git branch my-branch

// Switch to a branch

git checkout my-branch

// A shorthand for two previous commands (create and switch)

git checkout -b other-branch

// Delete a branch

git branch -d my-branch

Working with submodules

A very nice feature available on git is the possibility of using modules, for example when you clone CakePHP repository you could get DebugKit as a submodule, if you want to clone the main repository + submodules, use following command:

git clone --recursive https://github.com/alex-arriaga/universidad-del-pastel.git

1	git clone --recursive https://github.com/alex-arriaga/universidad-del-pastel.git

Adding a new submodule

git submodule add <GIT_REPO_URL> <SUBMODULE_NAME>
 
// Example
git submodule add https://github.com/twbs/bootstrap.git bootstrap

git submodule add <GIT_REPO_URL> <SUBMODULE_NAME>

// Example

git submodule add https://github.com/twbs/bootstrap.git bootstrap

If someone else added a new submodule, and you want to get submodules, you will need to use the update operation to obtain the module recently added:

git submodule update --init --recursive

1	git submodule update --init --recursive

Changing a submodule for another one

Update .gitmodules with the path to the new repository
Remove the corresponding line from the “.git/config” file
Delete the corresponding directory in the “.git/modules/modules/YOUR_OLD_SUBMODULE” directory (rm -rf)
Delete the checked out submodule directory itself (unsure if this is necessary)
Run:

git submodule init and git submodule update

1	git submodule init and git submodule update

Make sure the checked out submodule is at the correct commit, and commit that, since it’s likely that the hash will be different

Working with remotes

Forcing a push in origin (remote) to a previous version as in our local repository

// Suppose you want to return to a previous version
// in your local repository
git reset --hard YOUR_COMMIT_ID

// Then, probably you will need to force the remote to stay 
// in the same as your local repository
git push origin master --force

// Or
git push origin master -f

// Suppose you want to return to a previous version

// in your local repository

git reset --hard YOUR_COMMIT_ID

// Then, probably you will need to force the remote to stay

// in the same as your local repository

git push origin master --force

// Or

git push origin master -f

Sometimes if the remote server doesn’t have well-configured SSL certificates, you could get an error. If you want to disable SSL verification which I don’t recommend, use next command:

// Disable the SSL CERT verify globally
git config --global http.sslVerify false

// Disable the SSL CERT verify only in current repository
git config http.sslVerify false

// Disable the SSL CERT verify globally

git config --global http.sslVerify false

// Disable the SSL CERT verify only in current repository

git config http.sslVerify false

Changing the URL of a remote:

git remote set-url <REPOSITORY_NAME> <NEW_URL>

// Example
git remote set-url origin git://new.url.here

git remote set-url <REPOSITORY_NAME> <NEW_URL>

// Example

git remote set-url origin git://new.url.here

Deleting remote branches

// List all the branches (local and remote)
git branch -a

// Delete a branch
git push origin --delete MY_BRANCH

// List all the branches (local and remote)

git branch -a

// Delete a branch

git push origin --delete MY_BRANCH

What would you like to know about?

Alex Arriaga

Category Archives:
Windows

My personal .gitignore file

Lesson learned

How to integrate this file into my project

Solving Drupal error: PDOException: SQLSTATE[HY000]: General error: 2006 MySQL server has gone away

The problem

Solution

SOLVED: Git remote ref does not exist when trying to delete branches

The problem

Solution

Some useful Git commands

Configuring your Git

Managing Git repositories

Restoring files

Working with branches

Working with submodules

Working with remotes

Join me, have fun and learn!

Recent Posts

Recent Comments

Join me, have fun and learn!

Recent Posts

Day quote…

Recent Comments

Categories

Archives

Join me, have fun and learn!

Recent Posts

Archives

Recent Comments

Categories

What would you like to know about?

Category Archives:Windows

Lesson learned

How to integrate this file into my project

The problem

Solution

The problem

Solution

Configuring your Git

Managing Git repositories

Restoring files

Working with branches

Working with submodules

Working with remotes

Join me, have fun and learn!

Tag Cloud

Recent Posts

Recent Comments

Join me, have fun and learn!

Recent Posts

Day quote…

Recent Comments

Categories

Tag Cloud

Archives

Join me, have fun and learn!

Recent Posts

Archives

Tag Cloud

Recent Comments

Categories

Category Archives:
Windows