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
Merge http://www.kernel.org/pub/scm/gitk/gitk
2005-09-27
Jun
i
o C Hamano
Merge ht
t
p://www
.
kernel
.
org/pub
/
s
cm
/
gitk/gitk
commit
|
commitdiff
|
tree
2005-09-27
Ju
n
io C Ha
m
ano
git
-
fetch: send informational outp
u
t to >&2 consistently
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
J
u
n
i
o
C Haman
o
Give default merg
e
me
s
sage after
failed auto
m
erge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Junio
C
H
amano
Do not
req
u
i
r
e
cle
a
n tree when r
e
ver
t
i
ng and cherry
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
J
unio C Ha
m
ano
Fix overz
e
alous cleanliness ch
e
ck in git-merge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Junio C
H
amano
git-clone: check out
"
master" b
y
defa
u
lt
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-26
Junio C Hamano
Plug
a sma
l
l race
in upda
t
e-ref
.
c
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Linus T
o
r
v
alds
[
PATCH] Add "git
-
update-
r
ef"
t
o update th
e
HEAD (
o
r
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Fred
r
ik
Kuivinen
[PATCH]
M
ore
d
escriptive
m
es
s
ages for conflict cases
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Fredr
i
k Kuivin
e
n
[
PATCH
]
recur
s
ive-merge: Don't prin
t
a st
a
ck t
r
a
c
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Junio C Ha
m
ano
D
i
f
f:
-
-nam
e
-status output fo
r
mat
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Junio C Hamano
Dif
f
: -l<num> to limit renam
e
/co
p
y detection
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Junio C Hama
n
o
Diff clean-up
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Junio C Ha
m
ano
M
erge bran
c
h 'fixes'
commit
|
commitdiff
|
tree
2005-09-25
Ju
n
i
o C H
a
m
a
no
Clean ge
n
era
t
e
d
files a
bit more
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Jun
i
o
C
Haman
o
St
o
p instal
l
i
ng the backwar
d
c
ompatible symlinks
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
J
u
n
io C H
a
ma
n
o
show-branch:
fix commit nami
n
g breakage
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Danie
l
B
a
r
k
alo
w
[PATC
H
] Finish documentin
g
tr
i
vial merge rule
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Ha
m
ano
git-gre
p
: fix 'git grep
-e $
p
att
e
rn' handli
n
g
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Hamano
R
e
mo
v
e use o
f
'
xargs -0
'
fro
m
gi
t
-reset
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio
C
Ham
a
n
o
U
s
e 0
.
99
.
7
.
GIT as version
b
etween 0
.
99
.
7 and
0
.
99
.
8
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Juni
o
C
Hamano
Sola
r
i
s
: give a b
i
t
mor
e
built-i
n
de
f
aults
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Patrick Mauri
t
z
[PATCH] CURLDIR in
Makefile
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Petr
Baudis
[PA
T
CH] Rename
da
e
mon
.
c's
l
ognot
i
ce()
t
o
l
og
i
nfo()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
P
e
t
r Baudis
[PATCH] g
i
t-daemo
n
--sy
s
log to log throug
h
syslog
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Petr
Baudis
[
P
A
TCH]
U
pd
a
te
git-daemon do
c
u
m
entat
i
on wrt
.
t
h
e
-
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Ha
m
a
no
Re
a
lly ig
n
ore genera
t
e
d
distr
i
bution ma
t
e
rial
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio
C
Hamano
daemon
.
c: pi
d
_t
i
s not
i
nt
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Hamano
Merge 'f
i
xes' branc
h
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio
C Hamano
Further
c
larify lice
n
sing
s
tatus of compat
/
subprocess
.
py
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
H
.
Peter An
v
in
[PATC
H
] rsh
.
c u
n
termina
t
ed string
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
S
ergey
Vlas
o
v
[PAT
C
H] git-local-fetch: Avoi
d
c
o
nfusing
e
r
r
or messages
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Sergey
V
las
o
v
[
PATCH] Fix
"
git-local-fetc
h
-s" with packed sourc
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Sergey Vl
a
sov
[PATCH
]
git-loca
l
-fetch: Avoid calli
n
g close(-1)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Sergey Vlasov
[PATCH]
git-local-fetch:
F
ix error checking and le
a
k
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
S
er
g
ey
V
l
a
sov
[
P
ATCH]
fetch
.
c
:
Plug memory lea
k
in p
r
ocess_tree()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
S
e
rgey Vlasov
[
P
ATCH] fetch
.
c: Do not build object
r
ef list
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Robert W
a
tson
[PATC
H
] doc
u
men
t
c
o
mmand
t
o show diff of
a
c
o
m
m
i
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Junio C
Hamano
I
gnore a bi
t
more gene
r
ated files
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Junio C Haman
o
Merge br
a
n
c
h 'fixes'
commit
|
commitdiff
|
tree
2005-09-23
Jun
i
o
C Hama
n
o
Ma
k
e '
g
it diff --c
a
ched' synon
y
mous
t
o 'git
d
i
f
f -
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Sergey Vlasov
[PAT
C
H
] fetch
.
c:
R
emove call to
p
arse_o
b
j
e
c
t() f
r
om
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Serge
y
Vlasov
[PA
T
CH] fe
t
ch
.
c
:
Clean up object flag
d
efinitions
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Sergey Vlas
o
v
[PATCH] fetc
h
.
c: Re
m
ove redundan
t
te
s
t
o
f TO_SC
A
N in
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Ser
g
ey Vlasov
[PATCH]
fetc
h
.
c: Rem
o
ve some du
p
licated c
o
de
in
p
rocess(
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
S
ergey Vla
s
ov
[PATCH] f
e
tch
.
c:
R
e
move redundant TO_FET
C
H flag
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Serge
y
Vlaso
v
[
P
ATCH] fet
c
h
.
c: Remo
v
e redundant SCANNED fl
a
g
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Sergey Vla
s
ov
[PAT
C
H] fetch
.
c: Make pr
o
cess() lo
o
k
a
t
each o
b
ject
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
S
er
g
e
y Vlas
o
v
[PATCH] fet
c
h
.
c: Remove us
e
less lookup_
o
bjec
t
_type
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Junio C
Ha
m
ano
Do
n
ot give a
l
arming error messa
g
e from rsy
n
c
in fetch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Jon Loe
l
i
g
e
r
[PATCH]
Retitle '
i
n
s
p
ecting what happened' section
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
J
unio C
H
amano
Prettyprint octopus merge mes
s
age
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Petr Ba
u
dis
[PAT
C
H
]
Verbose g
i
t-daemon
lo
g
g
ing
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-22
Jun
i
o C Hamano
Retire di
f
f
-helper
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-22
Ju
n
io C Hamano
R
e
t
ir
e
rev
-
tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-22
Junio C Ha
m
ano
Retire git-expo
r
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-22
L
inus Torvalds
[PAT
C
H] F
i
x
strange
t
imez
o
ne hand
l
in
g
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
Revert "Use git-merge ins
t
ead of
g
it-resolve
i
n g
i
t
.
.
.
commit
|
commitdiff
|
tree
2005-09-21
Junio
C Hamano
Revert "M
a
ke
O
ctopus merg
e
m
e
s
s
age a bit n
i
cer
.
"
commit
|
commitdiff
|
tree
2005-09-21
Sergey Vlasov
[PA
T
CH] fetch
.
c: Remove c
a
ll to pa
r
se_object
(
) from
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Sergey V
l
a
s
ov
[PATC
H
]
f
etch
.
c
: Clea
n
up ob
j
ect flag defi
n
i
tions
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Serge
y
Vla
s
ov
[PATCH] fetch
.
c: R
e
move r
e
dundant
test of T
O
_SCAN in
.
.
.
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 so
m
e duplicated c
o
de in process()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Sergey Vl
a
sov
[PATCH] fetch
.
c
:
Rem
o
v
e
r
edu
n
d
ant TO_FETC
H
flag
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Ser
g
e
y Vlasov
[
P
ATCH] fetch
.
c: Remove redundant SCANNE
D
f
l
ag
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Sergey Vlasov
[
PATCH]
fetch
.
c: Make proc
e
ss(
)
look
a
t each obje
c
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Se
r
ge
y
Vl
a
sov
[PATCH] fetc
h
.
c
:
Remove useless
l
ookup_
o
bject_type
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Haman
o
Merge branch 'fixe
s
'
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
Fi
x
docu
m
entation de
p
en
d
e
ncy
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
Make obj
e
ct cr
e
ation in http f
e
tch a bit safe
r
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
J
u
nio
C
Haman
o
C
l
arify dual
li
c
ense status of subprocess
.
p
y file
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Ju
n
io
C Hamano
Up
d
ate tutor
i
a
l w
i
th
Octop
u
s us
a
g
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
M
ake
Octopus
merge
m
ess
a
ge a bit nicer
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
Use git-merge in
s
tead of git-resolv
e
in
git-
p
ull
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
L
in
u
s Torvalds
Make time
-
b
ased com
m
it fil
t
er
i
ng wo
r
k wi
t
h topol
o
gical
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Linus Torvalds
[
PATCH] Teach
"git-rev-parse" about date-based cut
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Nicolas Pitre
[PATCH] ARM optimized SHA1 impl
e
menta
t
ion
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Petr Baudis
[PATCH]
M
ake t
h
e git-fsck-obje
c
ts diagnostics more
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Juni
o
C
Hamano
Do not give a
l
a
r
ming er
r
or message from rsy
n
c
in fetch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Linu
s
Torvalds
[PATCH] Return proper erro
r
valud from "parse_date()"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio
C Hamano
Sh
o
w mo
d
ified f
i
les in g
i
t-ls-files
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Juni
o
C Hamano
Fast-path 'update-index --refresh
'
a bit
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio
C
H
am
a
no
Use G
E
CO
S
fiel
d
a bit better
t
o produce default
h
uman
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Hamano
Document -i
fla
g
to
git-read-tree
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Se
r
gey Vlasov
[PATC
H
] Document
a
t
i
on
:
Upda
t
e all files to use
th
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Ser
g
e
y V
l
asov
[
PATCH] Document
a
tion:
A
dd as
c
iidoc
.
conf file
a
nd gitlink
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Linus
Tor
v
alds
Fi
x
exte
n
ded sho
r
t SHA1 name compl
e
tion
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio C
Hamano
Ship
o
ur
o
w
n copy
of su
b
process
.
py
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Hamano
show-b
r
anch:
B
e nicer when running i
n
a corrupt repository
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Pe
t
r Baudis
[
P
ATCH] Fi
x
git-init-db cr
e
ati
n
g crap directories
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Patrick Maur
i
tz
[PA
T
CH] Do not i
n
stall compatibility sym
l
ink for
w
hat
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
L
i
n
u
s Torvalds
[PATCH] Rem
o
ve
t
o
t
a
l confusion fro
m
"git checkout"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-19
Linus To
r
valds
[PATCH]
s
trcasestr compatib
i
lity replacement
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
Junio
C Ham
a
no
GIT 0
.
99
.
7
commit
|
commitdiff
|
tree
2005-09-18
Junio C Hama
n
o
Arrgh -- another
a
sciid
o
c ca
r
e
t
w
o
r
karound
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
Pe
t
r Baudis
[PATCH]
I
mpro
v
e
git-update-index error repo
r
ting
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
Linu
s
Tor
v
a
l
ds
[
PATCH] Improved "gi
t
add"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
Linus T
o
rvalds
[PATCH] Add "--
g
it-dir
"
flag to git-rev-parse
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
D
a
niel Barkal
o
w
[PATCH] S
u
ppor
t
a
lt
e
r
nates a
n
d http-altern
a
tes in h
t
tp
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
Junio C
H
amano
Do
c
u
m
ent extended
SHA1 used b
y
git-re
v
-parse
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next