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
Juni
o
C
H
amano
U
s
e
g
it-merge in git-pull
(
s
econd try)
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-28
Junio C Hamano
U
se gi
t
-
u
pdate-ref in sc
r
ipt
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-28
Peter Hagerval
l
[
PATCH
]
Make som
e
needless
l
y
global stuff static
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-28
Nick Hengeveld
[PATCH] Support for more
C
URL
SS
L
setting
s
via environment
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-28
T
om Prince
[PATCH] Add new programs to
.
giti
g
nore
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-28
J
u
nio
C H
a
mano
Fastp
a
th the no
r
mal
c
ase by not check
i
ng
that index
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-28
J
u
nio C Hamano
Fix default pull not to d
o
an unintended Octop
u
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-28
Junio
C Hama
n
o
Up
d
ate
t
he case table
in t/t1
0
00
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-28
Junio
C
Hamano
Merg
e
master
.
ker
n
e
l
.
or
g
:/home/hpa
/
g
it/dae
m
on
commit
|
commitdiff
|
tree
2005-09-27
Jun
i
o
C Haman
o
gi
t
-
commit: use update-ind
e
x
--st
d
in, instead of xargs
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Ju
n
i
o C
H
am
a
no
update-index: docume
n
t -
-
stdin and -z
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
J
unio
C Hamano
update
-
i
n
dex: --stdin
a
nd -z
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Nick
H
engev
e
ld
[PATCH] Retur
n
CURL error messa
g
e
wh
e
n object t
r
ansfer
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Daniel Barkalow
[PATCH
]
Impleme
n
t --
r
e
c
over for gi
t
-*-fetch
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
S
v
en Verdoolaege
[PATCH] Provide acc
e
ss to git
_
d
ir thr
o
u
gh get_gi
t
_
dir()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
P
eter Eriksen
[PATCH] Make the tes
t
m
ore s
h
ell gene
r
ic and fix missing
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Junio
C Ha
m
ano
R
eally require tk 8
.
4 (RPM
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
J
u
nio C
Hamano
Re
q
uire tk 8
.
4 (RP
M
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Ju
n
i
o
C
H
a
m
ano
M
e
rge http://w
w
w
.
kernel
.
org
/
p
ub/s
c
m/gitk/gitk
commit
|
commitdiff
|
tree
2005-09-27
Junio
C
Hamano
git-fetch: se
n
d info
r
mational output to
>
&2
c
onsistently
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
J
unio C
H
a
man
o
Gi
v
e
default
merge mess
a
ge aft
e
r failed aut
o
merge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Junio C Hamano
Do no
t
require
c
lean tree whe
n
reverting
a
nd
c
h
erry
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Junio C Hamano
F
i
x overzealo
u
s cleanliness check in g
i
t-merge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Junio C Hamano
git
-
c
l
one: check
out "master" by d
e
fault
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-26
Ju
n
io C Hamano
P
l
ug a small race in update-ref
.
c
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Linus Torvalds
[
PATCH] A
d
d "git-upda
t
e
-ref"
t
o
update the HEAD
(
or
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
F
r
edrik Kuivinen
[PA
T
CH] Mor
e
descripti
v
e messages
f
or conf
l
i
ct cases
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Fre
d
rik Kuivinen
[PAT
C
H
] recursive-mer
g
e
:
D
on't print a stack
tr
a
ce
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Junio C Hamano
Diff: --name-sta
t
us o
u
tput format
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Ju
n
io C Ham
a
no
Diff:
-
l<num> to limit
rename/c
o
py det
e
cti
o
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Junio
C Hama
n
o
Diff clean-u
p
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Junio C H
a
mano
Merge
branch
'
fixes'
commit
|
commitdiff
|
tree
2005-09-25
Junio C H
a
man
o
C
l
e
an generated fi
l
es a bit more
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Jun
i
o C
H
ama
n
o
Stop installi
n
g the
b
ackward c
o
mp
a
tible sym
l
inks
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Junio
C
Hama
n
o
show-branc
h
: fix commit n
a
mi
n
g breakage
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Daniel Barkalow
[PATCH] Fin
i
sh documenting trivial merge rules
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Hama
n
o
git-grep:
fix 'git grep -e $p
a
ttern' han
d
ling
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Juni
o
C
H
a
mano
Remove use
o
f 'xargs -0' from git-reset
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Jun
i
o C Hamano
U
s
e 0
.
9
9
.
7
.
GIT as version
between
0
.
9
9
.
7 a
n
d 0
.
99
.
8
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
J
u
n
io C
H
amano
S
o
laris: g
i
ve
a
b
i
t
more
built-in defaults
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Patrick Maurit
z
[
P
A
TCH] CURLDIR in Mak
e
file
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Petr
Baudis
[PAT
C
H] Rename daemon
.
c's lognoti
c
e
(
)
t
o lo
g
info()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Petr Baudis
[PATCH] git-
d
aemo
n
--syslog to l
o
g through syslog
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Petr Baudis
[PAT
C
H] Update g
i
t-daem
o
n documentation w
r
t
.
the -
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Hamano
Really ignore
generated
d
is
t
ributi
o
n materia
l
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Hama
n
o
d
aemon
.
c:
p
id_t is no
t
in
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Ha
m
ano
Mer
g
e '
f
ixes' bran
c
h
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Ju
n
i
o
C
Hamano
F
u
rther clarify
licen
s
in
g
status of compat/
s
ubproce
s
s
.
p
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
H
.
Peter Anvin
[
P
ATC
H
] rsh
.
c un
t
e
rminated str
i
n
g
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Serge
y
V
lasov
[PATCH] git-local-fetch: A
v
oid c
o
n
f
usi
n
g error message
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Sergey Vlasov
[
PATCH] Fix "git-lo
c
a
l-fetch
-s" wi
t
h
packe
d
sou
r
ce
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
S
e
rgey Vla
s
ov
[
PATCH] git-
l
ocal-fe
t
c
h:
A
void call
i
ng
close(-
1
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
S
e
rgey Vlasov
[PATCH] git-loca
l
-fetch: Fix erro
r
checking and
leak
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Sergey Vlasov
[PATCH] fetch
.
c: Plug memor
y
leak in process_tree
(
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
S
e
rgey Vlasov
[
PAT
C
H]
fetch
.
c:
Do not build object ref lis
t
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
R
obert
W
a
t
s
on
[PATCH] document command to show di
f
f of a commit
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Jun
i
o C Hamano
Ignore a bit m
o
r
e
gener
a
ted f
i
l
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Junio C Hamano
Me
r
g
e branc
h
'
f
ixe
s
'
commit
|
commitdiff
|
tree
2005-09-23
J
u
nio C Hamano
Ma
k
e 'git
d
i
ff --cached
'
synonymo
u
s to 'git diff -
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
S
ergey Vlasov
[PATC
H
]
f
etch
.
c:
R
emove ca
l
l to parse_object() f
r
om
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
S
ergey Vlasov
[PAT
C
H] fetc
h
.
c
: Clean up ob
j
e
c
t fla
g
d
ef
i
nit
i
ons
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Sergey V
l
asov
[PAT
C
H] fetch
.
c:
R
emo
v
e redundant test of TO_SCAN in
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Sergey Vl
a
s
o
v
[PATCH] fetch
.
c:
Remove som
e
duplicated code
i
n process()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Sergey Vlasov
[PATCH]
f
etch
.
c
:
Remove
redundant T
O
_FE
T
CH fl
a
g
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Sergey Vlasov
[PATCH
]
fe
t
c
h
.
c: Remove redu
n
dan
t
S
C
ANNE
D
f
l
ag
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Serg
e
y
V
lasov
[
P
ATCH] fetch
.
c: Make process() look at each object
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Se
r
gey
V
lasov
[PATCH] f
e
t
c
h
.
c: R
e
m
ov
e
useless lookup_object_type
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Juni
o
C Ham
a
no
Do not giv
e
alarming error message fr
o
m rsync
i
n
f
e
tch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
J
o
n Lo
e
li
g
er
[PATCH] Ret
i
tle 'i
n
s
p
ecting what h
a
p
p
e
ned' section
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Junio C Hamano
Pret
t
yprint oct
o
pus merge me
s
s
age
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Petr Baudis
[PA
T
CH] Verbose git-daemon logging
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-22
Jun
i
o C Hamano
Retire diff-helper
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-22
Ju
n
io C Hamano
R
e
t
i
re
r
ev-tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-22
Junio C H
a
m
ano
Reti
r
e git
-
e
x
port
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-22
Lin
u
s T
o
rvald
s
[PATCH] Fix stran
g
e timezone hand
l
ing
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Juni
o
C Hamano
Revert "Use git-m
e
rge instead
o
f
git-r
e
solv
e
in git
.
.
.
commit
|
commitdiff
|
tree
2005-09-21
Junio C Ha
m
ano
Revert "Make Oct
o
p
u
s merge
m
essa
g
e a
b
i
t
nicer
.
"
commit
|
commitdiff
|
tree
2005-09-21
S
e
rgey
V
laso
v
[PATCH]
f
e
tch
.
c
:
Remov
e
c
a
ll to parse_object() from
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Sergey
Vlasov
[PATCH] fetch
.
c:
C
lea
n
up o
b
ject flag
definitions
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Sergey
V
lasov
[PATCH] fetch
.
c: Remove red
u
ndant te
s
t
of TO_SCAN in
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Serge
y
Vlasov
[PATCH
]
fetc
h
.
c: Remove some
d
uplica
t
ed code in p
r
oces
s
()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Sergey Vl
a
sov
[PATC
H
]
fet
c
h
.
c: Remove redundant
T
O_FET
C
H fl
a
g
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Serg
e
y V
l
a
s
ov
[PATCH] f
e
tch
.
c:
R
e
m
ove redundant SCANNED flag
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Sergey Vlasov
[PATCH]
fetch
.
c: Mak
e
pro
c
ess() look at each
o
bject
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
S
er
g
ey Vlaso
v
[PATCH
]
fetch
.
c: Remove us
e
less
lookup_obje
c
t
_type
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
Me
r
ge branch 'fixes'
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
Fix documentation dependenc
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
M
a
ke object creation in http fetch a bi
t
safe
r
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
Cla
r
ify d
u
al
l
icense status of subproc
e
ss
.
p
y file
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio C H
a
mano
Update tutorial with Octo
p
us usage
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio
C
Hamano
Make Oct
o
pus merge message a
b
i
t n
i
cer
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
J
unio C Hamano
Use git
-
mer
g
e instead of g
i
t-r
e
solve in
git-pull
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Linus Torvalds
M
a
ke time-b
a
s
e
d
comm
i
t filtering work with to
p
ological
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Linus Torvalds
[
P
AT
C
H] Tea
c
h "g
i
t-rev-pars
e
" about date-based cut
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
N
icolas Pitre
[PAT
C
H
] ARM
o
p
t
imized SHA1 im
p
l
ementatio
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
P
e
tr Baudis
[PATCH] Make the g
i
t-fsck-objects diagnos
t
ics mor
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Haman
o
D
o n
o
t give
alarming error mess
a
g
e
fro
m
r
sync in
f
etch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Linu
s
Tor
v
alds
[PATCH]
R
e
turn proper error valud f
r
o
m
"
parse
_
date()
"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio
C
Hamano
Show modified files in git-
l
s-files
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Jun
i
o C
H
a
mano
Fast-p
a
th 'updat
e
-in
d
e
x
-
-refr
e
sh' a bi
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next