mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-08-03 18:38:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'core/master' into schema-alteration

Browse source 
Conflicts:
	docs/ref/django-admin.txt
This commit is contained in:
Andrew Godwin 2013-08-19 18:30:48 +01:00
commit b6a957f0ba
167 changed files with 1861 additions and 1064 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/internals/contributing/writing-code/working-with-git.txt
View file

@ -157,7 +157,7 @@ using interactive rebase::
The HEAD~2 above is shorthand for two latest commits. The above command
will open an editor showing the two commits, prefixed with the word "pick".
Change the second line to "squash" instead. This will keep the
Change "pick" on the second line to "squash" instead. This will keep the
first commit, and squash the second commit into the first one. Save and quit
the editor. A second editor window should open, so you can reword the
commit message for the commit now that it includes both your steps.