开发工作流程#

功能分支

git fetch upstream

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

# 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
CI: continuous integration
DEP: deprecate something, or remove a deprecated object
DEV: development tool or utility
DOC: documentation
ENH: enhancement
MAINT: maintenance commit (refactoring, typos, etc.)
MNT: alias for MAINT
NEP: NumPy enhancement proposals
REL: related to releasing numpy
REV: revert an earlier commit
STY: style fix (whitespace, PEP8)
TST: addition or modification of tests
TYP: static typing
WIP: work in progress, do not merge

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 main branch
git rebase upstream/main

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 main
# 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

git fetch upstream pull/$ID/head:$BRANCHNAME

git checkout $BRANCHNAME

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/main
# 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/main

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

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

git push upstream my-feature-branch:main

开发工作流程#

基本工作流程#

创建新的功能分支#

编辑工作流程#

概览#

更多细节#

编写提交消息#

跳过持续集成命令#

测试构建 wheels#

征求邮件列表的意见#

请求将您的更改合并到主仓库#

获取 PR 审查#

在 main 上进行变基#

从失误中恢复#

您可能想做的其他事情#

重写提交历史#

在 GitHub 上删除分支#

从现有拉取请求中检出更改#

探索您的仓库#

向后移植#

将更改推送到主仓库#

开发工作流程#

基本工作流程#

创建新的功能分支#

编辑工作流程#

概览#

更多细节#

编写提交消息#

跳过持续集成命令#

测试构建 wheels#

征求邮件列表的意见#

请求将您的更改合并到主仓库#

获取 PR 审查#

在 main 上进行变基#

从失误中恢复#

您可能想做的其他事情#

重写提交历史#

在 GitHub 上删除分支#

多人共享一个仓库#

从现有拉取请求中检出更改#

探索您的仓库#

向后移植#

将更改推送到主仓库#