repo.or.cz
/
git
/
dkf.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Add a new merge strategy by Fredrik Kuivinen.
2005-09-11
Ju
n
io C Hamano
Add a new merge strategy by Fr
e
d
r
i
k Kuivinen
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
J
u
nio C Hamano
'
git-merge': Documentation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Ju
n
io C Ha
m
ano
U
s
e D
a
niel's read-tree i
n
the mer
g
e
st
r
a
t
egy 'resolve'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio
C Hamano
Multi-backend merge dri
v
er
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
J
uni
o
C
Hamano
P
lug leak
i
n
Da
n
iel's
r
e
a
d
-tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
J
u
nio C Hamano
[PA
T
CH] Add debugging
help for case #16 to read-tree
.
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio
C Hamano
[PATCH] Disable debugging
f
r
o
m read-tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
D
a
niel Barkal
o
w
[PATCH] Docum
e
nt
the tri
v
ial merge rules fo
r
3
(+more
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Daniel
Barkal
o
w
[PATCH
]
Rewrite read-tree
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Daniel Barkalow
[P
A
T
CH] Add functio
n
to append to
an object_list
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Danie
l
Bar
k
a
l
ow
[PATCH] Add a fun
c
ti
o
n
for getting a struct tree fo
r
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Hamano
Fix 'git-show-bran
c
h --list <
h
e
a
d>'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-10
J
u
nio C Hamano
Add
'
gi
t
b
isect replay/log' doc
u
mentation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-10
J
unio C Hamano
Keep bisection
log so that it can be r
e
played later
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-10
J
u
nio
C
H
a
mano
Fix co
p
y marking
from diffcore-
r
enam
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-10
martin@catalyst
.
.
.
[PATCH] archimpo
r
t
- add me
r
ge det
e
ction
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-10
J
unio C Hamano
M
ake sure we have lead
i
ng directories under refs/{head
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-10
Sv
e
n Verdoola
e
g
e
[PATCH
]
Documentati
o
n/repos
i
to
r
y-layout
.
txt
t
y
po
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
Jun
i
o C H
a
ma
n
o
show-bran
c
h: --list
a
n
d --independe
n
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
J
u
nio C Hamano
Retire
s
up
p
ort for old environment variables
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
J
u
nio C Ham
a
n
o
A
djust
.
g
i
tign
o
re fo
r
big
rename
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
Marco
R
oel
a
nd
[PATCH]
r
emov
e
dup
l
icate
g
it-s
e
nd-ema
i
l-scrip
t
.
perl
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
jd
l
@
f
re
e
scale
.
c
om
[PATCH] fix tutoria
l
typo
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
jdl@freescale
.
com
[PATCH] Fix tu
t
orial re
f
erenc
e
to git-*-s
c
r
ip
t
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
Junio
C
Ha
m
ano
Ignor
e
d
a
t
estamp
-
onl
y
changes
when installing
web
d
o
c
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
Jun
i
o C Hamano
S
q
uelch `r
e
moval' mess
a
ge from '
g
it res
e
t
--har
d
'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
Ju
n
io C Hamano
'buil
d
'
s
crip
t
s befor
e
ins
t
a
l
ling
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-08
Ju
n
i
o C Ha
m
ano
S
how all m
e
rge-base c
a
ndidates from sho
w
-br
a
nch --merg
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-08
Junio C Hamano
Documentation updates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-08
l
ars
.
do
e
lle@on-l
i
ne
.
de
[PATCH] git
-
da
e
mon --inetd
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-08
Jun
i
o C Haman
o
g
i
t --
v
ersion tells which version of git yo
u
have
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-08
Amos Waterland
[PATCH] D
o
not cre
a
te
b
ogus b
r
a
n
ch from fla
g
to git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-08
Patrick
M
a
uritz
[PATCH] P
o
rtabil
i
ty
fix
for Sol
a
ris 10/x86
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-08
Junio C H
a
mano
B
i
g tool ren
a
m
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-07
Jun
i
o C Hamano
GI
T
0
.
99
.
6
commit
|
commitdiff
|
tree
2005-09-07
D
avid_Kågedal
[PATCH
]
Simpli
f
y git scri
p
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-07
J
u
nio
C Ham
a
no
Documentation updates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-07
A L
a
r
g
e Angry SCM
[PATCH] Doc
s
for git-buil
d
-rev-cache
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-07
A Larg
e
Angry S
C
M
[PATCH] Docs for git-show-rev
-
cache
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-07
A
Large Angry SCM
[PATCH] Docs for gi
t
-re
s
et-scri
p
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-07
A
Large A
n
gry SCM
[PA
T
CH] Docs fo
r
git-checkout-sc
r
ip
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-07
Junio C Haman
o
Docu
m
entation u
p
date
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-07
Junio C Hamano
F
l
atten tools/ d
i
rectory to make
buil
d
proc
e
d
u
r
e s
i
mple
r
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-06
Ju
n
io C Hamano
mailinfo: bar
f
and exist up
o
n nest
e
d m
u
lti
p
art
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-06
Ju
n
io C Ham
a
no
Merge b
r
a
nch 'ma
s
ter' of
.
commit
|
commitdiff
|
tree
2005-09-06
Rene Sc
h
a
rfe
[PATCH] Update documentat
i
on for git-
g
et-tar-c
o
mmit
-
id
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-06
H
.
Peter Anvin
[PAT
C
H]
git-cvs
i
mpo
r
t-scrip
t
: handli
n
g of tags
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-06
Junio C H
a
mano
Format f
i
x
for asciidoc
d
ocumen
t
at
i
on tit
l
es
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-05
J
u
n
i
o C Hamano
Merge br
a
nch 'master'
of
.
commit
|
commitdiff
|
tree
2005-09-05
Junio C
H
amano
Retire
git-cl
o
ne-du
m
b-ht
t
p
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-05
Ryan Anderson
[PATCH] U
p
d
ate documentati
o
n of
-
-co
m
pose t
o
git-
s
end
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-05
Ryan Anderson
[P
A
T
C
H] Make git-send-email-script
i
gnore
s
o
me un
n
ecessary
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-05
J
unio C Hamano
Inst
a
ll
a
rc
h
import-script
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-04
Junio C Hamano
Merge
b
ranch '
m
a
s
ter
'
of
.
commit
|
commitdiff
|
tree
2005-09-04
J
unio C Hamano
Ad
d
copy/rename c
h
eck for
g
it-apply
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-04
Junio C Hamano
Add a link fro
m
update-
s
erver-
i
nfo documen
t
at
i
o
n
t
o
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-04
Fredrik
Kuivinen
[PATCH] Ma
k
e
git-apply
understand incomplet
e
lin
e
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-04
Junio C Hama
n
o
git-applymbox: fix
'
-
c
'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-04
Martin Lan
g
hoff
[PATC
H
] ar
c
himport
:
avoid committing on an
Arch tag
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-04
Ma
r
t
in Langhoff
[PATCH] archimport autodetects import
s
t
a
tus, supports
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-04
Sergey Vla
s
ov
[PATCH] NUL terminate
t
he ob
j
ect dat
a
in pat
c
h_de
l
ta()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-04
Peter Hagervall
[PATCH]
P
o
s
sible cl
e
anups for local-pull
.
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-04
Paolo 'Blaisorblade
.
.
.
[PATCH] Doc: replac
e
read-cache with git-read
-
tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-03
J
u
nio C Hamano
D
o
cument hooks
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-02
Junio
C
Hamano
Merge branch 'master'
of
.
commit
|
commitdiff
|
tree
2005-09-02
J
u
nio C Hamano
Mention
p
ost-update when
w
e
fi
r
st talk
a
b
o
ut publishing
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-02
Junio C
H
a
mano
scripts: equality tes
t
'==' is not po
r
table
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-02
Junio C Ham
a
n
o
git-checkout-
s
cript:
R
emov
e
unnecessary variab
l
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-02
Junio
C
Hamano
Fix automerge message
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-02
Amos Wa
t
erland
[PATC
H
]
Explain what went wro
n
g on update-c
a
che of
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-01
Junio C
Hamano
Add repository-layout document
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-01
Junio
C
Haman
o
M
e
rge refs/heads/ma
s
ter fr
o
m
.
commit
|
commitdiff
|
tree
2005-09-01
J
unio
C Hamano
Use 'git status' no
w
it can handle i
n
itial commit
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-01
Junio C
H
a
ma
n
o
F
ix git-
s
tatus when HEAD is i
n
valid
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-01
Junio C
Hamano
Fix git-lo
g
-
script
w
h
e
n HEA
D
is i
n
v
a
lid
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-31
Junio
C Hamano
Add Pine 4
.
63 hel
p
from Daniel
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-31
Junio C Hamano
Merge refs/hea
d
s/
m
aster from
.
commit
|
commitdiff
|
tree
2005-08-31
Jun
i
o
C Hamano
U
p
date
t
u
torial
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-31
J
unio C
H
am
a
no
show-branch: make
i
t work in
a subd
i
rectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-30
Martin Langhoff
[PATCH
]
Initial
i
mport of git-a
r
chimport-script
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-30
Jun
i
o C Haman
o
Merge refs/
h
eads/m
a
ste
r
fr
o
m
.
commit
|
commitdiff
|
tree
2005-08-30
Junio C Haman
o
c
at-file:
make it work in
a subdirector
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-30
Ju
n
io
C Haman
o
Documentaion upda
t
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-30
Junio C Ha
m
ano
'git bis
e
ct visualize'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-30
Lin
u
s
T
o
rva
l
ds
[PAT
C
H
] F
i
x bisect
i
o
n
t
erminating condition
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-30
Junio C Hamano
Mer
g
e refs/hea
d
s/maste
r
f
rom
.
commit
|
commitdiff
|
tree
2005-08-30
Junio C Hamano
parse-remote: trivial fix to
a
llow
refs/
{
h
eads,tags
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-30
J
un
i
o C
H
amano
Merge r
e
fs/hea
d
s/master fro
m
p
aulus
commit
|
commitdiff
|
tree
2005-08-30
Juni
o
C Ha
m
an
o
Make sure
h
ow
t
o/*
.
html is built as well
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-30
L
inus Torvalds
[PA
T
CH]
M
a
ke "g
i
t
resolve" le
s
s scary
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-30
Juni
o
C
H
amano
Merge refs/heads/master from
.
commit
|
commitdiff
|
tree
2005-08-30
Junio
C
Hamano
Allow asci
i
d
oc formatted documentation in
ho
w
t
o
/
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-30
Juni
o
C H
a
mano
M
erge r
e
fs/heads/ma
s
ter from
.
commit
|
commitdiff
|
tree
2005-08-30
J
unio C
Hama
n
o
Add
[HOWTO]
revert/b
r
anc
h
/reb
a
se
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-30
Junio C Hamano
g
it commit: All
o
w editing on all occasi
o
ns
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-30
J
unio C Ha
m
ano
Do
no
t
verify reverte
d
/cherry-picked/
r
e
b
ased patches
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-30
Junio C Hamano
Fix com
p
ilation warn
i
ng
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-30
A Larg
e
Angry
S
CM
[PA
T
CH
]
Update Thunder
b
ird spe
c
ific hin
t
s
.
commit
|
commitdiff
|
tree
2005-08-30
A
L
arge Ang
r
y SCM
[PATCH] Document
a
tion for
git-reque
s
t-p
u
l
l
-script
.
commit
|
commitdiff
|
tree
2005-08-30
A Large
A
ngry SCM
[PATCH] Documentation for
g
it-c
l
o
n
e-dumb-http
.
commit
|
commitdiff
|
tree
next