Процесс разработки

ветвь разработки

git fetch upstream

git checkout -b my-new-feature upstream/master

# hack hack
git status # Optional
git diff # Optional
git add modified_file
git commit
# push the branch to your own Github repo
git push origin my-new-feature

# On branch my-new-feature
# Changed but not updated:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#  modified:   README
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#  INSTALL
no changes added to commit (use "git add" and/or "git commit -a")

git push origin my-new-feature

git push --set-upstream origin my-new-feature

git push

ENH: add functionality X to numpy.<submodule>.

The first line of the commit message starts with a capitalized acronym
(options listed below) indicating what type of commit this is.  Then a blank
line, then more text if needed.  Lines shouldn't be longer than 72
characters.  If the commit is related to a ticket, indicate that with
"See #3456", "See ticket 3456", "Closes #3456" or similar.

API: an (incompatible) API change
BENCH: changes to the benchmark suite
BLD: change related to building numpy
BUG: bug fix
DEP: deprecate something, or remove a deprecated object
DEV: development tool or utility
DOC: documentation
ENH: enhancement
MAINT: maintenance commit (refactoring, typos, etc.)
REV: revert an earlier commit
STY: style fix (whitespace, PEP8)
TST: addition or modification of tests
REL: related to releasing numpy

git fetch upstream

# go to the feature branch
git checkout my-new-feature
# make a backup in case you mess up
git branch tmp my-new-feature
# rebase on upstream master branch
git rebase upstream/master

git branch -D tmp

git rebase --abort

# reset branch back to the saved point
git reset --hard tmp

# look at the reflog of the branch
git reflog show my-feature-branch

8630830 my-feature-branch@{0}: commit: BUG: io: close file handles immediately
278dd2a my-feature-branch@{1}: rebase finished: refs/heads/my-feature-branch onto 11ee694744f2552d
26aa21a my-feature-branch@{2}: commit: BUG: lib: make seek_gzip_factory not leak gzip obj
...

# reset the branch to where it was before the botched rebase
git reset --hard my-feature-branch@{2}

git log --oneline
eadc391 Fix some remaining bugs
a815645 Modify it so that it works
2dec1ac Fix a few bugs + disable
13d7934 First implementation
6ad92e5 * masked is now an instance of a new object, MaskedConstant
29001ed Add pre-nep for a couple of structured_array_extensions.
...

# make a backup of the current state
git branch tmp HEAD
# interactive rebase
git rebase -i 6ad92e5

pick 13d7934 First implementation
pick 2dec1ac Fix a few bugs + disable
pick a815645 Modify it so that it works
pick eadc391 Fix some remaining bugs

# Rebase 6ad92e5..eadc391 onto 6ad92e5
#
# Commands:
#  p, pick = use commit
#  r, reword = use commit, but edit the commit message
#  e, edit = use commit, but stop for amending
#  s, squash = use commit, but meld into previous commit
#  f, fixup = like "squash", but discard this commit's log message
#
# If you remove a line here THAT COMMIT WILL BE LOST.
# However, if you remove everything, the rebase will be aborted.
#

r 13d7934 First implementation
pick 2dec1ac Fix a few bugs + disable
f a815645 Modify it so that it works
f eadc391 Fix some remaining bugs

[detached HEAD 721fc64] FOO: First implementation
 2 files changed, 199 insertions(+), 66 deletions(-)
[detached HEAD 0f22701] Fix a few bugs + disable
 1 files changed, 79 insertions(+), 61 deletions(-)
Successfully rebased and updated refs/heads/my-feature-branch.

0f22701 Fix a few bugs + disable
721fc64 ENH: Sophisticated feature
6ad92e5 * masked is now an instance of a new object, MaskedConstant

git checkout master
# delete branch locally
git branch -D my-unwanted-branch
# delete branch on github
git push origin --delete my-unwanted-branch

git clone git@github.com:your-user-name/numpy.git

git commit -am 'ENH - much better code'
git push origin my-feature-branch # pushes directly into your repo

gitk --all

git log

# Make a new branch based on numpy/maintenance/1.8.x,
# backport-3324 is our new name for the branch.
git checkout -b backport-3324 upstream/maintenance/1.8.x

# Update remote
git fetch upstream
# Check the commit log for commits to cherry pick
git log upstream/master
# This pull request included commits aa7a047 to c098283 (inclusive)
# so you use the .. syntax (for a range of commits), the ^ makes the
# range inclusive.
git cherry-pick aa7a047^..c098283
...
# Fix any conflicts, then if needed:
git cherry-pick --continue

git push -u origin backport-3324

git fetch upstream
git rebase upstream/master

git fetch upstream
git merge --no-ff upstream/master

git log -p upstream/master..
git log --oneline --graph

git push upstream my-feature-branch:master

Процесс разработки

Основной рабочий процесс

Создание новой ветви разработки

Процесс редактирования

Обзор

Подробности

Создание сообщения о коммите

Получите мнение списка рассылки

Запрос на слияние ваших изменений с основным репозиторием

Обзор вашего запроса на слияние

Перебазирование на master

Восстановление после ошибок

Дополнительные действия, которые могут потребоваться

Переписывание истории коммитов

Удаление ветки на github

Изучение вашего репозитория

Бэкпортирование

Отправка изменений в основной репозиторий

Процесс разработки

Основной рабочий процесс

Создание новой ветви разработки

Процесс редактирования

Обзор

Подробности

Создание сообщения о коммите

Получите мнение списка рассылки

Запрос на слияние ваших изменений с основным репозиторием

Обзор вашего запроса на слияние

Перебазирование на master

Восстановление после ошибок

Дополнительные действия, которые могут потребоваться

Переписывание истории коммитов

Удаление ветки на github

Несколько человек, работающих с одним репозиторием

Изучение вашего репозитория

Бэкпортирование

Отправка изменений в основной репозиторий