Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
git
提交
7cb038a6
G
git
项目概览
李少辉-开发者
/
git
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
git
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
7cb038a6
编写于
1月 15, 2006
作者:
J
Junio C Hamano
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'fixo/1.0'
上级
8c23b6fa
ee3d299e
变更
9
显示空白变更内容
内联
并排
Showing
9 changed file
with
60 addition
and
14 deletion
+60
-14
Documentation/git-commit.txt
Documentation/git-commit.txt
+3
-1
Documentation/git-reset.txt
Documentation/git-reset.txt
+26
-1
Documentation/glossary.txt
Documentation/glossary.txt
+11
-0
Documentation/pull-fetch-param.txt
Documentation/pull-fetch-param.txt
+3
-3
diffcore.h
diffcore.h
+1
-1
name-rev.c
name-rev.c
+4
-3
show-branch.c
show-branch.c
+1
-1
t/t6010-merge-base.sh
t/t6010-merge-base.sh
+3
-3
update-index.c
update-index.c
+8
-1
未找到文件。
Documentation/git-commit.txt
浏览文件 @
7cb038a6
...
...
@@ -25,7 +25,9 @@ information.
OPTIONS
-------
-a|--all::
Update all paths in the index file.
Update all paths in the index file. This flag notices
files that have been modified and deleted, but new files
you have not told about git are not affected.
-c or -C <commit>::
Take existing commit object, and reuse the log message
...
...
Documentation/git-reset.txt
浏览文件 @
7cb038a6
...
...
@@ -145,6 +145,32 @@ brings your index file and the working tree back to that state,
and resets the tip of the branch to that commit.
------------
Interrupted workflow::
+
You can get interrupted by an ungent fix request while you are
still in the middle of a large change. The files in your
working tree are not in any shape to be committed yet, but you
need to get to the other branch for a quick bugfix.
+
------------
$ git checkout feature ;# you were working in "feature" branch and
$ work work work ;# got interrupted
$ git commit -a -m 'snapshot WIP' <1>
$ git checkout master
$ fix fix fix
$ git commit ;# commit with real log
$ git checkout feature
$ git reset --soft HEAD^ ;# go back to WIP state <2>
$ git reset <3>
<1> This commit will get blown away so a throw-away log message is OK.
<2> This removes the 'WIP' commit from the commit history, and makes
your working tree in the state just before you made that snapshot.
<3> After <2>, the index file still has all the WIP changes you
committed in <1>. This sets it to the last commit you were
basing the WIP changes on.
------------
Author
------
Written by Junio C Hamano <junkio@cox.net> and Linus Torvalds <torvalds@osdl.org>
...
...
@@ -156,4 +182,3 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
GIT
---
Part of the gitlink:git[7] suite
Documentation/glossary.txt
浏览文件 @
7cb038a6
...
...
@@ -111,6 +111,17 @@ branch::
a particular revision, which is called the branch head. The
branch heads are stored in `$GIT_DIR/refs/heads/`.
master::
The default branch. Whenever you create a git repository, a branch
named "master" is created, and becomes the active branch. In most
cases, this contains the local development.
origin::
The default upstream branch. Most projects have one upstream
project which they track, and by default 'origin' is used for
that purpose. New updates from upstream will be fetched into
this branch; you should never commit to it yourself.
ref::
A 40-byte hex representation of a SHA1 pointing to a particular
object. These may be stored in `$GIT_DIR/refs/`.
...
...
Documentation/pull-fetch-param.txt
浏览文件 @
7cb038a6
...
...
@@ -134,9 +134,9 @@ is often useful.
+
Some short-cut notations are also supported.
+
*
For backward compatibility, `tag` is almost ignored;
it just makes the following parameter <tag> to mean a
refspec `refs/tags/<tag>:refs/tags/<tag>`
.
*
`tag <tag>` means the same as `refs/tags/<tag>:refs/tags/<tag>`;
used with pull or fetch, it requests fetching everything up to
the given tag
.
* A parameter <ref> without a colon is equivalent to
<ref>: when pulling/fetching, and <ref>`:`<ref> when
pushing. That is, do not store it locally if
...
...
diffcore.h
浏览文件 @
7cb038a6
...
...
@@ -15,7 +15,7 @@
* passed around in one int (high 16-bit for merge and low 16-bit
* for break).
*/
#define MAX_SCORE 60000
#define MAX_SCORE 60000
.0
#define DEFAULT_RENAME_SCORE 30000
/* rename/copy similarity minimum (50%) */
#define DEFAULT_BREAK_SCORE 30000
/* minimum for break to happen (50%)*/
#define DEFAULT_MERGE_SCORE 48000
/* maximum for break-merge to happen (80%)*/
...
...
name-rev.c
浏览文件 @
7cb038a6
...
...
@@ -93,10 +93,11 @@ static int name_ref(const char *path, const unsigned char *sha1)
}
if
(
o
&&
o
->
type
==
commit_type
)
{
struct
commit
*
commit
=
(
struct
commit
*
)
o
;
const
char
*
p
;
while
((
p
=
strchr
(
path
,
'/'
)))
path
=
p
+
1
;
if
(
!
strncmp
(
path
,
"refs/heads/"
,
11
))
path
=
path
+
11
;
else
if
(
!
strncmp
(
path
,
"refs/"
,
5
))
path
=
path
+
5
;
name_rev
(
commit
,
strdup
(
path
),
0
,
0
,
deref
);
}
...
...
show-branch.c
浏览文件 @
7cb038a6
...
...
@@ -492,7 +492,7 @@ static void append_one_rev(const char *av)
append_ref
(
av
,
revkey
);
return
;
}
if
(
strchr
(
av
,
'*'
)
||
strchr
(
av
,
'?'
))
{
if
(
strchr
(
av
,
'*'
)
||
strchr
(
av
,
'?'
)
||
strchr
(
av
,
'['
)
)
{
/* glob style match */
int
saved_matches
=
ref_name_cnt
;
match_ref_pattern
=
av
;
...
...
t/t6010-merge-base.sh
浏览文件 @
7cb038a6
...
...
@@ -46,14 +46,14 @@ H=$(doit 8 H $A $F)
test_expect_success
'compute merge-base (single)'
\
'MB=$(git-merge-base G H) &&
expr "$(git-name-rev "$MB")" : "[0-9a-f]* B"'
expr "$(git-name-rev "$MB")" : "[0-9a-f]*
tags/
B"'
test_expect_success
'compute merge-base (all)'
\
'MB=$(git-merge-base --all G H) &&
expr "$(git-name-rev "$MB")" : "[0-9a-f]* B"'
expr "$(git-name-rev "$MB")" : "[0-9a-f]*
tags/
B"'
test_expect_success
'compute merge-base with show-branch'
\
'MB=$(git-show-branch --merge-base G H) &&
expr "$(git-name-rev "$MB")" : "[0-9a-f]* B"'
expr "$(git-name-rev "$MB")" : "[0-9a-f]*
tags/
B"'
test_done
update-index.c
浏览文件 @
7cb038a6
...
...
@@ -534,10 +534,17 @@ int main(int argc, const char **argv)
struct
strbuf
buf
;
strbuf_init
(
&
buf
);
while
(
1
)
{
char
*
path_name
;
read_line
(
&
buf
,
stdin
,
line_termination
);
if
(
buf
.
eof
)
break
;
update_one
(
buf
.
buf
,
prefix
,
prefix_length
);
if
(
line_termination
&&
buf
.
buf
[
0
]
==
'"'
)
path_name
=
unquote_c_style
(
buf
.
buf
,
NULL
);
else
path_name
=
buf
.
buf
;
update_one
(
path_name
,
prefix
,
prefix_length
);
if
(
path_name
!=
buf
.
buf
)
free
(
path_name
);
}
}
if
(
active_cache_changed
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录