repo.or.cz
/
git
/
repo.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
[PATCH] More descriptive messages for conflict cases in merges
2005-09-25
Fred
r
ik Kuivinen
[P
A
TCH] More descriptive messages for
c
onflict cases
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Ku
i
vinen
[PA
T
C
H
] recur
s
i
ve-merge: Don't print
a sta
c
k trace
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
J
unio C
H
amano
Dif
f
: --
n
ame-status output forma
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Junio
C
Hamano
Diff: -l<n
u
m>
to li
m
it rename/copy detection
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Ju
n
io C Ha
m
a
n
o
Dif
f
c
lean-up
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Junio C Hamano
Merge branch 'fixes'
commit
|
commitdiff
|
tree
2005-09-25
Junio
C
Hamano
Clean
g
enerat
e
d files a bit
more
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Junio C Haman
o
Stop
i
n
stallin
g
t
h
e backwa
r
d compa
t
ible symlinks
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Junio C Hama
n
o
sh
o
w
-bran
c
h: fix commit
n
a
m
ing breakage
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
D
aniel Barkalow
[PATCH
]
Finish docu
m
enting t
r
ivial
merge
r
ul
e
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Jun
i
o C Hamano
git-grep:
f
i
x
'git grep -e $pattern
'
hand
l
i
ng
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Juni
o
C
H
a
mano
Re
m
ove use of 'x
a
rgs -0' from git-reset
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Jun
i
o
C Hamano
Use 0
.
99
.
7
.
GIT as ve
r
sion betwe
e
n
0
.
99
.
7 and 0
.
99
.
8
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C
H
a
mano
Solaris: g
i
ve a bit more bu
i
lt-i
n
defaults
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Pa
t
rick M
a
u
r
itz
[PATCH] CURL
D
I
R
in
M
akefile
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Pe
t
r Baudis
[PATCH
]
Rename daem
o
n
.
c
'
s l
o
gnotice() to loginfo(
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Petr Baudis
[PATCH] g
i
t-da
e
mon --s
y
slog to log thro
u
gh syslog
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Petr
B
audis
[PATCH] Up
d
ate git-daemon d
o
cum
e
ntation
wrt
.
the
-
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C
H
amano
Really i
g
nore
generated d
i
s
t
ributi
o
n material
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Haman
o
da
e
mon
.
c
:
pid_t is no
t
i
n
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Hama
n
o
Merge 'fixes'
b
ranch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio
C
Hamano
Fu
r
t
her
cl
a
ri
f
y
l
icensi
n
g status of
c
ompat/subp
r
o
cess
.
py
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
H
.
P
eter Anvi
n
[PATCH] rsh
.
c u
n
terminated st
r
i
n
g
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Sergey Vl
a
s
ov
[PATCH] git-local-fetch: Avoid c
o
nfusing
e
rr
o
r messages
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Sergey Vlasov
[PA
T
CH] F
i
x "git-local-fetch -s"
w
i
th pac
k
e
d
s
ource
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Sergey
Vlasov
[PATCH] gi
t
-local-fetch:
Av
o
id c
a
lling clo
s
e(-1
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Sergey Vlasov
[
P
ATCH] g
i
t-local-fetch: Fix error checkin
g
and leak
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Serge
y
Vlaso
v
[PATCH] fet
c
h
.
c: Plug memor
y
leak in process_
t
ree
(
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
S
e
rgey Vlasov
[PATCH] fetch
.
c: Do no
t
b
uil
d
object ref lists
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Robert Watson
[PA
T
CH] document
command
to
s
how diff of a c
o
mmit
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Junio
C
Ha
m
ano
Ignore a bit more
g
ene
r
ated files
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Junio C Hamano
Merge
b
r
anch 'fixes
'
commit
|
commitdiff
|
tree
2005-09-23
Juni
o
C Haman
o
Make 'git diff --cache
d
' syn
o
nymo
u
s to 'git diff -
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Ser
g
e
y
Vlasov
[P
A
TCH] fetch
.
c: Remove ca
l
l to
parse_objec
t
(
)
from
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
S
ergey Vlasov
[PAT
C
H] fetch
.
c: Clean up object fla
g
definitions
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Se
r
gey Vlasov
[PATC
H
] f
e
tch
.
c
: Rem
o
v
e
r
edundant test of T
O
_SCA
N
in
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Se
r
gey V
l
asov
[
P
A
TCH] f
e
tch
.
c: R
e
move some duplicated code in process()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Sergey
V
lasov
[PAT
C
H]
f
etch
.
c
:
R
e
mo
v
e redundant TO
_
F
E
T
CH flag
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
S
e
rge
y
Vl
a
sov
[PATC
H
] fetch
.
c: Remove redun
d
ant SCANNED flag
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Sergey
Vlasov
[PATCH
]
f
e
tch
.
c: Make
proce
s
s(
)
look at each ob
j
ect
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Sergey Vlas
o
v
[PATCH] fetch
.
c
:
Remo
v
e
u
s
eless lookup_object_type
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
J
u
nio C H
a
mano
Do not give alarming
e
rror message from r
s
ync in fetch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Jon
L
oeli
g
er
[PATC
H
] Retitle 'inspecting
what happened' section
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
J
u
nio C Hamano
Prettyprint octopus merge
m
essage
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
P
e
tr Baudis
[PATCH] Ver
b
ose git-daemon
l
oggi
n
g
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-22
Junio C Hamano
Retire diff-h
e
lper
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-22
Junio C Hamano
Retire
re
v
-tre
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-22
Ju
n
io
C
H
amano
R
e
tire
git-export
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-22
Li
n
us Torvalds
[
P
ATC
H
] Fix strange timez
o
ne han
d
ling
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
Revert "Use g
i
t-merge ins
t
ead of
g
it-resolve in git
.
.
.
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
Revert
"Make Octopu
s
merge message a bit
n
icer
.
"
commit
|
commitdiff
|
tree
2005-09-21
Sergey Vlasov
[
P
ATCH] fetch
.
c: Remove call
to parse_object
(
) from
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
S
ergey Vl
a
sov
[PATCH] fe
t
ch
.
c: Cle
a
n up object f
l
a
g
d
e
f
initions
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Serg
e
y
Vlasov
[P
A
TCH
]
fe
t
ch
.
c
:
Remove redundant test
o
f
TO_SCAN in
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
S
ergey Vla
s
ov
[PATCH] fetc
h
.
c
: Remove s
o
me duplicated
c
o
d
e
i
n process()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Sergey
Vlasov
[
P
ATCH
]
fetch
.
c: Remove redundan
t
TO_F
E
T
CH
f
lag
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
S
ergey Vlasov
[PATCH] f
e
tch
.
c: Remove redundant
S
CANNED
f
lag
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Sergey Vlasov
[PA
T
CH] fetch
.
c: Mak
e
proc
e
ss
(
) look at
e
ach object
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Sergey Vlasov
[PATCH] fetc
h
.
c: Remo
v
e useles
s
lookup_ob
j
ect_ty
p
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
J
u
nio C Hamano
Me
r
ge branch 'fixes'
commit
|
commitdiff
|
tree
2005-09-21
Jun
i
o C Hamano
Fix docum
e
ntation
d
ependency
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
Make object creation in
http fet
c
h
a bit safer
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio C
H
a
mano
Cl
a
rify d
u
al license st
a
tus
o
f subp
r
ocess
.
p
y
f
ile
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
J
unio
C Haman
o
Upd
a
te
tut
o
rial with Octopus usage
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio
C Ha
m
ano
Make Octopus m
e
rge
message
a b
i
t nic
e
r
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
Use git-mer
g
e instead o
f
g
it
-
resolve
i
n git
-
pull
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Linus
T
orvalds
Make time-ba
s
ed
commit filtering
wo
r
k
w
ith
t
opol
o
gical
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Li
n
us Torvalds
[PATCH] Tea
c
h "git-re
v
-parse" about dat
e
-base
d
c
u
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Nicolas Pi
t
re
[PATCH] ARM optimized SHA1 implementation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Petr
Baudis
[
P
A
TCH] Make the git-fs
c
k-objects dia
g
n
ostics mor
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio C
H
amano
Do not give alarming
error message from rsync in fetc
h
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Linus Torv
a
lds
[PATCH] Return proper error valud from
"parse_d
a
te()"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Hamano
Sh
o
w modif
i
e
d files in git
-
ls-files
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
J
u
nio C Hama
n
o
F
ast-path '
u
pdate-index --r
e
fresh'
a
b
it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Juni
o
C Hamano
Use GECOS field a b
i
t
b
etter
t
o produce default
h
u
m
an
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio
C
H
amano
Doc
u
ment -i
f
lag to
git-r
e
ad-tree
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
S
ergey Vl
a
sov
[PATC
H
] Documenta
t
ion: Upda
t
e all files to
u
se
t
he
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
S
e
rge
y
Vlasov
[
P
ATCH] Docum
e
ntati
o
n: A
d
d ascii
d
o
c
.
conf file a
n
d gitlink
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Linus Torvalds
Fix
e
x
tended short SHA1 na
m
e comp
l
etion
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
J
u
nio C Hamano
Ship our own copy of subprocess
.
p
y
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio C
H
aman
o
show-branch:
B
e ni
c
er when running in
a
corrupt re
p
osi
t
ory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Petr
Baudis
[PATCH] Fix git-i
n
i
t
-db cr
e
atin
g
crap directories
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Patrick Ma
u
ritz
[PATCH] Do not i
n
stall com
p
atibility symlink for what
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Linu
s
Torv
a
lds
[P
A
TCH] Remove total con
f
usion f
r
om "g
i
t checkou
t
"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-19
L
i
nus
Torvalds
[PATCH] str
c
asestr comp
a
tibility
replacement
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
J
unio C Hamano
GIT 0
.
99
.
7
commit
|
commitdiff
|
tree
2005-09-18
Ju
n
io C Hamano
Arrgh -- ano
t
her asciidoc c
a
ret workarou
n
d
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
Pe
t
r Baudis
[PATCH] Impro
v
e git
-
update-i
n
dex error reporti
n
g
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
Linus Torvalds
[PATC
H
]
Improved
"
git add"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
Linus Tor
v
alds
[PATCH] Add "--git-dir" flag to g
i
t-rev-pa
r
s
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
Danie
l
Barkalow
[P
A
TCH] Su
p
p
o
rt altern
a
te
s
and http
-
alternates in http
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
Junio C H
a
mano
D
ocument ext
e
nded SHA1 used
by
g
it-rev-parse
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
J
u
nio
C Ham
a
no
fetch()
a
s
s
u
mes we do
not have the
o
bje
c
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
Junio C Hamano
Merge
branch '
m
as
t
er' of
.
commit
|
commitdiff
|
tree
2005-09-18
Ju
n
io C Hamano
I
mpr
o
ve the s
a
f
ety check used in fetc
h
.
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
J
unio C Hamano
Arc
h
ive-destro
y
ing "g
i
t repa
c
k -
a
-d" b
u
g
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-17
Junio
C Hamano
Do no
t
fail after
ca
l
l
ing bisec
t
_a
u
to_next(
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-17
Daniel Barkal
o
w
[PATCH] Add
s
upport for a
l
ternates in HTTP
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-17
Junio
C Hama
n
o
Fix typo
in test com
m
ent
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-17
Junio C Hamano
[PATCH] getdo
m
ainnam
e
s
hould b
e
usable on SunO
S
with
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next