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
Give default merge message after failed automerge.
2005-09-27
Ju
n
io C Ha
m
ano
Give
d
efaul
t
m
e
rge
m
essage a
f
t
er failed
automerg
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
Junio
C
Hamano
Do not re
q
uire clean
t
r
e
e
when r
e
vert
i
ng and
c
h
err
y
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
Junio C H
a
mano
Fix overz
e
alous cleanline
s
s check in
g
it-m
e
r
g
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
Junio C Ha
m
ano
g
i
t-clon
e
: che
c
k
o
ut "m
a
ster" by default
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-26
Junio C H
a
ma
n
o
Plug
a small race in up
d
ate-ref
.
c
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
L
i
nus Torvalds
[PATCH]
Add "git-upd
a
te-ref" to u
p
dat
e
the H
E
AD (or
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
F
redrik
K
uiv
i
nen
[PATCH] M
o
re descriptive messa
g
es
f
or
c
o
nflic
t
cases
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
F
redrik
K
ui
v
inen
[
P
ATCH] recursive-merge: Don't
print a s
t
ack trac
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
Junio C
H
amano
Diff:
--na
m
e-stat
u
s output
f
ormat
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
Junio C Hamano
Diff: -
l
<
n
u
m
> to limit rename/co
p
y detection
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
Junio C Hamano
D
i
f
f clean-
u
p
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
Junio C H
a
man
o
Merge branch
'
fixes'
commit
|
commitdiff
|
tree
2005-09-25
Junio C Haman
o
Clean
gener
a
ted files a bit more
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
Junio
C Hamano
Stop installing th
e
back
w
ard compatible symlinks
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
Junio C Hamano
show-branc
h
: fix
c
ommit n
a
ming breakage
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
Daniel Barkalow
[PATCH] Finish documenting
trivial merge rules
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Jun
i
o C Hamano
git-grep:
f
ix
'git gre
p
-e
$
patt
e
r
n
' handling
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
J
u
ni
o
C Haman
o
Remove
u
se of 'xargs
-
0
' from gi
t
-
reset
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Juni
o
C Hama
n
o
U
s
e 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
Junio C
Ha
m
ano
Sol
a
r
is: gi
v
e
a
bit mor
e
built-
i
n defaults
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
P
atrick Ma
u
r
itz
[PAT
C
H] CURLD
I
R i
n
M
a
kefile
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
P
e
tr Baud
i
s
[PATCH] Re
n
ame daemon
.
c's lognotice() to loginf
o
()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Petr Baudis
[PATCH]
git-daemon --syslog to log through syslog
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Petr Baudis
[
P
ATCH]
Update
g
it-daemon documentat
i
on wrt
.
the -
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
J
u
n
io C Ham
a
no
Reall
y
ignore g
e
n
erated
d
ist
r
ibu
t
ion material
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Jun
i
o
C
Hamano
dae
m
on
.
c
:
pid_t is not int
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
J
u
n
io C Hama
n
o
Merge 'fixe
s
' branch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Jun
i
o C
H
ama
n
o
Fu
r
ther clarif
y
li
c
ensing
s
tatus
o
f compat/subpr
o
c
ess
.
py
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
H
.
P
eter A
n
vin
[PATC
H
]
rsh
.
c u
n
terminated stri
n
g
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Serg
e
y
V
lasov
[PATCH] git-loc
a
l-f
e
tch: Avoid confusing err
o
r messages
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
S
e
rgey Vla
s
ov
[PATCH
]
Fix "git-
l
oca
l
-fetch -s"
w
i
t
h pack
e
d source
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Se
r
gey Vlasov
[PATCH
]
git-lo
c
al-fetch: Avo
i
d
calling
c
lose(-
1
)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
S
e
rgey
V
la
s
ov
[PATC
H
] git-local-f
e
t
ch
:
Fix
e
rror checking and leak
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Sergey Vlasov
[PATCH] fet
c
h
.
c: Plug memory le
a
k in pro
c
ess
_
t
r
ee()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Sergey Vlasov
[
P
ATC
H
]
f
et
c
h
.
c
:
Do n
o
t bu
i
ld objec
t
ref lists
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Robert W
a
tson
[P
A
TCH] docu
m
ent command t
o
show diff of a com
m
it
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Jun
i
o C Ham
a
no
I
g
nore
a bit more
generated files
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Junio C Hamano
Merge b
r
anch 'f
i
xes'
commit
|
commitdiff
|
tree
2005-09-23
J
unio C Ha
m
a
n
o
Make '
g
it diff --ca
c
hed' synonymous to 'git di
f
f
-
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
S
e
rge
y
V
l
asov
[PATCH] fetch
.
c: Remove call to parse_obj
e
c
t
(
) fro
m
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Sergey
V
la
s
ov
[PATCH]
f
e
tch
.
c: Clean up object f
l
ag def
i
nitions
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Serg
e
y V
l
asov
[PATCH
]
fetch
.
c: Remove redu
n
d
a
nt
te
s
t
of TO_S
C
AN in
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Ser
g
ey Vlasov
[PATCH] fe
t
c
h
.
c: Remo
v
e some duplicated cod
e
in pro
c
ess()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Ser
g
ey Vlasov
[PATCH] fetch
.
c: Re
m
ov
e
redu
n
dant
TO_FET
C
H flag
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Sergey Vlaso
v
[PATCH]
fet
c
h
.
c: Remove re
d
u
n
dant SCANNED flag
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Sergey Vlaso
v
[PATCH]
f
e
tch
.
c: Ma
k
e process() look
a
t e
a
c
h
o
b
ject
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Sergey Vlasov
[PATCH] f
e
tch
.
c: Remov
e
useles
s
lookup_objec
t
_type
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Junio C Hamano
Do not give alarmin
g
error message f
r
om rs
y
n
c in fetch
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
J
o
n
Loeliger
[P
A
T
C
H
]
R
etitle 'inspect
i
ng what happened' s
e
ction
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Junio
C H
a
mano
Prettypri
n
t octo
p
us me
r
ge messa
g
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Pe
t
r Baudis
[PATCH] Verbo
s
e
g
it-daemon logging
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-22
Junio C
H
amano
Retire
d
iff-helper
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-22
J
unio C Ham
a
n
o
R
etire r
e
v-tree
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-22
J
unio C Ham
a
no
Retire gi
t
-ex
p
o
r
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-22
Linus Torva
l
d
s
[P
A
TCH] Fix
str
a
ng
e
timezone handling
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Junio
C
H
amano
Revert "
U
se git-merge
instead of git-
r
e
solve in git
.
.
.
commit
|
commitdiff
|
tree
2005-09-21
J
u
nio C Hama
n
o
Revert "Ma
k
e Octopus merge message a bit nicer
.
"
commit
|
commitdiff
|
tree
2005-09-21
Sergey Vl
a
sov
[
PATC
H
]
fetch
.
c: Remove call to
parse_o
b
j
ect() from
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Sergey Vlasov
[PATCH] fetch
.
c: Clean
u
p object flag
d
efinitions
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Serge
y
Vlasov
[PATCH] fetch
.
c: Remove redundant test
o
f TO_SCAN in
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Sergey Vlasov
[
PATCH] fetch
.
c: Remove some duplicated
code
in
pro
c
ess()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Sergey Vlasov
[
P
AT
C
H
] fetch
.
c: Remove redundan
t
T
O
_FETC
H
flag
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Sergey Vlasov
[PATCH] fetch
.
c: Remove
r
edund
a
nt SCANNED flag
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Ser
g
ey Vlasov
[PATCH] f
e
t
c
h
.
c: Ma
k
e process()
l
ook a
t
ea
c
h object
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Sergey Vlasov
[PATCH] fetch
.
c
:
Remove u
s
eless loo
k
u
p
_object_t
y
pe
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Jun
i
o
C
H
amano
Me
r
ge
branch 'fixes'
commit
|
commitdiff
|
tree
2005-09-21
J
u
n
io C Ham
a
no
Fix docu
m
entation
depe
n
d
e
ncy
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
J
unio
C
Hama
n
o
Make o
b
ject crea
t
ion in h
t
tp fetch a bit safer
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Ju
n
io C Hamano
Cl
a
rify dua
l
lice
n
se sta
t
u
s of su
b
process
.
py file
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Ju
n
io C Hamano
Upda
t
e
tutorial with
O
ctop
u
s usage
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Junio C
H
amano
Make Oct
o
p
u
s me
r
g
e message a bit nicer
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Junio C H
a
m
a
no
Use git
-
merge instead of git-resolve in git-pull
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Linus T
o
r
v
ald
s
Make
t
i
me-based commit fi
l
tering work with topological
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Li
n
us To
r
valds
[PATCH
]
T
each "git-
r
ev-parse" about date-based cut
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
N
i
col
a
s Pitre
[PATCH] ARM optimized SHA1
implementation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Petr Baudis
[
P
ATCH] Make t
h
e git-
f
sc
k
-ob
j
ects diagn
o
s
tics more
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Hamano
D
o
not give
alarming error message from
rsync in fet
c
h
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Linus Torvald
s
[PATCH] Return proper
e
r
ror v
a
lu
d
from "
p
arse_date()"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Ham
a
no
Show modified files in git-ls
-
files
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
J
unio C Hamano
Fast-path 'u
p
d
ate-index -
-
re
f
res
h
' a b
i
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Junio C
H
amano
Use GECOS field
a bi
t
b
e
tter
t
o p
r
od
u
ce
d
e
f
a
u
lt
human
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
J
u
nio C
Hamano
Docum
e
nt -i fla
g
t
o
git-read-tree
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Sergey Vlasov
[
PATCH] Docum
e
ntat
i
o
n
:
Upd
a
te all files
t
o
use the
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Serg
e
y V
l
aso
v
[PATCH]
Docume
n
tation:
Add
a
sci
i
d
o
c
.
c
o
nf
f
i
le an
d
gitlink
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
L
inu
s
Torvalds
Fix ext
e
nded short
SHA1 name completion
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Hamano
S
h
i
p our own copy
of sub
p
rocess
.
py
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
J
unio C Haman
o
s
ho
w
-br
a
nch: Be nicer
w
h
en running in a
corrupt repository
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Petr
Baudis
[PATCH] Fix git-init-d
b
creating
c
rap directories
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Patrick Maurit
z
[PA
T
CH] Do not install
c
ompati
b
i
l
i
ty symlink for what
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Linus Tor
v
al
d
s
[PATCH]
R
e
move total con
f
usio
n
from "git checkout"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-19
Linu
s
Torva
l
d
s
[
P
ATCH]
s
trcas
e
str compatib
i
lity replacem
e
nt
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-18
Juni
o
C
Hamano
GIT 0
.
99
.
7
commit
|
commitdiff
|
tree
2005-09-18
Junio C Ham
a
no
Arrgh
-- another asciidoc caret workaround
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-18
P
etr Baudis
[PA
T
CH]
Imp
r
ove git-up
d
at
e
-index error re
p
orting
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-18
Li
n
us Torvald
s
[PATCH] Improved "gi
t
a
dd"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-18
L
i
n
us Torv
a
lds
[PATCH] Add
"
-
-
git-dir" flag to git-
r
ev-parse
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-18
Daniel Barkalow
[PATCH] Support alt
e
rnates and http-alternates in http
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-18
Junio
C Hamano
Document
e
x
tended SHA1
used by g
i
t
-
rev-p
a
rse
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-18
Ju
n
io
C
Hamano
fetch()
a
ssumes we do not have the obj
e
ct
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-18
Junio C
H
aman
o
Merge b
r
a
nch
'master' o
f
.
commit
|
commitdiff
|
tree
next