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.1
2010-01-23
Junio
C
Hama
n
o
Merge branch 'js/refer-upst
r
e
a
m'
commit
|
commitdiff
|
tree
2010-01-23
J
unio C Ham
a
n
o
M
e
rge branch 'j
l
/submodule-d
i
f
f
'
commit
|
commitdiff
|
tree
2010-01-23
J
u
nio
C
Ha
m
ano
Merge branch 'i
l
/
remote
-
u
pd
a
tes'
commit
|
commitdiff
|
tree
2010-01-23
J
u
nio C H
a
mano
M
erge
b
ranch 'il/bran
c
h-
s
et-upstre
a
m'
commit
|
commitdiff
|
tree
2010-01-23
Jun
i
o
C
Hamano
M
e
rge
branch
'jc/maint-limit-note-
o
u
t
put
'
commit
|
commitdiff
|
tree
2010-01-23
Junio C Hamano
Merge b
r
anch 'nd/ls-files-
s
pa
r
se-fix'
commit
|
commitdiff
|
tree
2010-01-22
Junio C
Hamano
igno
r
e
d
u
p
l
icated slashes in m
a
ke
_
relat
i
ve_p
a
th
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
Ju
n
io C
H
amano
g
i
t-mv:
f
i
x moving more
t
han one source to a single
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
Junio C Hamano
Merge bran
c
h 'm
a
int'
commit
|
commitdiff
|
tree
2010-01-22
Juni
o
C Hamano
merge-recursive:
d
o
n
ot retur
n
N
ULL only t
o
cau
s
e
s
e
g
fault
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Fix "log
-
-onel
i
ne" not to s
h
o
w notes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hama
n
o
con
f
lic
t
-m
a
rk
e
r-size: add test
a
nd
docs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
U
pd
a
t
e
draft release note
s
to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge branch '
b
w/cvsimport'
commit
|
commitdiff
|
tree
2010-01-21
Junio
C Hama
n
o
Me
r
g
e
bran
c
h 'jc/chec
k
out
-
merge-base'
commit
|
commitdiff
|
tree
2010-01-21
J
u
n
io C Hamano
Merge
branc
h
'a
g
/patch-heade
r
-
v
erify'
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
io C Hama
n
o
M
e
rge b
r
anch 'jc/
c
onfl
i
c
t-marker-size'
commit
|
commitdiff
|
tree
2010-01-21
Junio
C
Hamano
Merge
branch
'
ag/maint
-
apply-
t
oo-larg
e
-p'
commit
|
commitdiff
|
tree
2010-01-21
Junio C H
a
mano
Merge branch 'ap/m
e
rg
e
-backend-opts'
commit
|
commitdiff
|
tree
2010-01-21
J
u
n
io C Hamano
Merge branc
h
'nd/st
a
t
us-pa
r
t
i
a
l
-refresh'
commit
|
commitdiff
|
tree
2010-01-21
Jun
i
o C H
a
mano
M
e
rge r
e
mote bran
c
h
'remotes/tras
t
-doc/for-next'
commit
|
commitdiff
|
tree
2010-01-21
Junio C
H
amano
Merge branch 'j
h
/notes' (early part)
commit
|
commitdiff
|
tree
2010-01-21
Junio
C Haman
o
M
erge branch 'm
a
int'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge branch 'jc/mai
n
t
-refresh
-
index-is-optional-fo
r
.
.
.
commit
|
commitdiff
|
tree
2010-01-21
Junio C Haman
o
Fix
"log" family
n
ot to be too agr
e
ssive about show
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o
C Hamano
Me
r
ge branch
'rr/core-tutori
a
l'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
n
o
Merge branch
'
j
c/cache-u
n
merge'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Haman
o
Merge branch
'j
s
/exec-error-report'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branc
h
'jc/ls-files-igno
r
ed-pa
t
hspec'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Ham
a
no
Merge bra
n
ch 'jc/gr
e
p-lookahead'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'jc/
m
aint-strb
u
f
-
add-fix-doubling'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C
H
aman
o
Merg
e
b
r
anch '
m
m/
c
o
nflict-advice'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge bra
n
ch 'da/difftool'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hamano
M
e
rge branch 'mh/reba
s
e-
f
i
x
up'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Mer
g
e bran
c
h 'ns/rebas
e
-auto-s
q
uash'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge bran
c
h '
m
h/rebase-fixup
'
(early
part)
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hamano
Merge branch
'
il/push-set-u
p
stream'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge bra
n
ch 'jk/war
n
-author-committer
-
after-
c
o
mmit'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hamano
Merge branch 'jc/ident'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
a
m
ano
Merge branch '
t
r/ht
t
p-p
u
sh-r
e
f
-
status'
commit
|
commitdiff
|
tree
2010-01-20
J
unio C
H
ama
n
o
Merge br
a
nch 'bk/fix-
r
elativ
e
-gi
t
dir-file'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
H
aman
o
M
e
rge branch 'sd/c
d
-p-show-tople
v
el'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Ham
a
no
Merge
b
ranch 'jc
/
symbol-static'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
i
o C
Hamano
da
t
e
.
c
: mark
file-local function static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
Sy
n
c with 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Hamano
Git 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
io C
H
amano
Merge
b
r
a
nch 'bg/maint-remote-update-
d
efault' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C H
a
man
o
M
erge branch
'sb/ma
i
nt-oct
o
pus'
into maint
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
amano
Merge branch 'bg
/
maint-add
-
a
l
l-doc'
into maint
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Ha
m
ano
M
e
rge br
a
nch
'
mai
n
t-1
.
6
.
5' into maint
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Ha
m
ano
Git 1
.
6
.
5
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
M
e
rge branch 'jk/maint-1
.
6
.
5-reset-hard' into maint
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Haman
o
Merg
e
b
ranch
'
tr/ma
i
nt-1
.
6
.
5-bash-prompt-show-submodule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
e
rge branch
'
d
p
/main
t
-1
.
6
.
5-fast-import-n
o
n-commi
t
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
no
Merge
branc
h
'jm/maint-1
.
6
.
5-gr
e
p
-
N
UL-termin
a
te
'
i
n
to
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
Teach @{
u
pstr
e
am
}
synt
a
x to strbuf_branch
a
nme()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hamano
t15
0
6
:
m
ore te
s
t
f
or @{
u
pstream} synta
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Fix "check
o
ut A
.
.
.
"
syno
n
y
m
for "c
h
eckout A
.
.
.
HEAD
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
status:
d
on'
t
requi
r
e
the repository to be writable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hamano
Merge
branch 'm
a
i
nt'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge branch '
m
aint-1
.
6
.
4' into ma
i
nt-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C Hama
n
o
Merge branch 'maint-1
.
6
.
3' in
t
o maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
J
uni
o
C
Ham
a
no
Mer
g
e branch 'maint-1
.
6
.
2' i
n
t
o maint-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio
C Hamano
Merge
co
m
m
i
t '
v
1
.
6
.
4
.
4
-8
-
g8de6518
'
in
t
o m
a
int-
1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Fix mis-bac
k
p
or
t
of t7002
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
J
unio C Hamano
U
pd
a
te draft release notes
to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2010-01-19
J
uni
o
C
H
amano
U
p
d
ate draft
rel
e
ase no
t
es to 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C
H
amano
Merge branch
'dp/maint-1
.
6
.
5
-f
a
s
t
-import-non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C
Hamano
Merge branch 'jc/rerere'
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io C Hama
n
o
Merge branch 'pc/uninteresti
n
g-submodule-disap
p
e
ar
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C
Hamano
M
e
r
ge branch 'nd/in
c
l
ude-
t
e
r
mios-for-osol
'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge b
r
anch 'js/
w
in
d
ows'
commit
|
commitdiff
|
tree
2010-01-19
J
unio C
H
a
mano
Merge branch '
j
m/maint-1
.
6
.
5-grep
-
NUL
-
te
r
minat
e
'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2010-01-18
Junio
C Ha
m
ano
syml
i
nks
.
c
:
remove
unused
functions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Jun
i
o C Ha
m
a
n
o
object
.
c: remove
u
n
u
s
ed fun
c
tions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Ham
a
no
D
ocument
t
hat merge 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
Ha
m
ano
Make "subtree"
p
ar
t
m
ore orthogonal to the rest of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Juni
o
C Hama
n
o
pull:
F
ix
p
a
r
sing of -X<option>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Update draft release not
e
s to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C
Ham
a
no
Merge branc
h
'tc/test-lo
c
ate-ht
t
pd'
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Me
r
ge bran
c
h 'jh
/
commit-st
a
tus'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hama
n
o
M
e
rge branch 'jn/makefile'
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
i
o
C
Haman
o
Merge
b
r
anch 'j
c
/maint-1
.
6
.
1-checkout-m-cu
s
tom
-
merge'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C Hamano
M
erge bra
n
ch 'tc
/
clone-v-pr
o
gress'
commit
|
commitdiff
|
tree
2010-01-17
J
un
i
o C Hamano
Merge branch 'tc/smart-http
-
restrict'
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
amano
Merge
b
ran
c
h 'jk
/
run-com
m
and-use-shell'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Mer
g
e
b
r
anch 'sr/gfi-options
'
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io
C
Hamano
Update C
O
P
Y
I
N
G wit
h
G
P
Lv2 with new F
S
F address
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Haman
o
user
_
i
de
n
t_su
f
f
ic
i
e
n
tly_giv
e
n(): ref
a
c
to
r
the logic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
unio C Haman
o
user_ident
_
s
uff
i
c
i
en
t
l
y_given(
)
: ref
a
ct
o
r
t
h
e
logic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Haman
o
rerere: honor conflict-marker-s
i
ze attri
b
u
t
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
n
i
o
C
H
amano
rerere:
p
repare f
o
r
custo
m
i
zable confli
c
t marker
l
e
ngth
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
commit
.
c
::
p
ri
n
t_summa
r
y: do not rele
a
se the format
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Hamano
conflict-ma
r
ke
r
-siz
e
: new
a
ttribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C Ha
m
ano
rer
e
re: use ll_merge(
)
in
s
te
a
d of using xdl_merge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
merge-
t
ree: use ll_
m
erg
e
() n
o
t xdl_merge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
x
dl_
m
er
g
e(): al
l
o
w pa
s
si
n
g down
m
arker_
s
ize in
x
mpa
r
am_t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
unio C Ham
a
no
xdl_merge(): intr
o
d
uce xmp
a
ram_t
f
or
merge specific
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
uni
o
C
H
amano
gi
t
_attr
(
):
f
ix function sig
n
ature
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next