repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Use git-merge in git-pull (second try).
2005-09-29
Junio C Hamano
Use git-merge in
git-pull (second try)
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-28
Junio C Haman
o
Use
git
-
update-r
e
f in scripts
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-28
Peter
H
ager
v
a
l
l
[PATC
H
] Make s
o
me needlessly globa
l
st
u
ff st
a
tic
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-28
Nick
H
engeveld
[PATCH] Suppo
r
t f
o
r
more CURL SSL settings via e
n
v
ironment
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-28
Tom
P
rince
[PATCH] Add new pro
g
rams to
.
gitignore
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-28
Junio C Hama
n
o
F
a
stpath
the n
o
rmal case
b
y not ch
e
cking
that index
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-28
Junio C Hamano
Fix defau
l
t pull
not
t
o do an unintended Oc
t
opus
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-28
Junio
C Hamano
Upd
a
te th
e
ca
s
e t
a
ble in t/
t
1
000
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-28
Jun
i
o C
H
amano
Merge m
a
ster
.
kerne
l
.
o
r
g:/home/hpa/git/d
a
emon
commit
|
commitdiff
|
tree
2005-09-27
Junio C
H
a
m
ano
git-
c
ommit:
use
update-i
n
dex --stdin, instead of
x
args
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
Junio C
H
a
m
ano
upd
a
te-ind
e
x
: document --st
d
in and -z
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
Junio C Hamano
upd
a
te-index: --stdin and -z
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
Nick
H
engeveld
[P
A
TCH] Return
C
U
RL erro
r
mes
s
age wh
e
n ob
j
ect tr
a
nsfer
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
Daniel Barkalow
[PATCH] Imp
l
emen
t
--recover
for git-*-fetch
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
Sven Verdoolaege
[PATCH
]
Pro
v
ide access
t
o git_dir th
r
ough g
e
t_git_dir()
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
P
e
ter E
r
iksen
[
P
A
T
CH] M
a
ke the t
e
s
t more shell generic and f
i
x mi
s
sin
g
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
Jun
i
o C Hamano
Really require tk
8
.
4
(
RPM
)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
Junio C
H
amano
Require
tk
8
.
4 (RPM)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
Junio C Ha
m
ano
Merge
h
t
tp://www
.
kerne
l
.
org/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2005-09-27
J
u
nio
C
H
a
m
ano
git-fetc
h
: send informational output
to
>&2 consi
s
ten
t
ly
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
Junio C
H
a
ma
n
o
Give
d
efault merge message aft
e
r fail
e
d auto
m
erge
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
Junio C Hamano
Do not req
u
ire
c
lea
n
t
r
ee when reverting
a
n
d
cherry
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
Junio C Ham
a
no
Fix overzealo
u
s c
l
e
anliness
check in git-merge
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
Junio
C Hamano
gi
t
-clon
e
: check out
"
m
aster" by default
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-26
Ju
n
io C
H
a
m
a
n
o
Plu
g
a sm
a
ll race in update-ref
.
c
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
Linus Torva
l
ds
[PATCH] Add "git-
u
pdate-re
f
" to
update the HEAD (
o
r
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik K
u
ivin
e
n
[PA
T
CH
]
More
descriptive
m
essages fo
r
con
f
lict cases
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
Fredri
k
Kuivinen
[PAT
C
H] recursive-
m
e
r
ge: D
o
n't p
r
i
nt a stack trace
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
Junio C Hamano
D
iff: --name-status out
p
ut format
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
J
unio C Hama
n
o
D
i
ff: -l<
n
um>
to limit rename/copy de
t
ect
i
on
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
Junio C H
a
m
a
no
Diff clean-up
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
Junio C H
a
m
an
o
Merge b
r
anch 'fixes'
commit
|
commitdiff
|
tree
2005-09-25
Junio C
H
a
mano
C
l
ean
gener
a
ted files
a
bit more
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
J
u
nio C Hamano
Stop installin
g
the backward co
m
pat
i
ble symlinks
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
Junio C H
a
m
ano
show-branch
:
fix
c
ommit nami
n
g breakag
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
Daniel Barkalow
[P
A
TCH] Finish do
c
u
m
e
nting trivial merge rules
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Junio C
Hamano
gi
t
-grep: fix '
g
i
t
grep -e $pattern
'
handli
n
g
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
J
unio C Ha
m
ano
Remove use of
'
xargs -0' fr
o
m
git-rese
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Hamano
Use 0
.
99
.
7
.
GIT
as ve
r
s
i
on bet
w
een 0
.
99
.
7
an
d
0
.
99
.
8
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Juni
o
C Hamano
Solaris:
g
i
v
e a bit more built-in defaults
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Pa
t
rick Mauri
t
z
[PA
T
CH] CURLDIR in Makefile
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Petr
B
audis
[P
A
TCH] Ren
a
me daemon
.
c's lo
g
notice() to lo
g
info()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Petr Baudis
[PATC
H
] git-daemon --syslog to log through
syslog
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Petr Baudi
s
[
P
ATC
H
]
U
p
d
ate gi
t
-
daemon documentation wrt
.
t
he -
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
J
u
nio C Hamano
Really ign
o
r
e generated
d
i
stribut
i
o
n materia
l
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Hamano
d
a
emon
.
c: pi
d
_t is not
int
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
J
u
nio C H
a
ma
n
o
Merge '
f
ixes'
b
ranch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Junio
C
H
amano
Fur
t
her
clarify licensing status of compat/subpr
o
cess
.
py
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
H
.
Peter
Anvin
[PATCH] rsh
.
c unte
r
minat
e
d string
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Sergey V
l
as
o
v
[PATCH] git-local
-
fetch:
Avoi
d
confusing error mess
a
ges
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
S
e
rgey
V
lasov
[PATCH] Fix
"git-loc
a
l
-
fe
t
ch -
s
" with packed source
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Se
r
gey Vlasov
[PATCH] git-
l
ocal-fetch: Avoi
d
calli
n
g
clo
s
e(-1)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Serge
y
Vla
s
ov
[
P
ATCH] gi
t
-l
o
cal-fe
t
ch
:
Fix error checking a
n
d
lea
k
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Serg
e
y Vlasov
[PATCH]
fetch
.
c
:
P
l
ug mem
o
ry l
e
ak in proce
s
s_
t
ree()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Se
r
gey Vl
a
so
v
[
PATCH
]
fetch
.
c: Do not build ob
j
e
ct ref lists
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Robe
r
t Watson
[
P
ATCH] docu
m
ent
c
ommand
t
o
s
how d
i
f
f
of a commit
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Junio C Hama
n
o
Ignore a bit more generated files
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Juni
o
C
Hamano
Merge branch
'f
i
xes'
commit
|
commitdiff
|
tree
2005-09-23
Juni
o
C Hamano
Make 'g
i
t di
f
f -
-
cached' synonymou
s
to 'git diff -
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Ser
g
e
y
V
l
asov
[PATCH] fetch
.
c: Remove ca
l
l
to
p
arse_
o
bject() from
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Sergey Vl
a
s
o
v
[PAT
C
H]
f
e
tch
.
c:
C
lean up ob
j
ect fla
g
definitions
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Sergey
V
lasov
[P
A
T
C
H
] fetch
.
c: Remove r
e
dundant test of
T
O_SCAN in
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Sergey Vlasov
[PATCH] fetch
.
c: Remove
some
d
uplicated c
o
de in process()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Sergey Vlasov
[
P
A
TCH]
f
e
tch
.
c: Remo
v
e redun
d
ant TO
_
FET
C
H
f
l
ag
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
S
e
rge
y
Vlasov
[PATCH]
fet
c
h
.
c
:
Re
m
ove redundant SCANNED
flag
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Sergey Vlasov
[PATC
H
]
fetch
.
c:
Make proc
e
ss(
)
lo
o
k at each ob
j
ect
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Sergey Vl
a
sov
[PATCH] fetc
h
.
c: Remove
usele
s
s lookup_objec
t
_type
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
J
unio C Haman
o
Do no
t
give a
l
arming error messa
g
e from r
s
ync in fetch
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Jon Loeliger
[PAT
C
H] Reti
t
le 'inspecting what happened' section
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Junio C Ha
m
ano
Prett
y
print octopus merge
message
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Petr Baudi
s
[PATCH] Verbose gi
t
-
daemon logging
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-22
Junio C
H
amano
Retire di
f
f-helpe
r
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-22
Junio
C
Ha
m
a
n
o
Retire rev-tree
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-22
Juni
o
C Hamano
R
e
tire git-ex
p
ort
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-22
Linu
s
Torvald
s
[
P
ATCH] Fix
s
t
r
ange t
i
mezone handlin
g
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Ha
m
an
o
Revert "Use git-me
r
ge instead of
g
it
-
resolve in
git
.
.
.
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
Revert "Make Octopus me
r
ge me
s
s
a
g
e a b
i
t ni
c
e
r
.
"
commit
|
commitdiff
|
tree
2005-09-21
Se
r
g
ey Vlas
o
v
[P
A
TCH]
f
e
t
c
h
.
c:
Remove call to parse_obje
c
t
(
)
fro
m
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Sergey Vlasov
[PATCH]
f
etch
.
c: Clean u
p
ob
j
ect fl
a
g definitions
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Sergey Vla
s
o
v
[PATCH] fetch
.
c: Remove
r
e
d
u
nd
a
n
t
test of TO_
S
CA
N
in
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
S
e
rgey
Vlaso
v
[PATCH] fetch
.
c
:
Re
m
ov
e
some d
u
plicat
e
d co
d
e
in process()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Se
r
gey Vl
a
sov
[PATCH] fetch
.
c
:
Remove redundant TO_FET
C
H
f
l
a
g
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Sergey Vlasov
[P
A
TCH] fe
t
c
h
.
c: Rem
o
v
e
redundant
S
CANNED fl
a
g
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
S
ergey Vl
a
sov
[PATCH] fetc
h
.
c: Make
p
rocess() lo
o
k at ea
c
h object
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
S
e
rge
y
Vlas
o
v
[PAT
C
H] fetch
.
c: Remov
e
u
s
eless loo
k
up_object_type
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Junio
C
Hamano
Merge b
r
a
n
ch 'fix
e
s
'
commit
|
commitdiff
|
tree
2005-09-21
J
u
nio C Hamano
Fix do
c
umentation
d
ependency
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
J
unio C Hamano
Make o
b
j
e
ct creat
i
on in http fetch a bi
t
s
afer
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Juni
o
C
H
a
m
ano
Clarify dual lice
n
se status
of sub
p
rocess
.
p
y file
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
Update tuto
r
ial with Oct
o
pus
us
a
g
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
Make Octopus
m
erge messag
e
a bit nicer
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Juni
o
C Ha
m
a
no
Use git-mer
g
e instead
of
g
it-re
s
o
l
ve in git-pull
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
L
i
nu
s
T
o
r
valds
Make time-based commit filtering wo
r
k
with topolo
g
ical
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Linus Torvalds
[PATCH] Teach "git-rev
-
p
a
r
s
e
" about d
a
te-based cut
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
N
i
colas Pitr
e
[
PATCH] ARM optimized SHA1 imple
m
entation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Petr Baudis
[PATCH] Make the
g
it
-
f
sck-ob
j
ec
t
s
diagnostics more
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Hamano
Do
n
o
t give alarming error message fro
m
rsync in fetc
h
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
L
i
nus Torvalds
[PATCH
]
R
eturn proper er
r
or
v
a
lud fr
o
m "parse_da
t
e()"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
J
u
nio
C
Ham
a
no
Show modified
files in git-ls-f
i
les
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Junio C H
a
mano
Fast-path
'
update-index --refr
e
sh' a b
i
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next