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
Use git-merge in git-pull (second try).
2005-09-29
J
u
nio C Ha
m
ano
U
s
e
git-mer
g
e in g
i
t-
p
u
ll (second try)
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-28
Jun
i
o C H
a
m
a
no
Use git-upd
a
te-ref in sc
r
ipts
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-28
Peter Hage
r
vall
[PATCH] Make some needles
s
ly global stuff
s
t
atic
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-28
N
i
ck Henge
v
e
l
d
[P
A
TCH] Support f
o
r more
CU
R
L SSL settings via e
n
vir
o
n
m
ent
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-28
Tom
Pr
i
n
c
e
[PAT
C
H] Add new prog
r
am
s
to
.
g
itignore
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-28
Junio
C
Hamano
Fa
s
tpath the normal c
a
se by n
o
t c
h
ecki
n
g th
a
t index
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-28
Junio C
H
amano
F
ix default pul
l
not t
o
do
an un
i
ntended Octopus
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-28
Junio C Hamano
Update
t
he case
table
in t/t100
0
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-28
Junio C Hamano
Mer
g
e mast
e
r
.
kernel
.
org:/home
/
hpa/git/daemon
commit
|
commitdiff
|
tree
2005-09-27
Junio C Hamano
git
-
c
o
mmit:
u
s
e update-ind
e
x --stdin, inst
e
ad of
x
args
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Juni
o
C
Hamano
u
p
date-index: document --s
t
din
a
n
d
-z
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
J
unio C Hamano
upda
t
e-index: --
s
td
i
n and -z
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Nick Hengeveld
[PA
T
CH
]
Ret
u
rn CURL error
message when object tra
n
sfer
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Da
n
i
el Barkalow
[PATCH] Imp
l
e
m
ent --rec
o
v
er for git-*-fetch
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Sven V
e
r
d
oolaege
[PA
T
C
H] Provi
d
e ac
c
ess
t
o git_dir t
h
rough get_git_dir()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Peter Eriksen
[
P
ATCH] Make the test m
o
r
e
s
hell g
e
neric and fix mis
s
ing
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Ju
n
io C Hamano
Really re
q
u
ire tk 8
.
4 (RPM)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Ju
n
io C Ham
a
no
Require tk
8
.
4 (
R
PM)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Junio C Hamano
Merge http://www
.
kernel
.
org/pub/
s
cm/gi
t
k
/gitk
commit
|
commitdiff
|
tree
2005-09-27
Junio C
Ham
a
no
git-
f
et
c
h: s
e
nd informational ou
t
put to >
&
2 consistently
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Junio C Hamano
Give default
merge message afte
r
failed a
u
tomerge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Junio C Hamano
Do not requ
i
re clea
n
tree when revertin
g
and cherry
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Jun
i
o
C H
a
m
a
no
Fix o
v
erzea
l
o
u
s
cleanliness check in git-merge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Junio C H
a
mano
git-clone: check
o
ut "master" by
default
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-26
Ju
n
i
o
C
Ham
a
no
P
l
u
g
a
s
mall
race in update-
r
ef
.
c
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Linus
T
orvalds
[PATCH] Add "git-update-ref" to
u
pdate
t
he HEAD (or
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Fred
r
ik Kuiv
i
nen
[PATCH]
M
ore desc
r
i
p
t
i
v
e messages for con
f
lict
c
a
ses
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Fred
r
ik Kuivin
e
n
[PATCH] recu
r
sive
-
merge: Don't pri
n
t a
stack tra
c
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Junio
C
Hamano
D
iff: --name-status output
f
orm
a
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Juni
o
C Hamano
Diff:
-l<num>
t
o limit rename
/
copy detection
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Junio C
H
amano
D
iff clean
-
up
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
J
u
nio C Ham
a
no
Merge branch 'fixes'
commit
|
commitdiff
|
tree
2005-09-25
J
un
i
o C Ha
m
ano
Clean gene
r
ated files a
b
it more
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Junio
C
Haman
o
St
o
p
i
n
sta
l
ling the backward compatibl
e
symlinks
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
J
u
nio C Hamano
show-branch: fix commit n
a
m
i
ng breaka
g
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Daniel Barkalow
[PATCH] Finish documenting trivial merg
e
rules
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
J
unio C Hama
n
o
git-grep: fix 'git grep
-
e $pat
t
e
rn'
handling
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Haman
o
Remove use of 'xargs -0' from git
-
rese
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Hamano
Use 0
.
9
9
.
7
.
G
I
T a
s
version betwe
e
n
0
.
9
9
.
7 and 0
.
9
9
.
8
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Ha
m
ano
Sola
r
is
:
g
i
ve a bit more bu
i
lt-in defaults
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Patrick Mauritz
[PATCH] CURL
D
IR in Makefile
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Pet
r
Baudis
[PATC
H
] Renam
e
daemo
n
.
c
's log
n
otice() to logi
n
fo()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Petr Baudis
[PATCH]
g
i
t
-
daemon --sys
l
og to l
o
g
t
h
r
ough syslog
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Petr
B
audis
[
PATCH] Update git-
d
aemo
n
document
a
tion wrt
.
the -
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
J
unio
C
H
a
mano
Reall
y
ignore ge
n
erated dist
r
ibut
i
on
m
a
t
e
rial
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Jun
i
o C H
a
mano
daemo
n
.
c:
pid_t i
s
not int
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C H
a
ma
n
o
Me
r
ge 'fixes' br
a
nch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Hamano
Further clarify li
c
en
s
in
g
status o
f
compat/subp
r
o
ce
s
s
.
py
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
H
.
P
eter Anvi
n
[PATCH]
r
sh
.
c unter
m
ina
t
ed s
t
ring
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Sergey Vlasov
[PA
T
CH]
git-local-fetch: Avoid c
o
nfusi
n
g error
message
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
S
erge
y
Vlaso
v
[PATCH]
Fix "git-local-fetch -s" with p
a
cked
s
o
u
rce
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Serge
y
Vl
a
s
ov
[PATCH
]
gi
t
-local
-
fetch
:
Avoi
d
calling close(-1)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Sergey
Vlasov
[PATCH
]
git-loca
l
-
f
et
c
h: Fix error checki
n
g and leak
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Sergey
Vlasov
[PATCH
]
f
e
t
c
h
.
c:
P
lug me
m
ory
leak in pro
c
ess_tree(
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Sergey V
l
a
s
ov
[PATC
H
] fet
c
h
.
c: Do n
o
t build o
b
ject
r
e
f
l
ists
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Robert Watson
[PAT
C
H] do
c
ument command to show diff of a commit
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Junio
C
H
amano
Ign
o
r
e a bit mor
e
gener
a
ted files
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
J
un
i
o C H
a
mano
Merg
e
branch 'fixes'
commit
|
commitdiff
|
tree
2005-09-23
J
un
i
o
C
Ham
a
n
o
Make 'git diff -
-
cached' synonymous to 'gi
t
di
f
f -
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
S
ergey Vlasov
[P
A
T
CH] fetch
.
c: Remo
v
e call to parse_object() from
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Sergey Vlasov
[PATCH] f
e
tch
.
c: Clean up object f
l
ag de
f
initions
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
S
e
r
gey Vlasov
[
PATC
H
] fetc
h
.
c: Remove
r
edundant test 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 V
l
asov
[PA
T
CH] fetch
.
c:
R
e
m
ove some duplic
a
ted code in
pro
c
ess()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Sergey Vlasov
[PATCH] fetch
.
c:
Remove redunda
n
t TO_F
E
TCH
f
lag
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Ser
g
e
y
Vlasov
[
P
ATCH] fetc
h
.
c
:
Re
m
ov
e
red
u
n
d
a
nt SCAN
N
E
D
flag
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Sergey Vl
a
s
o
v
[PAT
C
H] fet
c
h
.
c:
M
ake p
r
oce
s
s() look at each o
b
ject
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Sergey
Vlasov
[PATCH] fetch
.
c
:
R
emove us
e
less
l
o
oku
p
_object_type
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Junio C Haman
o
Do not give alarming error mess
a
ge from rsync in f
e
t
ch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Jon Loeliger
[PA
T
CH]
R
etitle 'inspecting
w
hat h
a
ppened' s
e
cti
o
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Ju
n
io C H
a
m
ano
P
rettyprint oct
o
pus merge
mess
a
ge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Petr Baud
i
s
[PAT
C
H] Ve
r
bose git-dae
m
on logging
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-22
Junio C Hamano
Retire dif
f
-
hel
p
er
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-22
Junio C Haman
o
Retire rev-t
r
ee
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-22
Junio C Hamano
Retire
git-
e
xp
o
rt
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-22
L
i
n
u
s
Torvalds
[PA
T
CH] Fix strange timezone handling
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Juni
o
C
H
amano
Revert "Use git-merge ins
t
e
a
d of git-resol
v
e in git
.
.
.
commit
|
commitdiff
|
tree
2005-09-21
Junio C Ham
a
no
Re
v
e
rt "Make O
c
topus merge message a
bit nicer
.
"
commit
|
commitdiff
|
tree
2005-09-21
Sergey Vlasov
[PA
T
CH] fetch
.
c: R
e
move c
a
ll to par
s
e_o
b
ject() from
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Sergey Vlaso
v
[PA
T
C
H
] fetch
.
c: Clean up object flag definitions
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Se
r
gey Vlasov
[PATC
H
] fetch
.
c
:
Remove redundan
t
test of TO_SCAN in
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Ser
g
ey
Vlasov
[PATCH] fe
t
c
h
.
c:
Remove some duplicated c
o
d
e
i
n
proce
s
s()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Sergey Vla
s
ov
[PATCH
]
fet
c
h
.
c: R
e
m
ove redundan
t
T
O_FETCH flag
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Serge
y
Vlasov
[PATCH] f
e
tch
.
c: Remove
redundant S
C
ANNED flag
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Sergey Vl
a
sov
[PATCH]
fetch
.
c: Make process() look at each object
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Sergey V
l
asov
[PATC
H
] fetch
.
c: Remove use
l
ess lookup_ob
j
ect_ty
p
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Juni
o
C H
a
mano
M
e
rge branch 'fixes'
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
Fix documenta
t
i
on dependen
c
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio C
H
a
mano
Make ob
j
ect
creation in htt
p
f
e
tch
a bit safer
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
Clarify
dual license status o
f
subp
r
ocess
.
py fi
l
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio
C Hamano
Update
t
utorial
w
ith Octopus usage
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
Make Oc
t
opus merge message
a
bit n
i
cer
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio C
Hamano
Use git-merge instead o
f
git-r
e
s
olve in git-pull
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Linus
T
orvalds
Mak
e
time-bas
e
d commit
f
ilte
r
in
g
work with topological
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Lin
u
s T
o
rvalds
[
PATCH] Tea
c
h "git-rev-parse" a
b
out date-based cut
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
N
i
c
o
las Pitre
[PATCH] ARM optimized S
H
A1 imple
m
e
n
t
ation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Petr Baudis
[PAT
C
H] Make
t
h
e git-fsck-o
b
jects diagno
s
t
i
cs
m
ore
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Juni
o
C H
a
mano
Do not give alarming error
messag
e
from rs
y
nc in fetch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Lin
u
s
T
o
rvalds
[PAT
C
H] Return
p
roper erro
r
valud from "pa
r
se_date()"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio
C
Hamano
Show
m
odified files in git-ls-files
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
J
u
n
i
o C Hamano
Fast-path 'update-index
-
-refre
s
h' a bit
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next