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
Give default merge message after failed automerge.
2005-09-27
J
u
nio C Hamano
Give d
e
fault merge message
a
ft
e
r failed autom
e
rg
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
Juni
o
C Ham
a
n
o
D
o not requi
r
e
c
lean tree
when revertin
g
and c
h
erry
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
J
un
i
o C Hama
n
o
Fi
x
ov
e
r
z
e
alous
c
le
a
nli
n
ess check
in git-m
e
rge
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
Junio C
H
aman
o
g
it-clone: check ou
t
"ma
s
ter" by
d
e
fault
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-26
Junio C Hamano
Pl
u
g a sma
l
l
ra
c
e in update-ref
.
c
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
Linus Torvalds
[PATCH
]
Ad
d
"g
i
t-upd
a
te-ref"
t
o update the H
E
AD (or
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
F
redrik Kuivi
n
en
[PATCH] More d
e
s
c
ripti
v
e messages for c
o
nfl
i
ct
cases
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
Fr
e
drik Kuiv
i
ne
n
[PAT
C
H] recursive-merge: Don't prin
t
a stack trace
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
J
u
nio C Hamano
D
iff: --name-status output
f
ormat
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
Jun
i
o
C
H
amano
Diff
:
-l<nu
m
> t
o
limit re
n
am
e
/co
p
y
detect
i
on
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
Juni
o
C
H
am
a
no
Diff c
l
ean-up
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
Jun
i
o C Hamano
M
e
rge branc
h
'fixes'
commit
|
commitdiff
|
tree
2005-09-25
J
u
nio C Hamano
Cle
a
n
gen
e
rated files a
b
it more
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
Junio C Ham
a
no
S
t
op installing the back
w
a
r
d co
m
patibl
e
s
y
mlinks
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
J
unio C Hamano
show-
b
ra
n
ch: fix com
m
i
t
nami
n
g bre
a
kage
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
Daniel
Bar
k
alow
[PATCH] F
i
nish do
c
umenting trivial merge rules
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Junio C H
a
mano
g
i
t
-grep:
f
i
x 'gi
t
g
r
ep -e $pattern' handling
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Juni
o
C Hamano
R
e
m
ove u
s
e
of
'xargs -0' from git-reset
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Juni
o
C Hamano
Use 0
.
99
.
7
.
GIT as v
e
rsion between
0
.
99
.
7 and 0
.
99
.
8
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Junio C
Hamano
S
o
laris: give
a bit
m
o
r
e
b
uilt-i
n
d
e
fau
l
ts
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Patrick Mauritz
[PA
T
C
H] C
U
RLDIR
in
M
ak
e
file
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
P
e
tr Ba
u
dis
[
P
A
T
CH] Re
n
am
e
daemon
.
c's
l
o
g
notice
(
)
to login
f
o()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Pet
r
B
audis
[PATCH] git-
d
ae
m
on --
s
yslog
to log through
s
yslog
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Petr B
a
udis
[
P
ATCH] Upd
a
te git-daem
o
n docume
n
tation wr
t
.
the -
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Ham
a
no
Really i
g
nore generated distribution material
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Hamano
daem
o
n
.
c: pid_t is not i
n
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Juni
o
C Hamano
Mer
g
e 'fixes' bra
n
c
h
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
J
unio C
H
a
m
ano
Further clar
i
f
y
lic
e
nsing status of comp
a
t/subproc
e
ss
.
py
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
H
.
P
ete
r
Anvin
[PATCH] rsh
.
c
unter
m
inated string
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Sergey Vlasov
[
P
ATCH] git-local-
f
etch
:
Avoid confusing error messa
g
es
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Serge
y
Vlasov
[PAT
C
H] Fix "git-local
-
fetch
-s" wi
t
h packed source
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Sergey Vlasov
[
P
AT
C
H] git-local-fetch:
A
v
o
id calling
c
lo
s
e
(-1)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
S
ergey
V
lasov
[
PA
T
CH] git
-
lo
c
al-fetch: Fix error
checking and
leak
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Sergey Vlasov
[PATCH
]
f
e
t
ch
.
c
: Plug mem
o
ry l
e
a
k
in proces
s
_tree()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
S
e
r
gey Vlasov
[PA
T
CH] fetch
.
c:
Do not build obj
e
ct ref lists
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Robert Watson
[PATCH] document
command to
s
how diff of a com
m
i
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Junio C Hamano
Ignore a bit mo
r
e g
e
nerated files
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Junio C Hamano
Merg
e
branch 'fix
e
s
'
commit
|
commitdiff
|
tree
2005-09-23
J
u
n
i
o C H
a
mano
Mak
e
'git diff
--cached
'
syn
o
n
ymous to 'git diff -
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Sergey Vl
a
sov
[PATC
H
] fe
t
ch
.
c: Remo
v
e
call to par
s
e_object() from
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Se
r
g
ey Vlasov
[
P
ATCH] fetc
h
.
c
: Clean up
o
bject flag definitions
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Serge
y
Vlasov
[PATCH] fetch
.
c: Remove
redunda
n
t test of
TO_SCAN in
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Ser
g
ey Vlasov
[PATCH] fetc
h
.
c: Remove some duplica
t
ed
c
o
de in process(
)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
S
e
r
gey Vlasov
[PATCH] fetch
.
c
:
Remove redundant TO
_
FETCH flag
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Ser
g
ey Vlaso
v
[PATCH] fet
c
h
.
c:
R
em
o
v
e redundant S
C
ANNED
flag
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
S
e
rgey Vlasov
[PATCH] fet
c
h
.
c: Make pro
c
ess
(
)
l
o
o
k
at e
a
ch object
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
S
e
rge
y
V
l
asov
[PATCH] fet
c
h
.
c: Remove
usele
s
s lookup_obje
c
t_type
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
J
u
nio C Haman
o
Do not give
al
a
rming error mess
a
g
e from rsync in fetch
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Jon L
o
el
i
ger
[PATC
H
]
R
etitle 'inspecting what ha
p
p
e
ned' se
c
ti
o
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Junio C Hamano
Prettyprint octo
p
us merge message
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Petr
B
audis
[PA
T
CH] Verb
o
se git-daemon lo
g
ging
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-22
Junio C Hama
n
o
Retire dif
f
-h
e
l
pe
r
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-22
Juni
o
C Hama
n
o
Retire rev-tree
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-22
Jun
i
o C Ham
a
no
Retire
git-export
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-22
Linus Torvalds
[P
A
TCH] F
i
x strange t
i
mezone handling
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Jun
i
o C Hamano
Revert "
U
s
e
git-merge instead of git-re
s
ol
v
e in git
.
.
.
commit
|
commitdiff
|
tree
2005-09-21
Junio C
H
amano
Reve
r
t "Make Octopus merge message a bit nicer
.
"
commit
|
commitdiff
|
tree
2005-09-21
Sergey Vlaso
v
[PATCH] fetch
.
c: Remove c
a
l
l
to parse
_
object() from
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Sergey Vlasov
[PA
T
CH
]
f
e
tch
.
c
:
Clean up object flag def
i
nit
i
ons
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Serg
e
y Vlasov
[P
A
TC
H
] fetch
.
c: R
e
move
redundant test of TO
_
SC
A
N
i
n
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Se
r
gey Vlasov
[PATCH] fetch
.
c:
Re
m
ove some dupl
i
cated code
i
n pr
o
c
e
ss()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Sergey Vlasov
[
PATCH] fetch
.
c: Remove re
d
u
n
da
n
t TO_FET
C
H flag
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Sergey Vlasov
[
PATCH] fet
c
h
.
c
: Remove
r
edundant S
C
ANNED fla
g
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
S
e
rgey
V
l
asov
[
PATCH] fet
c
h
.
c: Make pr
o
c
e
ss() look at each objec
t
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Sergey Vlasov
[PAT
C
H] fe
t
c
h
.
c:
Rem
o
v
e
u
se
l
ess
l
ookup_object_type
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
J
u
nio C Hamano
Merge b
r
anch 'fixes'
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
F
i
x
doc
u
m
e
ntation depe
n
dency
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Junio C H
a
mano
Make object c
r
e
a
tion in http fetc
h
a bit safer
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Haman
o
Clar
i
fy dua
l
license status of subproce
s
s
.
py fi
l
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hama
n
o
Up
d
ate tutorial with O
c
topu
s
usage
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
J
unio C Hamano
M
ake Octopus
m
er
g
e
messag
e
a bit nicer
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Juni
o
C Hamano
Use git-merg
e
inste
a
d of git
-
resolve i
n
git-p
u
ll
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Linus Torvalds
Make time
-
ba
s
ed commit filtering
w
ork
with topolo
g
ical
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Lin
u
s Torvalds
[PA
T
C
H
] Teach "g
i
t-
r
ev-par
s
e"
about date-b
a
s
e
d cut
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Nicolas Pitre
[P
A
TC
H
] A
R
M optimized SHA1 imple
m
ent
a
t
ion
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Pet
r
Bau
d
is
[PAT
C
H] Make the git-fs
c
k-objects diag
n
ostics
m
o
r
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Junio
C
Hamano
D
o
not
g
i
ve
alarming error messa
g
e from rsync in fetc
h
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Li
n
us T
o
rval
d
s
[PAT
C
H] Return proper er
r
or valud
from "parse_da
t
e()"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Hamano
Sh
o
w modified files in git-l
s
-fi
l
es
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Juni
o
C Hamano
Fas
t
-path 'update-index --refresh' a bit
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Jun
i
o C Hamano
Use GE
C
OS
f
ield a bit bette
r
t
o
prod
u
ce defaul
t
human
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Junio C
Haman
o
Do
c
ument -i f
l
ag to g
i
t-
r
ead-tree
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Ser
g
ey Vlasov
[PAT
C
H
] Doc
u
mentation: Up
d
ate
a
ll files
t
o
u
se the
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Sergey
V
las
o
v
[PATC
H
] Doc
u
ment
a
tion: A
d
d asc
i
idoc
.
conf file and
g
itlink
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Li
n
us Torvalds
Fix extended
short SHA1 name co
m
pletion
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Junio
C
Hamano
Shi
p
o
u
r
o
wn copy
o
f
s
ubprocess
.
p
y
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Ham
a
no
s
h
ow-branc
h
: Be nicer when run
n
ing in a corrupt repository
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Petr B
a
udis
[PATCH] Fix git-init-db creating crap directories
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
P
a
tri
c
k Mauritz
[P
A
TCH
]
Do not install compa
t
ibility syml
i
nk for what
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
L
inus Torvalds
[PATCH] Remove total confusion from "git
checkout"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-19
Linus
Torvalds
[PATCH] strcasest
r
compatibi
l
it
y
r
eplac
e
m
e
nt
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-18
Jun
i
o C Hamano
GIT
0
.
99
.
7
commit
|
commitdiff
|
tree
2005-09-18
J
uni
o
C Hamano
Arrgh -- another as
c
i
id
o
c
caret workaroun
d
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-18
Petr Baudi
s
[
PATCH]
Improve
git-update-inde
x
erro
r
repo
r
ting
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-18
Linus Tor
v
alds
[PA
T
CH] Im
p
r
ove
d
"git
add"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-18
Linus Torvalds
[PAT
C
H]
Add "
-
-gi
t
-
dir" fl
a
g to
g
it-rev-parse
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-18
Daniel Barkalo
w
[PA
T
CH] Support alternates
a
nd http-
a
lterna
t
e
s
in http
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-18
J
u
n
io C Hamano
Doc
u
ment exten
d
e
d SHA1
used by g
i
t-rev
-
pars
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-18
Junio C Hamano
fetc
h
(
) assu
m
es we d
o
n
ot have the obje
c
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-18
Junio
C
Hamano
M
e
rge branch 'master' of
.
commit
|
commitdiff
|
tree
next