repo.or.cz
/
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-mer
g
e in git-pull (se
c
ond
t
ry)
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-28
Junio C
H
amano
Use git-upda
t
e
-re
f
in scripts
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-28
Peter Hagervall
[PATCH]
M
a
k
e some ne
e
dlessly
g
lobal
s
t
uff
static
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-28
N
ic
k
H
e
ngeveld
[PATCH] Su
p
por
t
for more CURL SSL se
t
t
i
ngs via environment
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-28
Tom
P
rinc
e
[PATCH] Add ne
w
pro
g
rams to
.
gitignore
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-28
Junio
C
H
amano
F
a
s
t
pat
h
the normal
case by not checking
that index
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-28
Junio
C
Hamano
Fix default
pull not
to do a
n
u
n
inte
n
ded Octop
u
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-28
J
u
n
io C Hamano
Update the case table
i
n t/t10
0
0
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-28
Junio C Hamano
Me
r
ge mast
e
r
.
k
e
rnel
.
org:/home/hpa/git
/
d
a
e
mon
commit
|
commitdiff
|
tree
2005-09-27
J
u
nio C Ham
a
no
git-
c
ommit:
u
s
e update-index --stdi
n
,
i
nstead o
f
xarg
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
J
unio
C Hama
n
o
u
pdate-index
:
docum
e
nt --stdin and -z
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
Junio C Ham
a
no
u
p
date-
i
ndex: -
-
std
i
n
and -z
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
Nick H
e
ngeveld
[PATCH]
R
eturn CURL error me
s
s
age when obje
c
t tran
s
fer
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
Daniel
Bar
k
alow
[PATCH]
I
m
plem
e
nt --recove
r
fo
r
git-*-fetc
h
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
Sven V
e
rdool
a
ege
[PATCH] Pro
v
ide access to git_dir through get_git_dir()
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
Pete
r
Er
i
ksen
[
PAT
C
H] Make the test more shell generic
a
nd fix missi
n
g
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
J
u
nio
C
Ham
a
no
Really r
e
quire tk 8
.
4 (RPM)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
Junio C
H
amano
Re
q
uire tk 8
.
4 (RPM)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
Junio C Hamano
Mer
g
e http://www
.
kernel
.
org/pub/scm/g
i
tk/
g
itk
commit
|
commitdiff
|
tree
2005-09-27
Junio
C
H
a
mano
git-fetch:
s
end informa
t
i
ona
l
o
utpu
t
to >&2
c
onsistently
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
Junio C
H
amano
Give default
m
erg
e
m
essage
a
fter failed automerge
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
J
unio C Hamano
Do n
o
t
require clean
t
ree whe
n
reverting and cherry
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
Ju
n
io C Ha
m
ano
Fi
x
overze
a
lous cleanline
s
s check in git
-
merge
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
J
u
nio
C Ha
m
ano
g
i
t
-clone: chec
k
out
"mas
t
er" by defa
u
lt
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-26
Junio C Hamano
Plug a
s
ma
l
l
r
a
ce i
n
upda
t
e-ref
.
c
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
Linus Torvalds
[PA
T
CH]
A
dd "git-update-ref" to
update
t
he
HEAD (or
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Ku
i
vinen
[
P
ATCH]
More des
c
riptiv
e
messages for confl
i
ct cases
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
F
r
e
drik Kuivi
n
en
[PATCH] rec
u
rsi
v
e-
m
erge: Don
'
t
print a stack trace
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
Junio C Hamano
D
i
ff
:
-
-
name-status out
p
ut forma
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
J
unio
C Hamano
Diff: -l
<
n
u
m>
t
o limit
rename/copy detection
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
Junio C
H
a
m
ano
Diff
clean-
u
p
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
J
u
nio C Hamano
M
e
r
g
e branch
'fixes'
commit
|
commitdiff
|
tree
2005-09-25
Ju
n
io C Hamano
Clea
n
generated fi
l
es
a
bit more
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
Junio C Hamano
Stop installing the backward compatible
s
ymlin
k
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
Junio C
H
am
a
no
show-branch:
f
ix commi
t
n
aming breakage
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
Dani
e
l Bar
k
alow
[PATCH] Finish documenting trivial merge rules
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Hamano
git-grep:
fix 'git
grep
-
e $pattern' handling
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Ju
n
io C Hamano
Remove use of '
x
a
r
gs
-0' from
git-
r
eset
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
J
un
i
o
C
Ha
m
ano
Use 0
.
99
.
7
.
GIT as version be
t
wee
n
0
.
99
.
7 a
n
d 0
.
9
9
.
8
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Jun
i
o C Hamano
Solaris: give a bit
m
o
r
e bu
i
lt-in defaults
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Patrick Mauritz
[PATCH] CURLDIR in Ma
k
efile
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Petr Baudis
[P
A
TCH
]
Ren
a
me
d
a
e
mon
.
c's log
n
otice
(
)
to
l
o
ginfo()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Petr Baudi
s
[PATCH] git-d
a
em
o
n --syslog to log
t
hrough syslog
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Petr B
a
udis
[PATC
H
] U
p
date g
i
t-daemon
docu
m
entation wrt
.
th
e
-
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Jun
i
o C Hamano
Reall
y
ig
n
ore generated dist
r
ibuti
o
n material
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Hamano
daemon
.
c:
p
id_t is not int
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Junio
C Hamano
M
er
g
e 'fi
x
e
s'
bra
n
ch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Hama
n
o
F
urther cla
r
ify lice
n
sing st
a
tus o
f
compat/subprocess
.
py
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
H
.
P
e
ter
Anvin
[
P
A
T
CH]
rsh
.
c unterminated st
r
ing
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Sergey Vlasov
[PAT
C
H] git-
l
ocal-f
e
tch: Av
o
id confu
s
ing e
r
ror messages
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Sergey Vlasov
[PATCH]
F
i
x
"
g
it-local
-
f
etch -s" with packed s
o
u
rce
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Sergey Vlasov
[PATCH] git-
l
ocal-fetch: Avoid calling close(-1)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Se
r
gey V
l
asov
[PATCH]
g
it-local-fetch: Fix error checking
and leak
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Serg
e
y Vl
a
so
v
[PATC
H
] fetch
.
c: Plug
m
emor
y
l
eak in process
_
tree()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Ser
g
e
y
Vl
a
sov
[PA
T
CH] fetch
.
c
:
Do not b
u
ild
object
r
ef
lists
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
R
o
b
er
t
Wat
s
on
[PATCH] documen
t
com
m
and to show di
f
f of a co
m
mit
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Junio C Haman
o
Ignore a bit more generated files
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Junio C Hamano
Merge branc
h
'fixes'
commit
|
commitdiff
|
tree
2005-09-23
Juni
o
C H
a
ma
n
o
Make 'git diff -
-
cached' sy
n
onymous to 'git
d
iff -
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
S
ergey Vl
a
sov
[PATCH] fetch
.
c: Remove call to parse_object() from
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Serg
e
y
Vlaso
v
[
PATCH] fe
t
ch
.
c: C
l
ean up ob
j
ect flag de
f
initions
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Se
r
gey Vlasov
[PATCH] fet
c
h
.
c: Rem
o
ve
redund
a
nt test o
f
TO_SCAN in
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Sergey
V
l
asov
[PATCH] fetch
.
c: Remo
v
e some duplica
t
ed code in process()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Se
r
g
e
y
Vla
s
ov
[PA
T
CH] fetch
.
c:
Remove redundant TO_FETCH f
l
ag
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Se
r
gey Vlasov
[P
A
TCH] fetch
.
c: Remo
v
e
r
edun
d
ant SCA
N
N
E
D
fla
g
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
S
e
rgey Vlasov
[PATC
H
] fetch
.
c: Make proce
s
s() look at e
a
ch object
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Sergey Vl
a
sov
[PATCH
]
fetch
.
c
: Remove useless lookup_obj
e
ct
_
type
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Junio C Hamano
Do not
give alar
m
ing
e
r
r
or mess
a
ge from rsync in
f
e
tch
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Jon
L
oeliger
[PATCH] R
e
title 'inspecting what
happened' section
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Jun
i
o C Hamano
Prett
y
pr
i
nt octopus merge message
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
P
etr Bau
d
is
[PA
T
CH]
Ver
b
ose git-daemon logging
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-22
J
u
n
io C Hamano
Retire
d
iff
-
hel
p
er
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-22
Junio
C Ha
m
a
n
o
Re
t
ire
r
e
v-tree
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-22
Junio C Haman
o
Retire git-export
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-22
Linus Torvalds
[PATCH] Fix strange t
i
m
ezon
e
handling
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
Revert "Use git-merge i
n
stead of git-resol
v
e i
n
g
it
.
.
.
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
Revert "Make Octopu
s
m
erge message a
bit nicer
.
"
commit
|
commitdiff
|
tree
2005-09-21
Serg
e
y
V
lasov
[PATCH] fetch
.
c:
Remo
v
e call
t
o parse_object() from
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Sergey Vlasov
[
P
ATCH] fet
c
h
.
c: Clean up o
b
je
c
t flag definitions
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Serg
e
y
V
l
as
o
v
[PATCH]
fetch
.
c: Remove redundant tes
t
of TO_SCAN in
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Sergey Vlaso
v
[PATCH] fetch
.
c: Remove so
m
e duplicated co
d
e i
n
process()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Serg
e
y V
l
a
s
ov
[
PATCH] fetch
.
c: Remove redund
a
nt TO
_
FETCH fl
a
g
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Sergey Vla
s
ov
[PATCH] fetch
.
c: R
e
move re
d
undant SCANNED flag
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Sergey
Vlasov
[PATC
H
]
f
etc
h
.
c:
Ma
k
e process() look at ea
c
h object
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
S
ergey Vlasov
[PAT
C
H] fet
c
h
.
c: Remove useless l
o
okup_object_type
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Junio C
Hama
n
o
Merg
e
b
r
a
nch 'f
i
xes'
commit
|
commitdiff
|
tree
2005-09-21
Jun
i
o
C
Ha
m
ano
Fix documenta
t
ion
d
epende
n
cy
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Juni
o
C Ha
m
ano
Make
o
b
ject creati
o
n
in http
f
e
t
ch a bit safer
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Jun
i
o C Hama
n
o
Clarify dual license status of subp
r
ocess
.
py fil
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
Update
tutorial
w
ith Octop
u
s usage
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Juni
o
C Hamano
Make Octopu
s
merge
m
e
ss
a
ge a bit
nicer
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Junio C
Hamano
Use gi
t
-merge in
s
t
e
ad
o
f git-resolv
e
in git-pull
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
L
inus Torva
l
ds
M
a
ke time-b
a
s
e
d commit f
i
ltering work with topologi
c
al
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Linus Torvalds
[
P
AT
C
H]
T
each "g
i
t-rev-parse
"
abo
u
t d
a
te-based c
u
t
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Nicolas Pitre
[PATCH] ARM o
p
timized SH
A
1 im
p
lementation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Petr Baudis
[P
A
TCH] Make the git-fsck-objects diagnostics more
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
J
uni
o
C
H
amano
D
o
not give alarming error message from rsync in
fetch
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Linus Torvalds
[PATCH] Return pro
p
er
e
r
ror valud from "parse_d
a
te()"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Hamano
Show modi
f
ied files in git-ls-files
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Hamano
Fast-path 'update-
i
ndex --r
e
fresh' a bit
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next