Wireshark 用户手册Updated 3 years ago
Subscribe Please log in to preview this contentYou can still access this book's content using the Read button.该项目未开启捐赠功能，可发送私信通知作者开启
与超过 300 万 开发者一起发现、参与优秀开源项目，私有仓库也完全免费 ：）
已有帐号？
由于 Git 不支持空文件夾，创建文件夹后会生成空的 .keep 文件
Loading...

thinkjs-admin
后台thinkjs，前台基于vue+vueRouter+vuex+elementUI，一个后台管理系统,登录状态设计基于token refresh_token 已完成，权限管理正在开发

启动命令
npm install
npm start

cd webpack
npm install
npm run build


帐号密码
admin
123456
#x-admin
正在加载...git 有两个分支 a、a-&b， a 有更新以后用什么语句更新到 b？ - V2EX
V2EX = way to explore
V2EX 是一个关于分享和探索的地方
已注册用户请 &
git 有两个分支 a、a-&b， a 有更新以后用什么语句更新到 b？
11:28:50 +08:00 · 3419 次点击
a ：当前线上版本，需要不断修复 bug
b ：来源于 a ，在 b 上面开发新模块
两个分支都要保留，不能删除。
在 a 上面更新代码以后，怎么也更新到 b ？
27 回复 &| &直到
23:18:30 +08:00
& & 11:32:20 +08:00
git checkout a & git pull & git checkout b & git rebase a
& & 11:33:58 +08:00
线上分支不应该直接在上面更新代码吧
& & 11:40:09 +08:00
看看 git flow 流程， A 分支有 bug 应该新开一个 /hotfix 分支，修改上线后合并到 B 的 feature 分支
& & 11:43:29 +08:00
@ 你是不是看错需求了？@ 啥意思？
& & 11:45:08 +08:00 via Android
@ 我觉得我写的满足了你的需求。
& & 11:45:26 +08:00
似乎只能使用 rebase 了
& & 11:48:25 +08:00
merge/rebase 有问题吗？ 一楼的说的应该没问题吧
& & 11:50:21 +08:00
切到 b 然后 rebase a
& & 11:52:53 +08:00
这种开发模式是非常典型可以用 Git 最佳实践的。请参考：
& & 11:55:39 +08:00
一楼可行，不想切分支的话可以这么搞，效果相同： 在 b 上 git pull --rebase origin a
& & 11:59:14 +08:00
一种做法是走 rebasegit checkout bgit rebase a我觉得更好的做法是每一个 BUG 都从 a 拉出一个分支，这个分支开发完后同时 merge 到 a 和 b
& & 12:09:55 +08:00
@ @ @ 先谢谢回复rebase 或 merge 会删除分支吗？
我的需求是 a 、 b 分支都不能消失
& & 12:12:32 +08:00
cherry-pick 看是不是你想要的
& & 12:23:17 +08:00
如果不是“同步”分支，建议 cherry-pick
& & 12:34:12 +08:00
@ 不会，分支只有你手动才删得掉，其它任何操作都不会删除分支
& & 12:48:22 +08:00
git checkout a -& git merge b 吗?
& & 12:49:16 +08:00
cherry-pickcherry-pickcherry-pick
& & 12:49:39 +08:00
少量提交可以用 cherry-pick多一点的提交，看看能不能用 rebase
& & 12:53:48 +08:00
如果能 merge --ff-only, 也可以这样
& & 12:55:36 +08:00
建议楼主先熟悉一下 git 基础和 git-flow ， 楼上说的 rebase/merge/cherry-pick 都可以，用哪种方法完全取决去个人爱好,洁癖用 rebase强迫症用 merge爱折腾用 cherry-pick
& & 13:11:51 +08:00
在 b 上 merge a 就可以了啊，没有什么必要 rebase 。cherry pick 会产生很多新的 commit ，更没有必要了。
& & 13:32:09 +08:00
@ 用 b rebase a 就可以了啊，没有什么必要 merge 。
& & 13:34:42 +08:00
rebase 被玩坏了
& & 13:56:35 +08:00
建议用 mergerebase 可能会导致 non-fastforwardcherry-pick 少量 commit 没问题，多了累
& & 14:03:21 +08:00
没有争议的问题 为啥还讨论这么激烈 蛋疼
& & 14:18:26 +08:00
git rebase -i &branch& 是正确的用法
& & 23:18:30 +08:00
On branch B1. branch_b cleangit merge branch_a2. branch_b can not merge before commitgit stashgit merge branch_a* may need fix confilct thengit stash pop遇到不可合并的二进制文件,需要重新 git checkout file
& · & 2620 人在线 & 最高记录 3762 & · &
创意工作者们的社区
World is powered by solitude
VERSION: 3.9.8.1 · 18ms · UTC 04:53 · PVG 12:53 · LAX 21:53 · JFK 00:53? Do have faith in what you're doing.第一天上班，怎么开通git shark？_百度知道
第一天上班，怎么开通git shark？
答题抽奖
首次认真答题后
即可获得3次抽奖机会，100%中奖。
我努力的方式
职业教育类认证行家
我努力的方式
职业教育类行家
采纳数：16899
获赞数：25478
灵熙时尚运营总监 国际注册高级纹绣师 国家高级形象设计师 国家高级化妆造型师 微信/QQ:
办入职。由老员工带些转下公司。了解公司基本制度。了解工作基本内容。然后适应下就可以了
为你推荐：
其他类似问题
个人、企业类
违法有害信息,请在下方选择后提交
色情、暴力
我们会通过消息、邮箱等方式尽快将举报结果通知您。3.3. Obtain the Wireshark sources3.3. Obtain the Wireshark sources
There are several ways to obtain the sources from Wireshark’s Git
repository.
Check out from the master branch using Git.
Using Git is much easier than synchronizing your source tree by hand using any
of the snapshot methods mentioned below. Git merges changes into your
personal source tree in a very comfortable and quick way. So you can update your
source tree several times a day without much effort.
Keep your sources up to date
The following ways to retrieve the Wireshark sources are sorted in
decreasing source timeliness.
If you plan to commit changes you’ve
made to the sources, it’s a good idea to keep your private source
tree as current as possible.
The age mentioned in the following sections indicates the age of the
most recent change in that set of the sources.
3.3.1. Git over SSH or HTTPS
Recommended for development purposes.
Age: a few minutes.
You can use a Git client to download the source code from Wireshark’s code
review system. Anyone can clone from the anonymous git URL:
If you create a Gerrit account you can clone from an authenticated URL:
ssh://:29418/wireshark
SSH lets you use Gerrit on the
HTTP lets you access the repository in environments that block the Gerrit SSH
port (29418). At the time of this writing (early 2014) we recommend that
you use the SSH interface. However, this may change as more tools take
advantage of Gerrit’s HTTP REST API.
The following example shows how to get up and running on the command
for information on installing and configuring
graphical Git and Gerrit clients.
Sign in to
using OpenID (click Register or Sign
In in the upper right corner of the web page). Follow the login instructions.
In the upper right corner of the web page, click on your account name and
select Settings.
Under Profile set a username. This will be the username that
you use for SSH access. For the steps below we’ll assume that your
username is henry.perry.
Select SSH Public Keys and add one or more keys. You will typically
upload a key for each computer that you use.
Install git-review. This is an installable package
in many Linux distributions. You can also install it as a
. (This step
isn’t strictly necessary but it makes working with Gerrit much easier.)
To install it from Chocolatey run
# Make sure "Scripts" is in our path
PS$&$env:path += ";C:\tools\python2\Scripts"
PS$&choco install pip
PS$&choco install git-review -source python
Now on to the command line. First, make sure git works:
$ git --version
If this is your first time using Git, make sure your username and
email address are configured. This is particularly important if you
plan on uploading changes.
$ git config --global user.name "Henry Perry"
$ git config --global user.email
Next, clone the Wireshark master:
$ git clone ssh://:29418/wireshark
The checkout only has to be done once. This will copy all the sources
of the latest version (including directories) from the server to
your machine. This may take some time depending on the speed of your
internet connection.
Then set up the git pre-commit hook and the push address:
$ cd wireshark
$ cp tools/pre-commit .git/hooks/
$ git config --add remote.origin.push HEAD:refs/for/master
This will run a few basic checks on commit to make sure that the code
does not contain trivial errors. It will also warn if it is out of sync
with its master copy in the tools/ directory.
The change in the push address is necessary: We have an asymmetric
process for pulling and pushing because of gerrit.
Initialize git-review.
$ git review -s
This prepares your local repository for use with Gerrit, including
installing the commit-msg hook script.
3.3.2. Git web interface
Recommended for informational purposes only, as only individual files can
be downloaded.
Age: a few minutes (same as anonymous Git access).
The entire source tree of the Git repository is available via a web
interface at . You can view each revision of
a particular file, as well as diffs between different revisions. You can
also download individual files but not entire directories.
3.3.3. Buildbot Snapshots
Recommended for development purposes, if direct Git access isn’t
possible (e.g. because of a restrictive firewall).
Age: some number of minutes (a bit older than the Git access).
The Buildbot server will automatically start to generate a snapshot of
Wireshark’s source tree after a source code change is committed. These
snapshots can be found at .
If Git access isn’t possible, e.g. if the connection to the server
isn’t possible because of a corporate firewall, the sources can be
obtained by downloading the Buildbot snapshots. However, if you are
going to maintain your sources in parallel to the "official" sources
for some time, it’s recommended to use the anonymous (or authenticated)
Git access if possible (believe it, it will save you a lot of time).
3.3.4. Released sources
Recommended for building pristine packages.
Age: from days to weeks.
The official source releases can be found at .
You should use these sources if you want to build Wireshark on your
platform for with minimal or no changes, such Linux distribution
The differences between the released sources and the sources in the
Git repository will keep on growing until the next release is made.
(At the release time, the released and latest Git repository
versions are identical again :-).