repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge master.kernel.org:/home/hpa/git/daemon
2005-09-28
Junio C Haman
o
Mer
g
e mas
t
er
.
k
ernel
.
org:/home/hpa/git/da
e
mon
commit
|
commitdiff
|
tree
2005-09-27
J
u
nio C Hamano
gi
t
-comm
i
t
:
u
se update-ind
e
x --stdin, instead of xargs
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Ju
n
io C Hamano
update-
i
ndex: documen
t
--stdi
n
an
d
-z
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
J
u
ni
o
C Hamano
u
p
date-inde
x
:
--stdin and -
z
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Ni
c
k Hengeveld
[P
A
T
C
H]
R
eturn CURL error message w
h
en object transfer
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Daniel Barkalo
w
[P
A
TCH] Implement --recove
r
f
o
r g
i
t-*-f
e
tc
h
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Sven Verdoola
e
g
e
[P
A
T
C
H] Provide
access to git_dir through get_git_dir()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
P
eter Er
i
kse
n
[PATCH] M
a
ke the test
m
ore s
h
ell generic a
n
d fix
m
issing
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Junio C Hamano
Really
requ
i
re tk 8
.
4 (RPM)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Junio
C Hamano
Require
tk 8
.
4 (R
P
M)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Junio
C Haman
o
Merge
http://www
.
kernel
.
org/pub/sc
m
/gitk/gitk
commit
|
commitdiff
|
tree
2005-09-27
J
un
i
o
C Hamano
git-fetch
:
send informational output to >&2 co
n
sistent
l
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Junio C Hama
n
o
Gi
v
e
default merge
message af
t
er failed auto
m
erge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
J
unio
C
H
amano
Do
n
ot requ
i
re clean
tree when
r
everting and cherry
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Junio C
Hamano
Fix
overze
a
l
o
us cleanliness
check in git-merge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Junio C Hamano
git-clon
e
:
che
c
k out
"mas
t
e
r" by default
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-26
Junio C Hamano
Plug a small race in
up
d
ate-ref
.
c
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Linus Torvalds
[P
A
TCH
]
Add "git-
u
pd
a
t
e-r
e
f" to update the HEAD (or
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Fredri
k
Kui
v
inen
[
PA
T
CH] More descri
p
t
ive mess
a
ges for con
f
lict cas
e
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Fredr
i
k Kuivinen
[
P
ATCH] recursive-me
r
ge: D
o
n'
t
print a stac
k
trace
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Junio C
H
amano
D
i
ff: --na
m
e
-status outp
u
t
f
ormat
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Junio C H
a
mano
D
i
f
f
: -l<num> to limit rename/c
o
py
d
e
tectio
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Jun
i
o C Hamano
Diff cl
e
a
n
-u
p
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Junio C Hamano
Mer
g
e bra
n
ch '
f
ixes'
commit
|
commitdiff
|
tree
2005-09-25
Junio C H
a
mano
Clean g
e
n
e
r
ated f
i
les a bit more
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Jun
i
o
C Ha
m
ano
S
top installing th
e
ba
c
kward
c
ompati
b
l
e
s
ymlinks
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Junio C Hamano
show-branch: fix comm
i
t naming breakage
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Daniel
Barkalow
[PATCH] Finish docume
n
ting trivi
a
l merge rules
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C H
a
mano
g
i
t-grep: fix 'git grep -e $p
a
tt
e
rn' handling
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C
H
amano
Remove use of 'xarg
s
-0' from g
i
t-reset
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C
Ham
a
no
U
s
e 0
.
9
9
.
7
.
GIT as ve
r
sion between
0
.
9
9
.
7 an
d
0
.
99
.
8
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Haman
o
Solaris: give a bit more buil
t
-in defaults
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Patrick Mauritz
[PATCH] CU
R
L
D
IR in Makefile
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Petr Bau
d
is
[PA
T
CH] Rename daemon
.
c's lo
g
n
o
tice() to
loginf
o
()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Petr Baud
i
s
[PATCH]
g
i
t
-d
a
emon --sys
l
og
t
o
log through syslog
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Petr Bau
d
is
[PATCH] Update git-daemon
documen
t
at
i
on wrt
.
the -
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Hama
n
o
R
e
a
lly ignore generated distribution material
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Ju
n
io C Hamano
daemon
.
c: pid_t is not int
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C H
a
mano
Me
r
ge 'fixes'
b
ranch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C
H
amano
Fu
r
ther clarify
licensing status
of
compa
t
/subproc
e
ss
.
p
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
H
.
Pet
e
r
A
nvin
[PAT
C
H] rsh
.
c untermin
a
ted st
r
ing
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Sergey Vl
a
sov
[PATCH] git-local-fetch: Av
o
id conf
u
sing error mess
a
ges
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Sergey Vlasov
[PATCH] Fi
x
"git-l
o
cal-fetc
h
-s"
w
ith packed source
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Sergey Vlasov
[PATCH
]
git-local-fetch: Avo
i
d c
a
lling clos
e
(-1)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Serge
y
Vlasov
[PATCH]
gi
t
-loca
l
-fetch: Fix
er
r
or checking and
leak
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Sergey Vlas
o
v
[
P
ATCH] f
e
tch
.
c: P
l
ug memory
l
e
ak
i
n proc
e
s
s_
t
ree()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Sergey V
l
a
s
ov
[
P
A
TCH] fetch
.
c: Do not buil
d
ob
j
ect
ref lists
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Robert Watson
[
P
ATCH]
d
o
cument
c
o
mmand to
s
how diff of a commit
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Junio C Hama
n
o
Ign
o
re a
bit more genera
t
ed fi
l
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Junio C Ha
m
ano
M
e
r
g
e branch 'fixes'
commit
|
commitdiff
|
tree
2005-09-23
Junio
C
Hamano
Make 'git diff --
c
ached' synony
m
ous to
'git di
f
f -
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Sergey Vlasov
[PAT
C
H]
fetch
.
c: Remove call to parse_object() from
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Sergey V
l
aso
v
[PATCH] fet
c
h
.
c: Clean
up object flag definitio
n
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
S
e
rgey Vla
s
ov
[PATCH] fe
t
c
h
.
c: Remo
v
e
r
edundant test of
TO
_
S
C
A
N in
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Sergey
Vlasov
[PATCH] fetch
.
c: Remove some duplicated co
d
e in proc
e
ss()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Sergey Vlasov
[P
A
TCH] fetch
.
c: Rem
o
ve
r
e
dundant TO_FET
C
H
flag
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Sergey Vlasov
[PATCH
]
fetch
.
c:
R
em
o
ve redundant
S
CANNED flag
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Sergey Vlas
o
v
[P
A
TCH]
f
etch
.
c: Ma
k
e pro
c
e
s
s() look at ea
c
h
o
b
ject
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Sergey V
l
asov
[PA
T
C
H]
f
etch
.
c: Remove useless lookup_o
b
je
c
t_
t
ype
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Jun
i
o C Hamano
Do n
o
t give alarming error mes
s
age fr
o
m r
s
ync in
fetch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Jon
Loeliger
[
PATC
H
] Retit
l
e
'
ins
p
e
c
t
ing what happened' sect
i
on
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Junio C Ha
m
ano
P
r
e
ttyprint octopus merge me
s
sage
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Petr Baudis
[PATCH] Verbose git-daemon logging
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-22
Jun
i
o
C Hama
n
o
Retire di
f
f-helper
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-22
Junio
C Hamano
Retire rev-tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-22
Juni
o
C Hamano
Retire g
i
t
-export
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-22
Linus To
r
vald
s
[
PATCH]
F
ix strang
e
timez
o
ne handling
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
Revert
"Use
git-m
e
rge
instead of git
-
res
o
lv
e
in git
.
.
.
commit
|
commitdiff
|
tree
2005-09-21
Jun
i
o C Hamano
Rev
e
r
t "Make Oc
t
opu
s
merge
m
es
s
ag
e
a
bit nicer
.
"
commit
|
commitdiff
|
tree
2005-09-21
Se
r
g
e
y Vl
a
sov
[
PATCH] fetch
.
c: Remove
call to pa
r
se_o
b
j
e
c
t
(
)
from
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Sergey V
l
asov
[PATCH
]
fetch
.
c: Clean
up object flag definitions
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Sergey
V
l
asov
[
P
A
TCH]
f
etch
.
c
:
Remove redu
n
dant
t
est of TO_S
C
A
N
in
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Se
r
gey Vlasov
[
PATCH] fetch
.
c: Remove some duplica
t
ed code i
n
proc
e
ss(
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
S
er
g
ey Vlasov
[PATCH] fetch
.
c: Re
m
ove
r
edundant
T
O_FETCH flag
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
S
e
rgey Vlasov
[PATCH] fetch
.
c: Remove
redundant SCANNED f
l
ag
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
S
e
rge
y
Vla
s
ov
[PATCH] fetch
.
c:
M
ak
e
p
r
ocess(
)
look at ea
c
h
object
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Sergey Vlasov
[PATCH] fe
t
ch
.
c: Remo
v
e useless
l
ookup_object_type
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Ham
a
no
Merge branch 'fixes'
commit
|
commitdiff
|
tree
2005-09-21
Junio C Ha
m
ano
F
i
x d
o
cum
e
nt
a
tion
d
ependency
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Jun
i
o
C
Hamano
Make object creation in http fetch a bit safer
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Juni
o
C Haman
o
Clarify dual lice
n
se st
a
tus of subprocess
.
py fi
l
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Ju
n
io
C Ha
m
ano
Upda
t
e tutorial
with Octopus u
s
a
g
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
J
u
nio C Hamano
Make Octopus merge me
s
sage a bit nicer
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
Use git-merge instead
o
f
git-resolve in git-pull
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Linus Torvalds
Make ti
m
e-based
c
ommi
t
fi
l
tering
work with topological
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Linus
Torvalds
[PATCH]
T
each "git
-
re
v
-parse" ab
o
ut dat
e
-based cut
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
N
icolas Pit
r
e
[PATCH] ARM
o
ptimiz
e
d SHA
1
impl
e
men
t
ation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Petr Baudis
[PATCH] Ma
k
e the git-fsc
k
-objects d
i
agnostics
m
ore
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio C
H
amano
Do not give alarming error me
s
sage from rsy
n
c in fetch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Linus T
o
rvald
s
[PATCH] Ret
u
r
n
p
roper er
r
or valud from "p
a
rse_date
(
)"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Ha
m
ano
Show
modified files
i
n g
i
t-ls-files
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Hama
n
o
Fast-pat
h
'update-inde
x
--refr
e
sh' a b
i
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Hama
n
o
U
s
e GECOS f
i
eld a bit bette
r
to produc
e
default h
u
m
a
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio
C Hamano
Document -i flag to
gi
t
-read-tree
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Sergey
Vlas
o
v
[PATCH] Documentation: Upda
t
e
all files to use the
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Serg
e
y Vlas
o
v
[PATCH]
D
o
c
u
m
e
n
tation: Add a
s
ciidoc
.
con
f
file an
d
gi
t
li
n
k
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Lin
u
s Tor
v
a
l
ds
Fix exte
n
de
d
s
h
or
t
SHA1 name comple
t
i
o
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Ha
m
ano
S
h
ip our own copy
o
f
subprocess
.
py
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
J
u
nio C Hamano
s
h
ow-bran
c
h: Be nicer when r
u
nn
i
ng i
n
a cor
r
upt
r
epo
s
itory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Pet
r
Baudis
[PATCH] F
i
x git-init-db creat
i
n
g
crap directories
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next