開発ワークフロー#

機能ブランチ

git fetch upstream

# Update the mirror of trunk
git fetch upstream
# Make new feature branch starting at current trunk
git branch my-new-feature upstream/main
git checkout my-new-feature

git push origin my-new-feature

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

# hack hack
git add my_new_file
git commit -am 'NF - some message'
git push

# On branch ny-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 checkout main
# delete branch locally
git branch -D my-unwanted-branch
# delete branch on github
git push origin :my-unwanted-branch

git clone https://github.com/your-user-name/matplotlib.git

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

gitk --all

git log

      A---B---C cool-feature
     /
D---E---F---G trunk

              A'--B'--C' cool-feature
             /
D---E---F---G trunk

# Update the mirror of trunk
git fetch upstream
# go to the feature branch
git checkout cool-feature
# make a backup in case you mess up
git branch tmp cool-feature
# rebase cool-feature onto trunk
git rebase --onto upstream/main upstream/main cool-feature

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 cool-feature

8630830 [email protected]{0}: commit: BUG: io: close file handles immediately
278dd2a [email protected]{1}: rebase finished: refs/heads/my-feature-branch onto 11ee694744f2552d
26aa21a [email protected]{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 [email protected]{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 copule 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

開発ワークフロー#

ワークフローの概要#

メインブランチを削除することを検討してください#

トランクのミラーを更新します#

新しい機能ブランチを作成する#

編集ワークフロー#

概要#

より詳細に#

変更のレビューまたはマージを依頼する#

あなたがやりたいかもしれないいくつかの他のこと#

github でブランチを削除する#

リポジトリを探索する#

トランクのリベース#

混乱からの回復#

コミット履歴の書き換え#

開発ワークフロー#

ワークフローの概要#

メインブランチを削除することを検討してください#

トランクのミラーを更新します#

新しい機能ブランチを作成する#

編集ワークフロー#

概要#

より詳細に#

変更のレビューまたはマージを依頼する#

あなたがやりたいかもしれないいくつかの他のこと#

github でブランチを削除する#

単一のリポジトリを共有する複数の人々#

リポジトリを探索する#

トランクのリベース#

混乱からの回復#

コミット履歴の書き換え#