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
[PATCH] Don't output 'Automatic merge failed, ...'
2005-09-13
Fredr
i
k Kui
v
inen
[
PA
T
CH] Do
n
'
t out
p
ut '
A
uto
m
ati
c
merge
fa
i
led,
.
.
.
'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik K
u
i
vinen
[PATCH]
B
e
mor
e
like
t
he
'resolve' str
a
tegy
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Junio C
Hama
n
o
[PATCH] Define rel
a
tiv
e
.
git/objects/info/alternates
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Junio C H
a
mano
Detect
ls-re
m
ote
f
ailure pr
o
perly
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik K
u
i
v
inen
[PATCH] Rename
t
he 'f
r
edr
i
k' merge s
t
rategy t
o
'recursive'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Junio C Hamano
Fix off-by-one
er
r
o
r
in gi
t
-merge
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Junio C Hamano
Pr
o
pagat
e
err
o
rs from fetch
-
pack correctly to gi
t
-fetch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Junio C Ham
a
no
Fix CDPATH proble
m
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Junio C Hamano
Document git-grep and link it from
the main git(7)
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
J
uni
o
C Ham
a
no
[PATC
H
] Make 'git check
o
ut' a bit more forgiving
when
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Junio C
Hamano
[PATCH
]
Om
i
t
patches that have already been mer
g
ed
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Hors
t
von Brand
[PATCH] There are several u
n
documented depend
e
nci
e
s
commit
|
commitdiff
|
tree
2005-09-13
Linus
Torvalds
Improve
"git
grep" fl
a
gs
handl
i
ng
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik K
u
ivinen
[PATCH] Make
the Progr
a
m
Er
r
or class printa
b
le
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-12
F
redri
k
Kuivinen
[PATCH] Make s
u
re we
d
ie i
f
we
d
on't get enough argum
e
nts
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-12
Fre
d
rik
Kuivin
e
n
[PATCH] I
n
tro
d
uce
a 'die' fun
c
tion
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kui
v
inen
[PA
T
CH] Exit with status code 2 if we get an exception
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-12
Fredr
i
k
Kuivinen
[PATCH]
Fix assertion failure
when
m
erging com
m
on ancesto
r
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-12
Junio C Hamano
Allow finding
thi
n
gs
that begin
w
it
h
a
da
s
h
i
n 'git
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-12
Linus
Torval
d
s
[
P
A
TCH]
A
dd "git grep
"
helper
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-12
L
i
nus To
r
valds
[PA
T
CH]
A
d
d
note
about I
A
NA confirmation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-12
J
u
nio C Hamano
Use
i
n
t
instea
d
of socklen_t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-12
Herbert Xu
[PATCH]
A
pp
l
y
N
-> A status c
h
an
g
e
in diff-h
e
lper
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
martin@c
a
talyst
.
.
.
[PATCH] archimport - better handling of temp dir
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
mart
i
n@catalyst
.
.
.
[PATCH] archimp
o
rt - use GIT_DIR instead of
har
d
coded
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
m
art
i
n
@
c
a
talyst
.
.
.
[PATCH]
a
rchimport - update in-script
d
oco, op
t
i
o
n
s
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
martin@catalyst
.
.
.
[PATCH] arc
h
i
m
p
o
rt documentation
t
id
y
up
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
m
a
rtin@cata
l
ys
t
.
.
.
[PATCH] archimport doc
u
m
e
ntation update
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Yasushi SH
O
JI
[PATCH
]
Escape as
c
iidoc's
built-in em-
d
ash replac
e
ment
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Qingning Huo
[PATCH] Fix buffer overflow in ce
_
flush
(
)
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
J
unio C H
a
m
ano
Add a new merge strategy by Fredrik K
u
i
vi
n
e
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Junio
C
Hamano
'gi
t
-merge': Documentation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Jun
i
o C
H
amano
Use Daniel's read-tree i
n
t
he merge strategy '
r
e
solve'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Hamano
Multi-backend m
e
r
g
e driver
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Ha
m
ano
Plug lea
k
in Daniel's
read-t
r
ee
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Hamano
[PATCH] Add debugg
i
ng
h
elp for
case #16 to re
a
d-tree
.
c
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Hamano
[
PA
T
C
H] D
i
sable debugging from r
e
ad-tree
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Daniel Barkalow
[PATCH
]
Document the trivial
merge rules for 3
(
+more
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Dani
e
l
Barka
l
ow
[
PAT
C
H]
R
ew
r
ite read-tr
e
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Dan
i
el Bar
k
alow
[PATCH] Add
f
unction to a
p
pend to
an object
_
list
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
D
aniel Barkalow
[PATCH] Add a function for getting a struct tree for
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
J
u
nio C Ham
a
no
Fix 'git-sh
o
w-bra
n
ch --l
i
st
<
head
>
'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-10
Junio C
Ha
m
ano
A
d
d 'git bisect replay/log' documentat
i
on
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-10
Jun
i
o C Hamano
Keep bisectio
n
log so
that i
t
can be
r
eplayed la
t
er
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-10
Ju
n
io C Hamano
F
ix copy marking from di
f
fcore-rename
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-10
marti
n
@cataly
s
t
.
.
.
[PATCH] archimport -
a
dd me
r
ge detection
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-10
Ju
n
io
C
Hamano
Make sure we have leading di
r
e
c
tories un
d
er
ref
s
/{heads
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-10
Sven Verdoolaege
[PATCH] Documenta
t
ion/repository-layout
.
txt typo
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-09
Junio
C
Ham
a
no
show-branch:
-
-list and --independe
n
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-09
Junio C Haman
o
Retire su
p
port f
o
r old environment variables
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-09
Junio C Hamano
Adjust
.
g
i
t
i
gn
o
re f
o
r bi
g
rename
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-09
Marco Roel
a
nd
[PATCH
]
remov
e
duplicat
e
git-sen
d
-email-scr
i
p
t
.
per
l
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-09
jdl@freescale
.
com
[PATCH] fix t
u
torial typo
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-09
jdl@freescale
.
c
o
m
[PATCH]
F
i
x tuto
r
ial r
e
fer
e
nce to
git-*-scripts
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-09
Junio C Hamano
Ignore datestamp-
o
nly ch
a
nges when installing web
d
oc
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-09
Junio C Hamano
Squelch `removal' message
from 'git re
s
et --hard'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-09
Junio C Hamano
'build' script
s
before installing
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-08
J
unio C Haman
o
Show all
me
r
ge-base cand
i
dates from s
h
ow-branch --merge
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-08
Junio C Hamano
D
ocumentation updat
e
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-08
lars
.
do
e
l
le@on-
l
ine
.
d
e
[PAT
C
H] git-
d
a
em
o
n --i
n
e
t
d
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-08
Junio
C
Hamano
git --ve
r
sion te
l
ls which version of git you have
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-08
Amos
Wa
t
erland
[PATC
H
] Do not cre
a
t
e
b
og
u
s branch
from
f
lag to git
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-08
Patr
i
c
k
M
a
u
ritz
[PATCH
]
Portabi
l
ity fix
for
Sola
r
is 10/x86
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-08
J
unio C Hama
n
o
Bi
g
t
ool
r
e
na
m
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-07
Junio C H
a
m
a
no
GIT 0
.
99
.
6
commit
|
commitdiff
|
tree
2005-09-07
David_Kå
g
edal
[PATCH] Simplify
git
s
crip
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-07
Junio C Hamano
Documentation updates
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-07
A Large
A
ngry SC
M
[P
A
TCH
]
Doc
s
for git-build
-
rev-c
a
che
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-07
A Large Angry SCM
[PA
T
C
H] Docs for g
i
t-show-rev-cache
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-07
A Large Angr
y
SCM
[PATCH] Docs for
gi
t
-reset-script
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-07
A Large Angry
S
CM
[PATCH] Docs
for gi
t
-che
c
kout-script
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-07
Ju
n
i
o
C
Hamano
Documentat
i
on
u
pdat
e
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-07
Junio C Hamano
Flatten tools
/
directory
t
o ma
k
e build pr
o
cedur
e
simpler
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-06
Juni
o
C
Hamano
mailinfo: bar
f
a
n
d exist upon ne
s
ted mult
i
part
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-06
Junio C H
a
mano
Merge bra
n
ch 'master' of
.
commit
|
commitdiff
|
tree
2005-09-06
R
e
ne Sch
a
r
f
e
[PATCH] Update documentation
for git-get-tar-
c
o
m
m
i
t-
i
d
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-06
H
.
P
eter Anvin
[PATCH]
git
-
cvsimport-s
c
ri
p
t: h
a
ndling of
t
a
gs
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-06
Junio C Hamano
Format fix
for asciidoc
documentation
t
i
tles
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-05
Juni
o
C Hamano
Merge bra
n
ch
'
maste
r
' of
.
commit
|
commitdiff
|
tree
2005-09-05
J
u
nio C Haman
o
Retire git-clone-
d
u
m
b-http
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-05
Ryan A
n
derson
[
PATCH] Update documentation of --co
m
pose to g
i
t-send
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-05
R
yan
A
nde
r
son
[PATCH] M
a
ke git-
s
end-
e
mail-scri
p
t i
g
nore so
m
e
u
n
n
ecessar
y
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-05
Junio C Hamano
Ins
t
all ar
c
himport-
s
cript
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-04
Junio
C
Hamano
Merge
b
r
anch 'master
'
o
f
.
commit
|
commitdiff
|
tree
2005-09-04
Junio C
H
amano
Add copy/renam
e
c
heck
for g
i
t
-
ap
p
ly
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-04
Jun
i
o C H
a
mano
Add a link
f
rom update-serv
e
r-info docu
m
en
t
ation t
o
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-04
Fredrik Kuivinen
[PA
T
CH
]
Make
g
it
-
apply und
e
rstand incomplete
l
i
nes
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-04
Junio C Hamano
git-applymb
o
x: fix '-c'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-04
Martin Lan
g
hoff
[PA
T
CH] archimport
:
avoid co
m
mitting o
n
an Ar
c
h
tag
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-04
Martin La
n
ghoff
[PAT
C
H
]
archi
m
port
a
uto
d
e
t
ects import s
t
atus, supports
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-04
Sergey
Vlasov
[PATCH] N
U
L t
e
r
min
a
t
e the object data
i
n p
a
tch_delta
(
)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-04
Pe
t
er H
a
gervall
[PATCH] P
o
s
s
i
b
l
e c
l
eanups for loca
l
-pull
.
c
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-04
Paolo 'Blaisorblade
.
.
.
[PATCH] Doc: replace rea
d
-cache with git-read-tree
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-03
Junio C
H
amano
Docu
m
e
n
t hooks
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-02
Ju
n
i
o C Hamano
Merge
branch 'ma
s
t
e
r' of
.
commit
|
commitdiff
|
tree
2005-09-02
Junio
C
Hamano
M
e
nti
o
n post
-
upda
t
e w
h
e
n
we first tal
k
about publishing
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-02
Junio C Hamano
scripts:
e
q
u
ality test '==' is not
p
o
rtable
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-02
Ju
n
io
C Hamano
git-check
o
ut-script:
Remo
v
e unnecessary variable
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-02
Junio C Hamano
Fix
a
utomerge
m
essage
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-02
Amos Waterland
[PATCH] Explain
w
hat went wrong on update-cache of
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next