repo.or.cz
/
git
/
dkf.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.6
2010-01-22
Ju
n
io
C
Ham
a
no
merge-recursive: do not retu
r
n NU
L
L
on
l
y to cause segfault
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
J
u
n
io C Hamano
F
ix "log --onelin
e
" no
t
to show notes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
io C Hamano
conf
l
ict-marker-
s
ize:
add test
and
do
c
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
io C
Hamano
U
pd
a
te draft
r
elease note
s
to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Junio C Ham
a
n
o
M
erge branch '
b
w/cvsimport'
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
i
o C Hamano
Merg
e
b
r
anc
h
'jc/checkout-mer
g
e-base'
commit
|
commitdiff
|
tree
2010-01-21
Junio C H
a
mano
Merge
b
ranch 'ag/patch-he
a
der-verif
y
'
commit
|
commitdiff
|
tree
2010-01-21
J
u
n
i
o
C Hamano
M
e
r
g
e
branch 'jc/conflict-marker-
s
ize'
commit
|
commitdiff
|
tree
2010-01-21
Junio
C
Ham
a
n
o
M
erge branch 'ag/
m
aint-apply-too-large-
p
'
commit
|
commitdiff
|
tree
2010-01-21
J
un
i
o C Ha
m
a
n
o
Merge b
r
anch 'ap/merge-backend-opts'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge branch 'nd/s
t
a
tus-partial-refresh'
commit
|
commitdiff
|
tree
2010-01-21
Junio C H
a
mano
Merg
e
remote branch 'remotes/tra
s
t-doc/for-next'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Ha
m
ano
Merge branch
'
j
h/no
t
es' (e
a
r
l
y pa
r
t
)
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-21
Junio C
H
amano
Merge branch 'jc/mai
n
t
-
refresh-index
-
is-opti
o
nal-for
.
.
.
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hama
n
o
Fi
x
"
l
og" famil
y
not to be
t
oo
a
gressive
about showing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
i
o
C
Hamano
M
erge branch 'rr/core-t
u
toria
l
'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C H
a
mano
Merge
b
ranch 'j
c
/cache-unmerge'
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hama
n
o
Me
r
ge branch 'js/e
x
ec-err
o
r
-
r
e
p
o
rt'
commit
|
commitdiff
|
tree
2010-01-20
J
unio
C
Hamano
M
erge
b
ranch 'jc/ls-files-ignored-p
a
t
h
spec'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
a
mano
Merge bran
c
h 'jc/grep-loo
k
ahead'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hamano
Merge
b
ranch 'jc/m
a
int-strbuf
-
a
dd-fix-doubling'
commit
|
commitdiff
|
tree
2010-01-20
J
unio C
Hamano
Merge branch 'mm/confl
i
c
t-advice'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
Merge
branch 'da/difft
o
ol'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch '
m
h/
r
ebase-fixup'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
Merg
e
branch 'ns/rebas
e
-auto-squash'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Ham
a
n
o
Merge branch
'
mh/
r
eb
a
se-fixup'
(
early p
a
rt)
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
M
e
rge
branc
h
'il/push-set-
u
pstream'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
M
e
rge b
r
anch 'jk/warn-author-
c
ommitt
e
r-after-commit'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Ha
m
ano
Merge branch 'jc
/
ident'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hamano
Merge bran
c
h
'tr/http-push-ref-status'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Mer
g
e branch 'bk
/
fix-relative-gi
t
dir-
f
i
l
e'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio
C Hamano
Me
r
g
e
br
a
n
ch 'sd/c
d
-p-show-t
o
plevel'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hamano
Merge bran
c
h 'jc/symbol-static'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Ha
m
ano
d
ate
.
c: ma
r
k
file-loca
l
functi
o
n static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
no
Sync with 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
J
unio
C Hamano
G
it 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
i
o C
Ha
m
ano
Merge branch
'
bg/maint-remote-update-de
f
ault' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Ha
m
ano
Merge b
r
anc
h
'sb
/
maint-octop
u
s' into maint
commit
|
commitdiff
|
tree
2010-01-20
J
un
i
o C Ha
m
ano
Merge branch 'bg/
m
aint-add-al
l
-
doc' into maint
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Haman
o
Merge branch '
m
aint-1
.
6
.
5' into maint
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Git 1
.
6
.
5
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hama
n
o
Merge branch 'jk/maint-1
.
6
.
5-reset-hard'
into maint
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch '
t
r/maint-1
.
6
.
5-bash-p
r
om
p
t-show-submodule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C H
a
mano
Merge branch 'dp/
m
aint-1
.
6
.
5-fast-import-non-c
o
m
m
it
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
H
a
m
ano
Me
r
ge
b
ranch
'
j
m/maint-1
.
6
.
5
-
g
rep-NUL-terminate
'
i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Hamano
Teach @{
u
pstream} syntax
t
o
strbu
f
_bra
n
c
h
anme
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
i
o C
H
aman
o
t
1
506: more test for
@{ups
t
re
a
m} syn
t
ax
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
F
i
x "checkout A
.
.
.
" synony
m
for "
c
hec
k
out A
.
.
.
H
E
A
D
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hamano
status: do
n
't require the repository to be writable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hamano
Merge bra
n
ch 'main
t
'
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o C Ha
m
a
n
o
Merge branch 'maint-1
.
6
.
4' into maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o C Ham
a
no
Merge branch
'
maint
-
1
.
6
.
3' i
n
t
o maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C Ha
m
a
n
o
Merge bra
n
ch 'ma
i
n
t
-
1
.
6
.
2' into maint-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C Hamano
M
e
r
ge commit 'v1
.
6
.
4
.
4-8-
g
8
de651
8
' i
n
to m
a
int-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C Haman
o
F
ix mis
-
backport
o
f t7002
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Up
d
a
te draft release notes to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o C Hamano
Merge
b
r
a
nch
'
m
a
i
nt'
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o C H
a
mano
Update draft
re
l
e
a
s
e note
s
to 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio
C Haman
o
Merge branch 'dp/maint-1
.
6
.
5
-fast-i
m
por
t
-no
n
-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ham
a
n
o
Merge branch 'jc
/
rerere'
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C Hamano
Merge branch 'pc/uninteresting-subm
o
dul
e
-disappear
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge br
a
nch '
n
d/i
n
clude-ter
m
ios-for-osol'
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C Hamano
Merge branch
'
js/window
s
'
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
Hamano
Merge branch 'j
m
/
maint-1
.
6
.
5-grep-NUL-terminate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
s
ymlinks
.
c: remo
v
e unused fun
c
t
i
on
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio
C
Hamano
obje
c
t
.
c: remove
unused functions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Juni
o
C Hamano
Docum
e
nt that m
e
rge s
t
rategies can now take the
i
r own
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C
H
amano
M
ake "subtree" part mor
e
ortho
g
onal
to t
h
e rest of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
u
nio C Ham
a
no
p
ull: F
i
x parsing
o
f -X
<
option>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C H
a
mano
Upd
a
t
e d
r
aft re
l
ea
s
e
notes t
o
1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Ju
n
io
C
Ha
m
ano
M
e
rge
bran
c
h 'tc/test-locate-httpd'
commit
|
commitdiff
|
tree
2010-01-18
Juni
o
C Hamano
Merge bra
n
ch '
j
h/commit-sta
t
us'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
M
erge
branch '
j
n/m
a
k
efi
l
e'
commit
|
commitdiff
|
tree
2010-01-17
J
un
i
o
C H
a
mano
Merge bra
n
ch 'jc/
m
ain
t
-1
.
6
.
1-c
h
ec
k
o
u
t
-
m
-custom-
m
erg
e
'
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
a
m
ano
M
erge b
r
anch '
t
c/clone-v
-
progress'
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C H
a
mano
M
erge branch
'
t
c
/smart-ht
t
p-restrict'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ha
m
ano
M
erg
e
branch 'jk
/
run-
c
ommand-use-shell'
commit
|
commitdiff
|
tree
2010-01-17
J
unio
C Hamano
Mer
g
e branch 'sr
/
gfi
-
option
s
'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Update CO
P
YING with GPLv2
with
n
ew FSF address
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio
C Hamano
use
r
_
i
d
e
nt_sufficiently_given(): ref
a
ctor the logic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Hamano
u
s
er_id
e
nt
_
sufficiently_given
(
): r
e
facto
r
the l
o
gic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Hamano
rerere: honor c
o
nflict-
m
arker-size attribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
rerere: prepa
r
e for customizable
c
onflict marke
r
length
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Hamano
commit
.
c::print_summary:
d
o n
o
t re
l
ease the format
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ham
a
n
o
conflict-marker-size: n
e
w
a
ttribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C
H
a
m
a
no
rerer
e
: use
ll_m
e
rge() inste
a
d of
u
s
ing xdl_mer
g
e()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
am
a
n
o
merge
-
tree: use ll_
m
erge() not
x
dl_mer
g
e()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
Hamano
xdl_
m
erg
e
(): al
l
ow pa
s
sing down marker_size in xmparam
_
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ha
m
ano
xdl
_
merge(): introduce xmp
a
ram_t f
o
r merge specific
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
unio C
Haman
o
git_attr(): fix function si
g
nature
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
mano
Merge branch 'cc/reset-more'
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
a
ma
n
o
T
e
a
ch diff that modified submodule directo
r
y is dirt
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
Ju
n
io
C Haman
o
grep --n
o
-index: allow use
of "git grep" ou
t
s
i
de a
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
J
unio C Hamano
grep: pre
p
are to run
outside of a
w
o
r
k tree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
Merge branch 'jc/c
h
eckout-mer
g
e-base'
commit
|
commitdiff
|
tree
2010-01-13
Ju
n
i
o C Hamano
Merge branch
'rs/mai
n
t-ar
c
h
i
v
e
-ma
t
ch-pathspec'
commit
|
commitdiff
|
tree
2010-01-13
Juni
o
C Hama
n
o
Mer
g
e bra
n
c
h
'
i
l/vcs-he
l
per'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hama
n
o
str
b
uf_addbuf(): allow
p
a
ssi
n
g t
h
e
same buf to dst
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next