Subject: http://drupal.org/node/707484

Default git diff > name.patch won't work. The author supplies a .gitconfig file that enables the use of an alias (git df) that uses the right way to create a patch.

I'd like to suggest that the author elaborates on the settings in .gitconfig and makes the reader aware of the way git works, with and without this specific .gitconfig.

Comments

sillygwailo’s picture

I'd also suggest that we merge http://drupal.org/node/707484 and http://drupal.org/node/551858 or better organize the two so that the section looks something like this (comments in parentheses):

  • Using Git to maintain Drupal and contributed modules (an overview)
    • Setting up Git
    • Setting up your Drupal/module development environment
    • Forking and merging (if the module's heavy development happens with Git, for example)
    • Creating a patch in a Git environment (for use in the Drupal issue queue)
    • Git tips (this would be a good place for the .gitconfig file and explanation)

I'm not married to the structure, but I'd like to help out with writing and organizing for this section. My assumption is that since Drupal will move to Git soon, this will form the basis for a 'mainstream' document (that is, as not the "alternative" version control system).

arianek’s picture

richard - someone's already started a real git section (oh, the power of google...) http://drupal.org/handbook/git, which i imagine will be like the main CVS guide (based on the author having already aliased it). if you want to work on it i suggest you review what's the CVS section http://drupal.org/handbook/cvs/ and go from there. (you don't need permission to work on this, just go for it!)

sender - would be great if you can skim the http://drupal.org/handbook/git references too, and see if what's in your issue is in there somewhere, or if it needs to be added.

thanks!

arianek’s picture

Issue tags: +git, +Version Control

adding tags

jhodgdon’s picture

Issue tags: +developer

tagging

rfay’s picture

I really prefer for that page to use standard, unaltered git commands as well. I like to use the basics in teaching the basics.

In fact, I almost edited that stuff out of the page several months ago.

Let's go with standard git commands, no aliases.

eliza411’s picture

Issue tags: +git phase 2

adding tags

eliza411’s picture

Title: Update GIT workflow page with some more info on patching using GIT » Update Git workflow page with some more info on patching using Git
Status: Active » Fixed

Closing this. There are other issues regarding patching in the forefront right now, #1086116: 2 versions: simple and advanced for patch contributors

Status: Fixed » Closed (fixed)
Issue tags: -git, -Version Control, -developer, -git phase 2

Automatically closed -- issue fixed for 2 weeks with no activity.