昨天,我从一个分支中创建了一个分支,把它推到原来的地方,并把它重新合并成师父。你可以在这里看到:
$ history |less
8358 git co master
8359 commit # shortcut that adds all and commits
8360 push # shortcut that `git push`'s
8361 git lg # shortcut that logs my output
8362 git co 1600
8363 git co -b 1601
8364 npm run test
8365 npm
是否有任何改进此工作流的工具/技巧:
⋊> on master ◦ git branch -d add_code_to_import_from_mew
error: The branch 'add_code_to_import_from_mew' is not fully merged.
If you are sure you want to delete it, run 'git branch -D add_code_to_import_from_mew'.
⋊> on master ◦ git checkout add_code_
我正在尝试提交一个从GitHub克隆的本地存储库。我收到以下错误消息
fatal: update_ref for ref 'HEAD': cannot lock ref 'HEAD': ref
refs/heads/master is at 2b459....[LOTS OF NUMBERS AND CHARACTERS]...
but expected 000000000000000000000000000
.git文件夹的结构如下:
来自git status的输出
warning: refname 'HEAD' is ambig
我检查了相关的线程,但仍然不能弄清楚幕后发生了什么。
当我输入git remote show origin时,我得到:
* remote origin
Fetch URL: xxxx
Push URL: xxxx
HEAD branch (remote HEAD is ambiguous, may be one of the following):
development
master
Remote branches:
development tracked
master tracked
Local branches config
最好用一个例子来解释:我在仓库的分支0.58上,这是我是如何拉取的:
git pull origin 0.58
当我调用"git pull“时,我得到:
ip238:openlierox az$ git pull
You asked me to pull without telling me which branch you
want to merge with, and 'branch.0.58.merge' in
your configuration file does not tell me either. Please
name which branch yo
这很奇怪。我正在尝试创建一个脚本,该脚本将签出每个本地分支,并将源/主分支重新设置为它的基础。
所以这是我的脚本:
for br in `git branch -l`; do
git checkout $br
git rebase origin/master
done
很简单。但在编写脚本之前,我想确保git branch -l返回我认为returning.....it不会返回的内容。
git branch -l返回正确的结果。但是git branch -l实际上返回的是所有本地分支以及当前目录中的文件!
它以如下方式返回它:
[list of local branches m
显示了以下命令:
$ git rev-list origin..HEAD
$ git rev-list HEAD ^origin
但是,当我运行第一个命令时,会得到以下错误:
$ git rev-list origin..HEAD fatal: ambiguous argument 'origin..HEAD': unknown revision or path not in the working tree. Use '--' to separate paths from revisions, like this: 'git <command&g
这是git branch -v在我的一个本地目录中生成的内容 * develop e229f7a Merge branch 'develop' of https://github.com/me/myremote-repo.git into develop Some diffs
master 3343dea [behind 2] Added git-log, same as git_log without colorization 我正在尝试遍历分支集合和该命令的输出,如果输出包含前面的n或后面的m,我想要输出如下语句: [behind 2] --> bin [ma
这是一个测试代码库,所以我可以直接删除它,或者提交并使用它。但是,我很恼火的是,我不能重置或隐藏更改并修复repo (歧义引用):
swilson@swlap1:~/gits/test$ git status
warning: refname 'HEAD' is ambiguous.
warning: refname 'HEAD' is ambiguous.
# Not currently on any branch.
# Changes not staged for commit:
# modified: test
# modifi
让我们假设在git中有以下结构
A <-- refs/heads/somebranch
|
B
| \
C D <-- refs/tags/TAG1
| |
E F
| | \
G H I <-- refs/heads/branch1
|
J <-- refs/heads/master
现在,我想找到所有在历史上包含提交B的参考资料。
所以如果我能做的话
$ git refs --contains B
refs/tags/TAG1
ref