Category Archives: Git

Perfect git-svn for WordPress plugin development

WordPress plugin developers need to use subversion to commit their plugins to the repository. And because many developers are using GitHub in their development, it is needed to interwork between Git and Subversion. Though there is a way to make a script program including both git and svn commands, git-svn is a option I like to use because of its simplicity. After using git-svn and making some commits in plugin development, I learned key points for a happy workflow. I’ll introduce them in this entry and hope it will help you. Even if you are not a WordPress plugin developer, it might help you when you use git-svn. This … Continue reading Perfect git-svn for WordPress plugin development

Assets directory with git-svn in WP plugin development

There are many articles which introduce workflows for git users in WordPress plugin development which requires subversion to publish into the official directory. Some articles demonstrate workflows using script programs to call svn commands for interworking between git and svn. But I like to use git commands alone for version control. And I can do plugin development with git-svn like this article or this. One remaining thing is the ‘assets’ directory, which we use for files not required in plugin packages. For example, the assets directory can contain images and banners displayed on the plugin directory pages in And because it is not under the standard directory structure of … Continue reading Assets directory with git-svn in WP plugin development

How to make git-diff ignore specific lines

Recently I use git for versioning Cisco router/switch configurations. One problem here is the ‘ntp clock-period’ line. Cisco equipments have a clock adjustment value for NTP in their configuration and its value changes without any manual configuration changes. So even though I have made no changes in their configuration, git-diff shows lines like following. -ntp clock-period 36027555 +ntp clock-period 36027579 Because it will be adjusted automatically, usually no need to save an updated value. So I want them disappear when I do git-diff. The git-diff has ‘-G’ option to show changes matched with regex. But it has no option to avoid matched lines. Generally in such a situation, we use … Continue reading How to make git-diff ignore specific lines