repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Git 1.7.0.8
2010-01-23
Junio C Hamano
M
e
rge branch 'jc/mai
n
t-
l
imit
-
no
t
e-out
p
ut'
commit
|
commitdiff
|
tree
2010-01-23
Ju
n
io C
Hama
n
o
M
er
g
e branch
'
nd/ls
-
f
ile
s
-spars
e
-fix'
commit
|
commitdiff
|
tree
2010-01-22
Ju
n
io
C
Hamano
ignore duplicated slashes in make_relative_path()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-22
Jun
i
o C Hamano
git-mv:
f
ix movi
n
g more
than one source to a si
n
gle
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-22
J
uni
o
C Hamano
Merge br
a
n
ch
'
maint'
commit
|
commitdiff
|
tree
2010-01-22
J
u
nio C Hamano
merg
e
-recursive: do not r
e
tur
n
NULL only to cause s
e
gf
a
ult
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
Juni
o
C Hamano
Fix "log --oneline" no
t
to show notes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
J
u
n
io C
Ham
a
n
o
c
o
nfl
i
ct-marker-size: add test and
d
o
c
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
J
u
n
i
o
C Ha
m
ano
Update draft
r
ele
a
se notes
t
o 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
J
u
nio C Hamano
Merge bra
n
ch
'bw/c
v
s
impo
r
t'
commit
|
commitdiff
|
tree
2010-01-21
Junio
C Hamano
Merg
e
branch
'jc
/
che
c
k
o
ut
-
m
erge-bas
e
'
commit
|
commitdiff
|
tree
2010-01-21
Juni
o
C
Hamano
Merge
bra
n
ch 'ag/patch-header-
v
e
r
i
f
y'
commit
|
commitdiff
|
tree
2010-01-21
J
unio C Hamano
Merge branch 'jc/conflict-
m
a
rker-size
'
commit
|
commitdiff
|
tree
2010-01-21
J
u
nio C Haman
o
M
erge branch '
a
g/m
a
in
t
-appl
y
-too-large-p'
commit
|
commitdiff
|
tree
2010-01-21
Junio
C Hamano
Merge br
a
nc
h
'ap/merg
e
-ba
c
ken
d
-opts
'
commit
|
commitdiff
|
tree
2010-01-21
Juni
o
C
Hamano
Merge branch 'nd/status
-
partia
l
-re
f
resh'
commit
|
commitdiff
|
tree
2010-01-21
Juni
o
C Hamano
Merge remote br
a
nch '
r
e
m
otes/trast-doc/for-next'
commit
|
commitdiff
|
tree
2010-01-21
Junio C H
a
mano
Merge bran
c
h '
j
h/notes
'
(early par
t
)
commit
|
commitdiff
|
tree
2010-01-21
Junio C
H
amano
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2010-01-21
J
unio C Hamano
M
erge branch 'jc
/
maint-refresh-index-is-
o
p
t
ional-for
.
.
.
commit
|
commitdiff
|
tree
2010-01-21
Jun
i
o C
Hamano
Fix "log" f
a
mily
n
ot
t
o be
too agre
s
si
v
e about showi
n
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
M
e
rge
b
ranch 'rr/core-tutori
a
l'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
e
r
g
e
bra
n
ch 'jc/cache-unmerge'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
amano
Merge
b
ranch 'js/exec-error-rep
o
rt'
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
mano
Merge
branch 'jc/ls-files-ignored-pathspec'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io
C
Hamano
M
erge branc
h
'jc/grep-lo
o
kahead'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o
C
Hamano
Merge b
r
an
c
h 'j
c
/ma
i
nt-strbuf-add-fix-d
o
u
b
l
i
ng'
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
ma
n
o
Merge branch
'
m
m/conf
l
ict-advice'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'da/difftool'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
e
rge
b
r
a
nch 'mh/r
e
b
a
s
e-fixup'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
amano
Merge bra
n
ch 'ns/rebase
-
a
u
t
o-squ
a
sh'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
Merge branch 'mh/rebase-fi
x
u
p'
(ea
r
ly part)
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
i
o C
H
a
m
ano
Merge branch 'il
/
pu
s
h-set-upstream'
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
Merge
b
r
anch 'jk/warn-a
u
thor-comm
i
tter
-
a
fter-c
o
mmi
t
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hama
n
o
M
erge branch
'
jc/
i
dent'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Haman
o
Merge branch
'tr/http-push-ref-status'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'bk/fix-relative-gitdi
r
-file
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch
'
sd/cd-p-show-toplevel
'
commit
|
commitdiff
|
tree
2010-01-20
J
u
ni
o
C Hamano
Merge
b
r
a
nch 'jc/symbol-static'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
date
.
c
: mark file-l
o
c
al function sta
t
ic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Ha
m
ano
Sync
w
ith 1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C H
a
mano
Git 1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
Merge bran
c
h
'bg/maint-remote-update-defa
u
lt' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Hamano
M
e
rge bran
c
h 'sb/maint-oc
t
o
pus'
into
m
aint
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Me
r
ge branch 'bg/main
t
-add-all-doc' into maint
commit
|
commitdiff
|
tree
2010-01-20
J
unio C
Hama
n
o
Merge
branch 'mai
n
t-1
.
6
.
5' into maint
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
Git 1
.
6
.
5
.
8
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
mano
Merge branch 'jk/
m
a
int-1
.
6
.
5-reset-hard'
into maint
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge
b
ranch 'tr/ma
i
n
t-1
.
6
.
5-bash-prompt-show-submodule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
n
o
Merge bran
c
h 'dp/
m
ai
n
t-1
.
6
.
5
-fast-import
-
non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge
b
r
a
nch 'jm/ma
i
nt-1
.
6
.
5
-
grep-NUL-te
r
minate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
T
e
ach
@{
u
pstream} synta
x
to strbuf_branchanme()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
H
amano
t15
0
6:
more test for @{upstream} sy
n
tax
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hamano
F
ix "chec
k
out A
.
.
.
" sy
n
onym
f
or
"
check
o
ut A
.
.
.
HEAD
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
status
:
d
on't re
q
uire the
r
epository t
o
be writable
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-19
Junio
C Ham
a
no
Merge branch 'maint-1
.
6
.
4' into
maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ha
m
a
n
o
Merge b
r
anch '
m
aint-1
.
6
.
3'
i
nto
m
aint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
J
u
ni
o
C Ha
m
a
no
Merge bra
n
ch 'm
a
int-1
.
6
.
2' int
o
main
t
-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Junio C
H
amano
Me
r
g
e
com
m
i
t
'v1
.
6
.
4
.
4-8-g8de6518' into
m
a
i
nt-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ham
a
no
Fix mis-backport of t70
0
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Junio C H
a
m
ano
Update draft rel
e
a
se
n
o
t
es to 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ham
a
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o C H
a
m
an
o
Update dr
a
ft r
e
lease notes to 1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
J
uni
o
C Hamano
Merge branch 'd
p
/maint-
1
.
6
.
5-fast-impor
t
-
non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C Hamano
Merge branch 'jc/rerere'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
M
erg
e
branch 'pc/uninteresting-
s
u
b
module
-
disappear
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge branc
h
'nd/include-
t
ermios
-
for-o
s
o
l
'
commit
|
commitdiff
|
tree
2010-01-19
Junio C H
a
ma
n
o
Merge branc
h
'js/windows
'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hama
n
o
Merge branch 'jm/maint-1
.
6
.
5-grep-NUL-te
r
minat
e
'
i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2010-01-18
Junio
C
Hamano
s
ymli
n
ks
.
c: r
e
move u
n
used fun
c
tions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
J
unio C Hamano
o
bject
.
c: remove unused f
u
nctions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Ha
m
a
no
Doc
u
ment
that merg
e
strategies can now take
their own
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio
C Ha
m
a
no
M
a
ke
"subtre
e
" par
t
more orthogonal
t
o
t
h
e res
t
o
f
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
J
u
nio C Hamano
pull: Fix parsing of -X<o
p
t
i
on>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
J
unio
C
H
amano
Updat
e
dr
a
ft release notes to 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Ha
m
ano
Merge branch 'tc/test-locate-httpd'
commit
|
commitdiff
|
tree
2010-01-18
Junio
C
Hamano
M
e
rge branch
'
j
h/commit-status'
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
aman
o
M
e
rge branch
'jn/makefile'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge branch 'jc/maint
-
1
.
6
.
1-checkou
t
-m-custom-merge'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge b
r
anch 'tc/
c
lone-v-progr
e
ss'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
M
e
rge br
a
nch 'tc/smart-http-re
s
tr
i
ct'
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
amano
Merge bran
c
h '
j
k/run-command-use-shell'
commit
|
commitdiff
|
tree
2010-01-17
Junio C
Hamano
M
e
r
g
e branch 'sr/gfi-options'
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
m
ano
Update COPYING wi
t
h GPLv
2
w
ith new
F
SF a
d
dress
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Hamano
user_ide
n
t_s
u
f
ficiently_given(): re
f
acto
r
the logic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
u
n
io C Ha
m
ano
user_ident_sufficiently_gi
v
en(): refacto
r
the logic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
am
a
no
rere
r
e: hono
r
con
f
lict-marker-size attr
i
bute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
rerere: pre
p
are for c
u
s
tomizab
l
e
conflict marker length
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
commit
.
c::pri
n
t
_summary: do not r
e
l
ease the f
o
r
m
at
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
c
o
n
flict-marker-size: n
e
w attribute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
rere
r
e: use ll_merge(
)
in
s
tead of usin
g
x
dl_merge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C H
a
mano
merge-tree: u
s
e ll_mer
g
e() not
xdl_merge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o
C
Hama
n
o
xdl_merge(): allow passing down marker
_
size
i
n xmpa
r
am_t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
xd
l
_
m
erge():
introduce xmparam_t fo
r
m
e
rge specific
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
g
i
t_attr()
:
fix f
u
nction signature
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
Merge branch '
c
c/reset-more'
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C
Ha
m
ano
Teach di
f
f t
h
at
m
o
dified submodule directory is d
i
rty
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-15
Junio C Hamano
g
r
ep
-
-no-
i
ndex: allow use of "gi
t
grep" outside a
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next