repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Fix default pull not to do an unintended Octopus.
2005-09-28
Juni
o
C H
a
mano
Fix defaul
t
p
ull not
to do an
unint
e
nded O
c
topus
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-28
Junio C Hamano
Update the cas
e
ta
b
le
i
n
t/t1000
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-28
Junio
C
Hamano
Merg
e
m
a
ste
r
.
kernel
.
org:/home/
h
p
a/git
/
dae
m
on
commit
|
commitdiff
|
tree
2005-09-27
Junio C Hamano
git-comm
i
t: use
u
pdate-index
--stdin, inste
a
d
of xargs
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Ju
n
io C Hamano
update-index:
docu
m
ent -
-
stdi
n
and -z
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Junio C
Ham
a
n
o
u
pda
t
e
-ind
e
x:
-
-
stdi
n
and
-
z
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Nick Hengevel
d
[PATCH] Return CURL erro
r
me
s
sage when object transf
e
r
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Daniel Barkalo
w
[PATCH] Imple
m
ent -
-
r
ecover f
o
r git-*-f
e
tch
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Sven Verd
o
olaege
[
P
ATCH] Provide a
c
cess to git_
d
ir
throug
h
g
et_git_dir()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Peter
E
ri
k
sen
[PATC
H
] M
a
ke the tes
t
more s
h
ell
g
e
n
eric and fix
missing
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Junio C
H
a
m
ano
Really r
e
q
u
ire tk 8
.
4 (RPM)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Junio C Hamano
Requ
i
re tk 8
.
4 (RPM)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
J
u
nio C Hamano
Merge http://ww
w
.
kernel
.
or
g
/pub/scm/gitk/gi
t
k
commit
|
commitdiff
|
tree
2005-09-27
Junio C
Hamano
gi
t
-fet
c
h: send
infor
m
ational output to >&2 co
n
siste
n
tly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
J
unio C
H
amano
Give default merge m
e
ssage
a
f
ter failed automerge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Junio C Hamano
D
o
not re
q
uire
c
lean tree when rever
t
ing an
d
cherry
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Junio C Hama
n
o
Fi
x
over
z
ealous clea
n
liness
check in git-
m
erge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Juni
o
C Hama
n
o
git-clo
n
e: check out
"master
"
by default
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-26
Junio C
H
amano
P
l
u
g
a
small
r
ace in update-ref
.
c
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
L
inus
T
orvald
s
[PATCH] Add "git-update-r
e
f" to
u
pdate the H
E
AD
(or
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Kuivinen
[PATCH] More d
e
scriptive messa
g
es for confli
c
t
cases
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Fred
r
ik Kuivinen
[
P
ATCH] re
c
ursive-merge: D
o
n
'
t print a stack trace
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Junio C Hamano
Diff: --name-
s
tatus output fo
r
mat
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
J
u
nio C Hamano
Di
f
f:
-
l<num> to limit ren
a
me/copy detection
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
J
u
n
i
o C Ha
m
ano
Diff cle
a
n-up
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
J
u
n
i
o C H
a
mano
Merge branch 'fixes'
commit
|
commitdiff
|
tree
2005-09-25
Junio C Hama
n
o
C
l
ean gen
e
rated files a
bit more
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Junio C Ham
a
no
Stop in
s
tall
i
n
g t
h
e b
a
ckward compatible symli
n
k
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Junio C Ha
m
ano
show
-
bra
n
c
h
: fix comm
i
t naming
breakage
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Daniel Barkalow
[PA
T
CH] Finish documen
t
ing trivia
l
merge rules
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Ha
m
a
n
o
git-grep: fi
x
'gi
t
grep -e $p
a
ttern
'
h
a
n
dling
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio
C
Haman
o
Remove use of 'xarg
s
-0
'
f
rom git-reset
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Jun
i
o C H
a
mano
Us
e
0
.
9
9
.
7
.
G
I
T as version
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
Solaris: give a bit more built-in defaults
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Patric
k
Maur
i
tz
[PA
T
CH] CU
R
L
DIR in M
a
k
e
file
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Pet
r
Ba
u
dis
[PATCH]
Rename
d
aemon
.
c's log
n
otice
(
) to log
i
nfo()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Pe
t
r Baudis
[
P
ATCH
]
g
i
t
-
daemon -
-
syslog
t
o log through syslog
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Petr Baudis
[PATCH] Up
d
ate
git-
d
aemon docume
n
t
ation w
r
t
.
the -
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Hamano
Really ign
o
re gen
e
rated distribution
m
aterial
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
J
unio C Ham
a
n
o
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
e
r
ge '
f
i
x
es' branch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
J
u
n
io
C Ha
m
ano
Further clari
f
y
l
icensing status of comp
a
t/
s
ubprocess
.
p
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
H
.
Peter An
v
in
[PATCH] rsh
.
c untermina
t
ed string
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Sergey Vlas
o
v
[
P
ATCH] git-local-fetch: A
v
oid
confusi
n
g error messages
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Sergey Vlas
o
v
[PATC
H
] Fix "
g
it-l
o
cal-fet
c
h -s" with
packed source
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Sergey
V
la
s
ov
[PAT
C
H] git
-
l
ocal-fetch: Avoid callin
g
c
lose(-1)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Ser
g
ey Vl
a
sov
[PATCH] git-local-fetch: Fix error checking and leak
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
S
ergey Vlasov
[
P
A
T
CH]
fetch
.
c
:
Pl
u
g me
m
or
y
l
eak
i
n process_tree()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
S
e
r
gey Vl
a
s
ov
[PATCH] fe
t
ch
.
c:
D
o
not b
u
i
ld obje
c
t ref list
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Robe
r
t Wat
s
on
[
P
A
TCH] do
c
ume
n
t
command to
show diff o
f
a
commit
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Junio C Ha
m
ano
I
g
no
r
e a bit more generated files
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
J
u
nio C Ha
m
ano
Merge branch 'fixes
'
commit
|
commitdiff
|
tree
2005-09-23
Junio C H
a
mano
Make 'git diff --cac
h
ed' synony
m
ous to 'git diff -
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
S
ergey Vlasov
[
PATCH] fe
t
ch
.
c: Remove call to parse_object() from
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Sergey Vlasov
[PATCH] fe
t
ch
.
c: Clean
u
p object flag definition
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Se
r
gey Vl
a
s
o
v
[PATCH
]
fe
t
ch
.
c
: Remove redunda
n
t
t
est of TO_S
C
AN in
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Se
r
ge
y
Vlasov
[PA
T
C
H] fet
c
h
.
c:
Rem
o
ve some duplicated code in process
(
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Ser
g
ey
Vlasov
[PATC
H
] fetc
h
.
c:
R
emove
r
e
dundant TO_FE
T
C
H flag
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Serg
e
y
V
las
o
v
[PATCH] f
e
tch
.
c:
Remove redundant SCANNE
D
f
lag
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Sergey Vlasov
[PATCH] fetch
.
c:
M
ake process
(
) look at
each object
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Sergey Vlasov
[PATCH] fetch
.
c: Remove usele
s
s lookup_object_ty
p
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Junio C Hamano
Do no
t
give
alarming error message
f
rom
r
s
ync
in fetch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Jon Loeliger
[PATCH] R
e
title 'inspec
t
ing what
h
appe
n
ed' section
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Ju
n
io
C
Hamano
Prettypr
i
nt
o
ctopus merge mess
a
g
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Petr Baudis
[PATCH] Verbose git-daemon
l
oggi
n
g
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-22
Junio C Hamano
Re
t
i
r
e dif
f
-helper
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-22
J
unio C Hamano
Retire rev
-
tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-22
Junio
C
Hamano
Reti
r
e git-export
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-22
Linus Torvalds
[
P
ATCH] Fix strange t
i
mezone handling
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Ju
n
io C Ham
a
n
o
Rever
t
"Use git-merge instead of git-resolve in
g
i
t
.
.
.
commit
|
commitdiff
|
tree
2005-09-21
Juni
o
C
Ha
m
ano
Revert "Make O
c
topus me
r
g
e
m
e
ssage a bit nicer
.
"
commit
|
commitdiff
|
tree
2005-09-21
Sergey V
l
asov
[PATCH] f
e
tch
.
c: Remove call to parse_object()
f
ro
m
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
S
e
rgey Vlaso
v
[PATCH] fe
t
ch
.
c
: Clean up object
f
lag
d
ef
i
ni
t
i
ons
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Se
r
gey
Vlasov
[PATCH] fe
t
ch
.
c: Rem
o
ve
red
u
ndan
t
test of TO_SCAN in
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Sergey Vla
s
o
v
[PATCH] fetch
.
c: Remove
s
ome dupli
c
ated code i
n
process
(
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
S
e
rgey Vlasov
[PA
T
C
H
] fet
c
h
.
c: Remove redundant TO_
F
ETCH f
l
ag
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
S
ergey Vlasov
[
P
ATC
H
] fetch
.
c: Remove redu
n
d
a
nt SCANNED
f
l
ag
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
S
e
rgey Vlasov
[P
A
TCH] fetch
.
c: M
a
ke
process(
)
lo
o
k at each object
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
S
e
r
gey Vlasov
[PATCH]
f
etch
.
c: Remove us
e
l
ess lookup_object
_
type
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio C
H
amano
Merge bran
c
h 'fixe
s
'
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hama
n
o
Fix documentation
dependenc
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Jun
i
o C Hamano
Make obje
c
t
c
r
eat
i
on in http
f
etch a
b
it saf
e
r
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Ha
m
ano
Clar
i
fy dual l
i
ce
n
se statu
s
of sub
p
rocess
.
py file
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio C H
a
ma
n
o
U
pdate tutorial wi
t
h Octopus
usag
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Ju
n
io C Hamano
Make Octopus m
e
rge message a bit nic
e
r
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
J
unio C Ham
a
n
o
Use g
i
t-me
r
g
e instead
of git-resolve in
g
it-pull
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Linus Torvalds
M
a
ke time-based commit fi
l
t
eri
n
g work with to
p
ological
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Linus Torvalds
[
P
ATCH] Teach "git-r
e
v-pars
e
"
abou
t
date-
b
ased cu
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Nicolas Pitre
[PATCH] AR
M
o
ptimize
d
SHA1 implement
a
ti
o
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Petr
Baudis
[PATCH] Make the git-f
s
ck-objects diagnostic
s
more
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio
C
Hamano
Do not give alarming er
r
or mes
s
age f
r
om rsync in
f
etch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Linus Torvalds
[PAT
C
H]
Return
proper error va
l
ud from "parse
_
date(
)
"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
J
unio
C H
a
mano
Show modified file
s
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 H
a
mano
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
amano
Use GECOS fie
l
d a bit better to produce defau
l
t
h
uman
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Hamano
D
o
cument
-
i flag to
g
it
-
re
a
d
-tree
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Se
r
gey
V
lasov
[PATCH] D
o
cumentation: Update all f
i
l
e
s
t
o
u
se
t
he
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Sergey
V
lasov
[
PATCH] Documentat
i
on:
Add asciidoc
.
conf file a
n
d gitlink
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Linus Torvalds
Fix extended
s
h
ort SHA
1
name completion
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Hamano
Ship our own copy of subprocess
.
p
y
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next