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
Handle really trivial case inside git-merge.
2005-10-02
J
uni
o
C Hamano
Handle r
e
ally trivial case insid
e
g
it-
m
erge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-02
Linus Torvalds
read-tree: --t
r
ivial
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik
Kuivinen
[PATCH] T
e
ach gi
t
-ls-files about '--
'
to denot
e
end
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Kuivi
n
e
n
[PATCH] Teach the r
e
cursive merg
e
strategy
a
bou
t
renames
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-02
Junio C H
a
mano
r
e
ad-t
r
ee:
r
emove --head opti
o
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-02
Junio C Hamano
Cu
s
tomize git command for in
s
t
a
l
l
ations that lack certain
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-02
Ha
n
Boe
t
es
[PATCH] git on OpenBSD
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-02
Linu
s
Torvalds
[PATC
H
]
Re-instate index f
i
le write optimizat
i
o
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-02
Linus Torvalds
[
P
ATCH]
Better er
r
or reportin
g
f
o
r
"git status"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-02
J
unio C Hamano
More porta
b
ility
.
Signed-off-by:
Junio C Hamano
<junio@twinsun.com>
commit
|
commitdiff
|
tree
2005-10-02
Junio
C
Hamano
Add
g
i
t-sy
m
bolic-ref
Signed-off-by:
Junio C Hamano
<junio@twinsun.com>
commit
|
commitdiff
|
tree
2005-10-02
Junio
C Hamano
Use resolve_ref() to implement read_ref
(
)
.
Signed-off-by:
Junio C Hamano
<junio@twinsun.com>
commit
|
commitdiff
|
tree
2005-10-02
Linus Torvalds
[PATCH]
Allo
w
r
e
ading "symbolic refs" that poin
t
to
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-02
Junio C Hamano
T
each upda
t
e-re
f
ab
o
u
t
a sy
m
bolic ref s
t
ore
d
in
a te
x
tfile
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-02
L
inus Torvalds
[
P
ATC
H
] git f
e
t
ch --tags
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-02
Nick Hengeveld
[PATCH] HTTP p
a
rtia
l
transfer supp
o
rt
fix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-02
J
un
i
o
C Hamano
Update partial HTTP
transfers
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-02
Nick Hengeveld
[
P
ATCH]
H
TTP par
t
i
a
l transf
e
r
support
f
or object
,
pack
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-02
Juni
o
C Hamano
Pass CVSps generated A U T
h
or <author@dom
a
in
.
x
z> intact
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-02
M
a
r
t
in Langhof
f
[PATCH] archimport:
Actually cope with m
e
rges f
r
o
m
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-02
Junio C Hamano
Honor extractor's umask in git-ta
r
-
t
re
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-01
J
u
nio C
H
amano
Honor u
s
er'
s
u
m
ask
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-01
Linus Torvalds
[PAT
C
H
]
Fl
a
g
e
mpty patche
s
a
s
e
rrors
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-01
Junio C Ham
a
no
Consolidate null_sh
a
1[]
.
Signed-off-by:
Junio C Hamano
<junio@twinsun.com>
commit
|
commitdiff
|
tree
2005-09-30
Junio C Hamano
Stil
l
ins
t
alling t
h
e old command names
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-30
Junio C Ham
a
n
o
Tell which
packfile is corrupt when
w
e
d
i
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-30
Pavel Roskin
[PATCH]
Make log
e
rror() a
n
d
loginf
o
(
)
static
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-30
Johann
e
s
S
chin
d
elin
[PATCH]
Old curl
d
oes n
o
t know
a
bout CURL
O
PT_SSLKEY
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-29
Junio C Hamano
Use git-mer
g
e
in git-pull (second try)
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-28
Jun
i
o C Haman
o
Use git-up
d
ate-ref in scripts
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-28
Peter Ha
g
ervall
[PATCH]
M
ake some needle
s
sly global
stuf
f
static
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-28
Nick
H
engeveld
[PATCH] S
u
p
p
o
r
t for m
o
re CUR
L
SSL settings via
e
n
viro
n
ment
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-28
Tom Prince
[
PATCH] A
d
d n
e
w
p
r
ograms to
.
giti
g
nore
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-28
Jun
i
o C
Hamano
Fastpath the no
r
mal
c
a
se by not checking that
i
nde
x
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-28
J
unio
C H
a
m
a
n
o
Fix defau
l
t pull no
t
t
o
do an unintend
e
d Octopus
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-28
Ju
n
i
o
C Hama
n
o
Upda
t
e the c
a
se ta
b
le
in t/t1000
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-28
Juni
o
C Hamano
Merge master
.
kernel
.
o
rg:/home/hpa/git/daemon
commit
|
commitdiff
|
tree
2005-09-27
J
u
n
io C Hamano
git-commit: use up
d
ate-inde
x
--stdin, in
s
tead o
f
xargs
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
J
u
nio
C
Ham
a
no
updat
e
-i
n
dex:
document --stdin and -z
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Junio C H
a
mano
upda
t
e-index: --stdin and -z
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Nick
Hengeve
l
d
[PAT
C
H] Ret
u
rn CURL error mess
a
g
e
when object transfer
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Daniel Barkalow
[
PATC
H
] Im
p
lem
e
nt --recove
r
for
git-*-fe
t
ch
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Sven Verdoolaege
[PA
T
CH] Pro
v
ide access to g
i
t_dir
t
hrough
get_
g
it_dir()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Peter E
r
iksen
[PA
T
C
H
] M
a
ke the test
m
ore shell
g
eneri
c
an
d
fix missing
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
J
u
nio
C Hamano
Really re
q
uire tk 8
.
4 (RPM)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Junio C Hamano
Require
tk 8
.
4
(RP
M
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Junio C
H
a
m
ano
Merge http://www
.
kernel
.
org/pub/s
c
m
/
git
k
/gitk
commit
|
commitdiff
|
tree
2005-09-27
J
u
n
io C
H
amano
g
it-
f
e
tch: send informational out
p
ut to >&2 consistently
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Juni
o
C H
a
m
a
no
G
ive def
a
ult
m
erge message after
failed automerge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Junio C H
a
mano
D
o
not req
u
ire
clean tr
e
e
when reverting and cherry
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
J
unio C
H
amano
F
i
x over
z
ealous c
l
eanl
i
n
e
ss check in git-mer
g
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
J
u
nio C Hamano
git
-
cl
o
n
e
: check out
"
master
"
b
y
def
a
ult
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-26
Ju
n
i
o
C Ha
m
a
no
Plug a smal
l
rac
e
in update-ref
.
c
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Linus
T
orvalds
[PA
T
CH] Add "git-upda
t
e-
r
ef" to u
p
dat
e
the HE
A
D (or
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
F
redrik Kuivi
n
en
[PATCH] More
des
c
r
iptive messages for confl
i
ct
cases
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Kuivinen
[PATC
H
]
recursive-merge:
D
on't print a stack
trace
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Junio C H
a
mano
Dif
f
: -
-
n
am
e
-status ou
t
put
f
orm
a
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Junio
C
Ha
m
ano
Di
f
f: -l<num> to limit
re
n
ame/copy
dete
c
tio
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Juni
o
C
Hamano
D
iff
c
lean-up
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Juni
o
C
Hama
n
o
Merge branch 'fixes'
commit
|
commitdiff
|
tree
2005-09-25
Junio
C Hamano
Clean genera
t
ed files a bit m
o
re
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Junio
C
H
amano
Stop in
s
talling the backw
a
rd
c
ompati
b
le sym
l
inks
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Junio C Hamano
show-branch
:
f
ix commit naming
breakage
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
D
a
niel B
a
rkalow
[PATCH
]
Finish d
o
cumen
t
i
ng
trivial merge rules
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio
C
Hamano
gi
t
-grep: fix 'git grep -e $
p
atte
r
n
'
h
a
n
dl
i
ng
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
J
u
nio C
H
amano
Rem
o
v
e
u
s
e
of 'xar
g
s -0' from
git-rese
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Ju
n
io C Hamano
Use 0
.
99
.
7
.
GIT
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
J
unio C Ham
a
no
Solaris: give a bit more bui
l
t-in defaults
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Patric
k
Mauritz
[PATCH] CURLDIR in
Mak
e
fil
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Petr Baudis
[PATCH] Rename daemon
.
c's log
n
o
ti
c
e() to lo
g
i
nfo
(
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Petr Baudis
[PATCH] git-d
a
emon --syslo
g
to log through
syslog
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
P
e
t
r
Baudis
[
P
ATCH] Update git-daemon
doc
u
ment
a
t
i
o
n
wrt
.
the -
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C H
a
mano
Really i
g
nore generated distribution ma
t
erial
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Hamano
dae
m
on
.
c:
pid_t is not i
n
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio
C
Hamano
Me
r
ge 'fixes' bra
n
ch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Jun
i
o C Hamano
Further clarify lice
n
sing status of compat/subpr
o
c
ess
.
p
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
H
.
Peter Anvin
[PATCH] rsh
.
c u
n
terminated
s
tring
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
S
e
r
g
ey Vlasov
[
P
AT
C
H]
git-
l
oc
a
l-fetch: Avoid confus
i
ng e
r
ror
m
essag
e
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Ser
g
ey Vl
a
sov
[PATCH]
F
ix
"
git-local-fetch -s" w
i
th p
a
cked sourc
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Serg
e
y Vl
a
sov
[PA
T
CH] git-local-fetch: Avoid
ca
l
ling close(-1)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Serge
y
Vlasov
[PATCH]
g
it-local-fetch: Fix error c
h
e
c
k
i
ng an
d
l
e
ak
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Sergey Vlasov
[PAT
C
H] fetch
.
c
: Plug memory le
a
k in proc
e
ss
_
tr
e
e()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
S
e
rg
e
y Vlasov
[PAT
C
H
] fetch
.
c: Do
not
b
u
i
l
d o
b
ject ref lists
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Ro
b
ert Watson
[
P
ATCH] document comman
d
to
s
how diff of a
c
ommi
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Junio C Hamano
I
gno
r
e a bit more generated files
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Junio C Ham
a
no
Merge branch 'fixes'
commit
|
commitdiff
|
tree
2005-09-23
Juni
o
C Hamano
Make 'git di
f
f --
c
ached' synonymo
u
s
to 'git
d
iff -
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Sergey Vlasov
[PATCH] fet
c
h
.
c
:
Remove call t
o
parse_o
b
ject()
fro
m
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Serge
y
Vl
a
sov
[
PATCH] fetch
.
c
:
Cle
a
n up object flag def
i
n
itions
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
S
e
r
gey V
l
a
s
ov
[PATCH] fetch
.
c
:
R
emo
v
e redundant test of TO_SCA
N
in
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Sergey Vlasov
[PATCH] fetch
.
c: Remove some duplicat
e
d c
o
de in process()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Ser
g
ey Vlasov
[PATCH] fetch
.
c: Remove redund
a
nt
T
O_FET
C
H flag
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Sergey Vlaso
v
[
PAT
C
H]
f
etch
.
c: Remov
e
r
edun
d
ant SCANNED
fl
a
g
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Ser
g
ey Vlasov
[PATCH] fetch
.
c: Make proce
s
s() loo
k
a
t each o
b
je
c
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Sergey Vlasov
[PA
T
CH] f
e
tc
h
.
c: Remove useles
s
lookup_object_type
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
J
unio C Ham
a
no
Do not give a
l
ar
m
i
n
g
e
rror me
s
s
age from rsync i
n
fe
t
c
h
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Jon Loelig
e
r
[
P
ATCH]
Retitle
'
i
nspecting wh
a
t
happened
'
secti
o
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Junio C Ha
m
ano
P
rettyprin
t
octopus merge
messag
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Petr Baudis
[
PAT
C
H] Verbo
s
e
git-da
e
mon l
o
gging
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-22
Junio C Hamano
Retire diff-he
l
p
e
r
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next