Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
P
pytensor
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
testgroup
pytensor
Commits
6882c961
提交
6882c961
authored
9月 06, 2011
作者:
Frederic
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Added doc on how to checkout another user branch.
上级
e3524afc
隐藏空白字符变更
内嵌
并排
正在显示
1 个修改的文件
包含
15 行增加
和
8 行删除
+15
-8
dev_start_guide.txt
doc/internal/dev_start_guide.txt
+15
-8
没有找到文件。
doc/internal/dev_start_guide.txt
浏览文件 @
6882c961
...
@@ -87,7 +87,15 @@ You can keep you local repo up to date with central/master with those commands:
...
@@ -87,7 +87,15 @@ You can keep you local repo up to date with central/master with those commands:
git fetch central
git fetch central
git merge central/master
git merge central/master
<<<<<<< HEAD
If you want to fix a commit done in a pull request(i.e. fix small
typo) to keep the history clean, you can do it like this:
.. code-block:: bash
git checkout branch
git commit --amend
git push -u origin my_shiny_feature:my_shiny_feature
Cleaning up history
Cleaning up history
-------------------
-------------------
...
@@ -101,17 +109,16 @@ this. In summary:
...
@@ -101,17 +109,16 @@ this. In summary:
because intermediate commits can break blame (the bisecting tool).
because intermediate commits can break blame (the bisecting tool).
* `git merge --squash` will put all of the commits from your feature branch into one commit.
* `git merge --squash` will put all of the commits from your feature branch into one commit.
* There are other tools that are useful if your branch is too big for one squash.
* There are other tools that are useful if your branch is too big for one squash.
=======
If you want to fix a commit done in a pull request(i.e. fix small
typo) to keep the history clean, you can do it like this
:
To checkout another user branch in his repo
:
.. code-block:: bash
.. code-block:: bash
git checkout branch
git remote add REPO_NAME HIS_REPO_PATH
git commit --amend
git checkout -b LOCAL_BRANCH_NAME REPO_NAME/REMOVE_BRANCH_NAME
git push -u origin my_shiny_feature:my_shiny_feature
You can find mo
r
e information and tips in the `numpy development
You can find mo
v
e information and tips in the `numpy development
<http://docs.scipy.org/doc/numpy/dev/gitwash/development_workflow.html>`_
<http://docs.scipy.org/doc/numpy/dev/gitwash/development_workflow.html>`_
page.
page.
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论