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
[PATCH] More descriptive messages for conflict cases in merges
2005-09-25
Fredr
i
k
Kuivinen
[PATCH] Mo
r
e descriptive messages for
c
onflict cases
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
F
r
edrik Kuivinen
[PAT
C
H] recursive-
m
e
rge: Don't prin
t
a s
t
ack trace
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
Jun
i
o C
H
am
a
n
o
Diff: -
-
n
ame-
s
t
atus output for
m
at
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
J
u
n
io C
Hamano
Diff:
-
l<
n
u
m>
t
o
limi
t
r
e
name/copy dete
c
tion
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
Junio C Hamano
Dif
f
c
l
ean
-
up
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
Jun
i
o
C Hamano
Merge
b
ranch 'fixe
s
'
commit
|
commitdiff
|
tree
2005-09-25
Junio C H
a
m
an
o
C
le
a
n generat
e
d files
a
bit mor
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
Junio C Hamano
Stop inst
a
l
li
n
g t
h
e b
a
ckward compatib
l
e syml
i
n
k
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
J
u
ni
o
C Hamano
show-br
a
nch: fix commit
naming
b
reakage
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
Daniel Barkalow
[PATCH] F
i
nish documenti
n
g triv
i
al merge
r
u
les
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Junio
C Hamano
git-grep: fix 'git
gre
p
-
e
$
pattern'
h
a
ndlin
g
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Hamano
Remove use of
'
xargs -
0
' from g
i
t
-
r
eset
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Jun
i
o C Ha
m
a
n
o
Use 0
.
99
.
7
.
GIT as version between 0
.
99
.
7
a
n
d
0
.
99
.
8
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
J
u
nio C Hamano
S
ola
r
is: give a
b
it more b
u
ilt
-
in defaults
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Patrick Maurit
z
[PATCH] CURLDIR
in Ma
k
efile
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Petr Baudis
[PATCH] Rename daemon
.
c's lognotice() to loginfo()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Petr Baudis
[PATCH] git-daemon --syslog to log t
h
rou
g
h syslog
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Petr Baudis
[PAT
C
H] Upd
a
te git
-
dae
m
on do
c
ument
a
tion w
r
t
.
the -
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Hamano
Reall
y
igno
r
e genera
t
ed distr
i
bution material
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Junio
C Ham
a
no
daemon
.
c: pid_t
i
s
not int
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Hamano
M
erge 'fi
x
es' branc
h
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Junio
C Hamano
Fur
t
h
e
r c
l
arify licen
s
ing status
of compat/subp
r
ocess
.
py
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
H
.
Pete
r
Anvin
[PA
T
CH] r
s
h
.
c unterminated str
i
ng
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
S
ergey Vlasov
[PATCH
]
g
it-local-fetch: Avoid confusing error messages
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Sergey V
l
aso
v
[
PATCH
]
F
ix "git
-
local-fet
c
h -s"
with packed
source
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Sergey Vlas
o
v
[PATCH] git-local-fetch
:
A
v
o
id calling close(-
1
)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Sergey Vlasov
[PATCH] git-local-fetch
:
Fix error che
c
ki
n
g
and leak
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Serge
y
Vlasov
[PATCH] fetch
.
c: P
l
ug memory l
e
ak in process_tree()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Sergey Vlas
o
v
[PATCH
]
fetch
.
c: Do not build object ref lists
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Robert W
a
tson
[PATCH] docum
e
nt
co
m
man
d
to sho
w
diff
of a commit
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Junio C
H
amano
Ignore a bit more generated fi
l
es
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Junio
C
Hamano
Merg
e
b
ranch
'fixes'
commit
|
commitdiff
|
tree
2005-09-23
Jun
i
o C H
a
mano
Make 'git
di
f
f
-
-cached' s
y
n
o
ny
m
ous
t
o 'git diff -
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Sergey
Vlasov
[PATCH] fetch
.
c: Remove
call to parse_
o
bject() from
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Sergey
V
lasov
[PATCH] fetch
.
c: Clean up object flag defin
i
t
ions
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Sergey Vlasov
[PATCH] fet
c
h
.
c: Remove re
d
undant test o
f
TO_SCAN in
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Sergey Vlaso
v
[
P
ATCH] fet
c
h
.
c: Remov
e
s
ome duplicated code in process()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Sergey Vlasov
[PATCH] fetch
.
c: Remove redundant TO_FETCH flag
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
S
ergey Vlasov
[PATCH] fetch
.
c: Remo
v
e
r
edundant
SCANNED f
l
ag
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Sergey Vlasov
[P
A
TCH] f
e
tch
.
c
:
Make process() look at each object
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Sergey
V
lasov
[PATCH] fetch
.
c: Remove us
e
less
lookup_object_type
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Junio C
Ham
a
no
Do
no
t
give
a
l
arming error 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 Loeliger
[PATCH] Retitle '
i
nspecting wha
t
hap
p
ened' section
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Junio C
H
amano
Pret
t
y
p
rint octopus
m
erge message
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Petr
B
audis
[PATC
H
]
V
erbose g
i
t-daem
o
n lo
g
ging
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-22
J
unio
C
H
a
mano
R
etire diff-helper
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-22
Junio
C
Hamano
Retire rev-tree
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-22
Juni
o
C Hamano
Ret
i
r
e git-export
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-22
Li
n
us Torvalds
[PATCH] Fix strange time
z
one hand
l
ing
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
Revert "Use git-m
e
rge instead of git-re
s
olve in git
.
.
.
commit
|
commitdiff
|
tree
2005-09-21
Juni
o
C
H
a
mano
Revert "
M
ake Octopus merg
e
message a bit nic
e
r
.
"
commit
|
commitdiff
|
tree
2005-09-21
Serge
y
Vl
a
sov
[PATCH] fetch
.
c: Remove call to parse_
o
bjec
t
() from
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
S
ergey Vlas
o
v
[PATCH] f
e
tch
.
c
: C
l
ean up o
b
ject flag de
f
inition
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Sergey
Vla
s
ov
[PATCH] fetch
.
c: R
e
m
ove redun
d
ant test of T
O
_SCAN in
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Ser
g
ey Vlasov
[PATCH] fe
t
ch
.
c
:
Remo
v
e some duplicated
code in process()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
S
e
rgey Vlasov
[PATC
H
] fetch
.
c: Remove redun
d
ant T
O
_FETC
H
f
l
ag
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Sergey Vlas
o
v
[PATCH] f
e
tch
.
c
:
Remove
redundant SC
A
NNE
D
flag
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Sergey Vlasov
[PATCH] fetch
.
c:
M
ake process()
l
ook at
e
a
ch object
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Sergey Vl
a
sov
[PATC
H
] fetch
.
c: Remove usele
s
s lookup_objec
t
_type
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Haman
o
Merge branch 'fixes'
commit
|
commitdiff
|
tree
2005-09-21
Junio
C
Hamano
F
ix doc
u
me
n
t
a
tion depen
d
e
n
cy
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
Ma
k
e
object
c
re
a
tion i
n
http fetch a bit saf
e
r
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Ha
m
a
n
o
Clar
i
f
y dual
l
ic
e
nse status o
f
s
ubprocess
.
py
f
ile
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Juni
o
C Ham
a
no
Update tut
o
rial with Oc
t
opus usage
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Ha
m
ano
Make Octopus merge
mess
a
ge a bit nicer
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Junio C H
a
mano
Use git-merge
i
ns
t
ead
o
f git-resolve in git-pull
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Linus Tor
v
a
l
ds
Make time-based
comm
i
t filtering work
w
ith topologica
l
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Linus
T
orvalds
[
PATCH] Teach
"
git-rev-parse" abo
u
t
date-base
d
cut
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
N
i
col
a
s Pitre
[PATCH] A
R
M optimized SHA1 implementation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
P
e
tr Ba
u
dis
[PATC
H
] Make the git-
f
sc
k
-obj
e
cts d
i
agn
o
stics mo
r
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Ju
n
io C Hamano
Do not giv
e
a
larming error m
e
s
s
age from rsync in f
e
tc
h
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Li
n
us
To
r
valds
[PATCH] Retu
r
n proper er
r
or valud from "
p
arse_date()"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
J
u
nio C Ham
a
no
Show m
o
di
f
ied files i
n
gi
t
-ls-files
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Junio C H
a
ma
n
o
Fast-pa
t
h 'update-index --re
f
resh' a
b
i
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Ham
a
no
Us
e
GECOS field
a bit better to produce de
f
ault human
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
J
unio
C
Hamano
Document -i
flag to gi
t
-read-tree
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Serge
y
Vlasov
[P
A
TCH] Docum
e
ntation:
U
pdate
a
ll files to use the
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
S
ergey Vlasov
[PATCH] Document
a
tion: Add
as
c
iidoc
.
conf
f
ile and
gi
t
l
i
n
k
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Lin
u
s Torval
d
s
Fix extend
e
d
sh
o
rt S
H
A1 n
a
m
e
completion
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Junio C
Hamano
S
h
ip
o
ur own copy of subprocess
.
py
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Junio
C Hamano
show-br
a
nch: Be nice
r
when running
in a corrupt repository
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Pet
r
B
au
d
is
[PATC
H
] Fix gi
t
-
init
-
db creating crap
d
irectories
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Patric
k
Mau
r
it
z
[
PATCH] D
o
not insta
l
l
compatib
i
lity symlink for what
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Linus
Torv
a
l
d
s
[PATCH] Remove total confusion from
"git
checkout"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-19
Linus Torvald
s
[PATC
H
]
s
trcasestr compatibility repla
c
ement
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-18
Junio
C
H
ama
n
o
G
I
T 0
.
99
.
7
commit
|
commitdiff
|
tree
2005-09-18
J
unio
C
Hamano
Arrgh
-
-
a
nother a
s
cii
d
oc caret workaro
u
nd
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-18
Pet
r
Baud
i
s
[
P
A
T
CH]
I
mprov
e
git-update
-
in
d
ex e
r
r
or reporting
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-18
Linus Torvalds
[PATCH] Improve
d
"
g
it add
"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-18
Lin
u
s Torvalds
[PATCH] Add "--git-dir" flag to git-rev-parse
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-18
Daniel Barkalow
[PA
T
CH] Support alter
n
a
t
es a
n
d
http-alt
e
rnate
s
in http
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-18
Ju
n
io
C Hamano
D
ocument exte
n
ded SHA1 used by git-rev-parse
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-18
Junio
C
H
a
mano
fetch() assumes we
do not ha
v
e th
e
ob
j
ect
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-18
Junio
C
H
amano
Merge bran
c
h
'
mast
e
r'
o
f
.
commit
|
commitdiff
|
tree
2005-09-18
Junio C Hamano
Improve th
e
safety c
h
eck used
i
n fetch
.
c
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-18
Junio
C
Hamano
Archive-destro
y
ing "git repa
c
k -a -d" bu
g
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-17
J
u
nio
C Hamano
Do not fail
after cal
l
in
g
bisect_auto_next()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-17
Daniel
B
arkalow
[PATCH] Add
support
for
a
lternates in
HTTP
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-17
Junio C Hama
n
o
Fix ty
p
o
i
n
te
s
t com
m
ent
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-17
J
unio
C
Hamano
[PATCH]
getdomainna
m
e shou
l
d be usable on SunOS with
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next