repo.or.cz
/
git
/
wpalmer.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
F
redrik Kuiv
i
nen
[P
A
TCH] Do
n
't
o
utput
'Automatic merge fa
i
led,
.
.
.
'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
F
r
edrik
K
uivinen
[PATCH]
Be more like the 'resolve' strateg
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Junio C Hamano
[PATCH] Define
r
elativ
e
.
gi
t
/
obje
c
t
s
/info/alternates
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Junio C
H
a
m
a
no
Detec
t
ls-r
e
mote failure
p
rop
e
rly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivine
n
[
P
AT
C
H
]
Rename the 'fredrik' merge strategy to 'rec
u
rsive'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Junio C
Hamano
Fix off-by-one error in g
i
t-merge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Jun
i
o C Hama
n
o
Propagate err
o
rs from fe
t
ch-pack corre
c
t
l
y to git-fet
c
h
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Junio C Hamano
Fix C
D
PATH probl
e
m
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Juni
o
C Ha
m
ano
Docume
n
t git-gre
p
and link it f
r
om the main git(
7
)
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
J
unio C H
a
mano
[
PA
T
CH]
M
a
k
e 'git c
h
eck
o
ut' a b
i
t m
o
re
forgivi
n
g w
h
en
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Junio C Ha
m
ano
[P
A
TC
H
] Omit
p
atches that have already been merged
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Hors
t
von Brand
[
P
A
TCH] Th
e
re
ar
e
sev
e
ral undocumented d
e
pendencie
s
commit
|
commitdiff
|
tree
2005-09-13
Linus Torvalds
Improve "git grep" flag
s
handling
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-12
Fredri
k
K
u
ivinen
[PATCH
]
Make the Progra
m
E
r
ror class
p
rintable
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-12
Fredr
i
k Kui
v
inen
[PAT
C
H]
M
ake sure we die if we
d
on't
g
et en
o
u
gh arguments
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kui
v
inen
[
P
ATCH]
Introduc
e
a 'die' function
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PAT
C
H]
E
xit with
status
c
o
d
e 2 if we ge
t
an exception
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-12
F
r
ed
r
ik Ku
i
vinen
[PATCH] Fix as
s
ertion failure w
h
en
m
ergi
n
g
commo
n
ancestors
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-12
J
unio C Hama
n
o
A
llow finding t
h
i
n
gs that begin with
a
dash i
n
'g
i
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-12
Linus Torvalds
[
PATC
H
] A
d
d "git grep" helper
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-12
Linus Torval
d
s
[PATCH] Add note
a
bout
I
ANA confirmation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-12
Jun
i
o C Hamano
Use int in
s
tead of socklen_t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-12
Herbert Xu
[PATCH] Apply N -> A sta
t
u
s change in diff-help
e
r
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
martin@catalyst
.
.
.
[PATCH] archimport - bett
e
r handling of temp di
r
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
martin@cataly
s
t
.
.
.
[PATCH] archi
m
po
r
t
-
use GI
T
_DIR inste
a
d of hardcoded
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
martin@cataly
s
t
.
.
.
[PATCH]
archim
p
ort -
update in-sc
r
ipt d
o
co, options
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
marti
n
@catalyst
.
.
.
[PATCH] archi
m
p
ort documentation tidyup
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
martin@catalyst
.
.
.
[
PATCH] arch
i
mport do
c
u
m
en
t
ation update
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Y
asushi SHO
J
I
[PATCH] Escape ascii
d
o
c
's built-
i
n em-da
s
h repl
a
c
e
ment
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Qingning Huo
[PATCH] Fix buf
f
e
r overfl
o
w in ce_f
l
ush(
)
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Hamano
A
dd a new me
r
ge s
t
rate
g
y by
Fredrik Kuivi
n
en
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Hamano
'git-
m
erg
e
'
: Documentat
i
on
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Jun
i
o
C Hamano
Use Daniel's r
e
a
d
-t
r
ee
in the merge strate
g
y
'resol
v
e'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
J
u
nio C H
a
mano
Multi-backend
m
erge dr
i
v
e
r
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Hamano
P
l
ug
l
eak in Daniel's read-
t
ree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
J
unio C Haman
o
[P
A
TCH] Add debuggin
g
help 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
[PATCH]
Dis
a
ble debuggin
g
from re
a
d
-tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Daniel Barkalow
[
P
A
TCH] Document the trivial merge
rul
e
s for
3
(+more
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
D
aniel Barkalow
[PATCH] Rewr
i
te read
-
tree
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Daniel Barkalow
[
P
ATCH] Add funct
i
on
t
o appe
n
d to an ob
j
ect_list
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Da
n
iel
Barkalow
[PATCH] A
d
d a
f
uncti
o
n for ge
t
ti
n
g a
s
truct tree for
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
J
un
i
o
C Hamano
Fix 'gi
t
-sh
o
w
-branch -
-
list <h
e
ad>'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-10
Junio C Haman
o
A
dd
'
git
bisect replay/
l
o
g
' documentation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-10
Junio C Haman
o
K
eep bisection log
s
o
that it ca
n
be replayed late
r
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-10
Junio C Hamano
F
ix c
o
py
m
ar
k
ing from diffcore-rename
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-10
marti
n
@catalyst
.
.
.
[PA
T
CH] arch
i
mp
o
rt -
a
dd merge d
e
tecti
o
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-10
Junio C Hamano
Make sure we have l
e
a
d
i
n
g dire
c
tories under refs/{
h
eads
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-10
S
v
e
n Ver
d
oolaege
[PATCH]
D
ocu
m
entation/repository-layout
.
txt
t
ypo
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
J
u
nio C Hamano
show-bran
c
h: --list and --
i
ndepend
e
n
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
J
u
nio C Hamano
Retire
s
u
p
p
ort
for
old
env
i
ronment var
i
ables
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
J
unio
C H
a
mano
Adjust
.
g
i
t
i
gno
r
e for big ren
a
me
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
Mar
c
o Roeland
[PATCH] remove dupl
i
c
ate
g
it-send-emai
l
-script
.
perl
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
jdl@freesc
a
l
e
.
com
[PATCH] fix tutor
i
al t
y
p
o
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
jd
l
@f
r
eescale
.
com
[PATCH] F
i
x
t
u
to
r
ial reference
to git-*-
s
cripts
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
Junio C Hamano
Ignore dates
t
amp-
o
n
l
y changes
when installing
webdoc
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
Ju
n
io C
H
a
m
ano
Squelch `rem
o
va
l
' message
f
r
o
m 'git reset --har
d
'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
J
u
ni
o
C Ham
a
n
o
'build'
s
c
r
ipts b
e
fore
i
nstal
l
in
g
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-08
J
unio C
H
amano
Show all merge-base candidates from
show-branch --m
e
r
ge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-08
Junio C Haman
o
Docum
e
n
tati
o
n updates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-08
lars
.
doell
e
@on-line
.
de
[
PAT
C
H
]
git-daem
o
n --inetd
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-08
Junio C Hamano
g
i
t --version t
e
l
l
s which
v
ersion of
g
it you
have
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-08
Am
o
s Waterland
[PATCH] Do
n
o
t create
bogus
branch from flag to
git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-08
Patrick
Mauritz
[
P
ATCH] Portability fix f
o
r Solaris 10/x86
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-08
Ju
n
io C Hamano
Big tool
r
ename
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-07
Junio C Hamano
GIT 0
.
99
.
6
commit
|
commitdiff
|
tree
2005-09-07
David_Kåg
e
dal
[PATCH] Sim
p
lify git s
c
ript
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-07
Jun
i
o C
H
amano
Docum
e
ntat
i
on up
d
ates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-07
A Large Angry SCM
[
PATCH] Docs for git-build-rev-cache
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-07
A L
a
rge Angr
y
SCM
[PATCH
]
Docs fo
r
git-show-rev-
c
a
che
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-07
A
L
arge An
g
ry SCM
[PATCH]
Docs fo
r
git-re
s
e
t
-
script
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-07
A La
r
g
e Angr
y
SCM
[
P
AT
C
H] Docs for git-ch
e
ckout-script
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-07
Junio C Hamano
Doc
u
ment
a
ti
o
n upd
a
tes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-07
Junio C Hamano
Flatten
t
ools/ di
r
ectory t
o
make build procedur
e
simpler
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-06
Junio C
H
amano
ma
i
linfo
:
bar
f
and e
x
ist u
p
on nested m
u
ltipart
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-06
Junio C Ham
a
no
M
erge branch 'm
a
ster' of
.
commit
|
commitdiff
|
tree
2005-09-06
Rene Scharfe
[
PA
T
CH]
Update
d
ocumenta
t
i
o
n for gi
t
-get-tar-commit-id
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-06
H
.
Pet
e
r
Anvin
[PAT
C
H]
git-cvsimport-script
:
handling of tag
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-06
Juni
o
C
Hama
n
o
Format fix
for a
s
ciid
o
c documentation titles
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-05
Junio C
Hamano
M
e
rge bra
n
ch 'm
a
ster' of
.
commit
|
commitdiff
|
tree
2005-09-05
Junio C
Hamano
Retire git-
c
lo
n
e-dumb-
h
ttp
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-05
Ryan Anderson
[PATCH] Update documentati
o
n of --compose to git-send
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-05
Ryan Anderson
[PATCH] Ma
k
e
git-send-
e
mai
l
-script ign
o
r
e some unnecessary
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-05
Junio C H
a
mano
Install
arch
i
m
port
-
scri
p
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-04
Juni
o
C Hamano
Merge br
a
nch 'master' of
.
commit
|
commitdiff
|
tree
2005-09-04
Jun
i
o C Hamano
Ad
d
copy/rename check
for git-a
p
ply
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-04
Junio
C
Ham
a
no
Add
a link fro
m
upda
t
e
-
serve
r
-in
f
o
docu
m
e
n
tation to
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-04
Fredrik Kuivinen
[
PATC
H
]
M
ake git-app
l
y
understand i
n
complete
l
ines
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-04
J
unio C Hamano
g
it
-
applymbox: fix '-
c
'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-04
Martin L
a
ngho
f
f
[PA
T
CH] archimport: avoid committing on a
n
Arch
tag
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-04
Martin Lan
g
hoff
[PA
T
CH] arch
i
m
port autod
e
tects i
m
port
st
a
tus, s
u
pports
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-04
S
e
r
g
ey V
l
asov
[
PATCH
]
NUL termin
a
te the o
b
j
e
ct da
t
a in patch_del
t
a()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-04
Peter Hagervall
[PATC
H
]
P
oss
i
ble cleanups for
local
-
pull
.
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-04
Paolo 'Blaisorblade
.
.
.
[
PATCH] Do
c
: replace read-cache with g
i
t-
r
ead-t
r
e
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-03
Junio C
Hamano
Documen
t
hooks
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-02
J
u
nio
C Hamano
Mer
g
e
branch
'
master' of
.
commit
|
commitdiff
|
tree
2005-09-02
Jun
i
o C Hamano
Men
t
ion post-update when w
e
first talk
a
bout publishing
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-02
Junio C Hamano
scripts: e
q
ual
i
ty t
e
st '==' is not por
t
ab
l
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-02
Junio C
Ha
m
ano
g
it-che
c
kout-scri
p
t: Remove u
n
necessary v
a
r
i
able
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-02
Junio C H
a
mano
F
i
x automerge mes
s
age
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-02
Amos
W
aterland
[PATCH] Ex
p
l
a
in what went wrong
o
n update-
c
ach
e
of
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next