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 clean.requireForce option, and add -f option to git-clean to override it
2007-04-24
Jun
i
o C Hamano
t60
3
0: grab co
m
mit object name as we go
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Jun
i
o C Hamano
t5
3
02: avo
i
d
u
sing ta
i
l
-c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio C Hama
n
o
D
o
cument "diff=d
r
i
v
er"
attribute
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
J
unio C Hamano
Support 'diff
=
pgm' attribute
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio C Hamano
p
a
ck-objects: m
a
ke g
e
ne
r
ated pac
k
file
r
ead-onl
y
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
J
unio C Hamano
Update tests n
o
t to assume th
a
t generated
p
ackfi
l
e
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio
C Hamano
Fix 'quickfi
x
' on pack-
o
bje
c
ts
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Juni
o
C Hama
n
o
pack-objects:
q
uickfix for permissio
n
modes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Up
d
ate dr
a
ft release notes for v1
.
5
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
D
ocum
e
n
t
a
tion/Makefile: fi
x
se
c
tion (
5
)
i
nstalla
t
ion
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
U
p
d
ate documentation links to p
o
int at v1
.
5
.
1
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio
C
Ham
a
no
Merge bra
n
ch
'lt
/
objalloc
'
commit
|
commitdiff
|
tree
2007-04-22
Ju
n
io
C
Hamano
Merge bran
c
h 'jc/add'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merg
e
branch 'jc/
a
ttr
'
commit
|
commitdiff
|
tree
2007-04-22
J
u
nio C Hamano
Merg
e
b
ra
n
ch 'l
t
/git
l
ink'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merge branch
'
np/pack
'
commit
|
commitdiff
|
tree
2007-04-22
Junio
C
Hamano
Mer
g
e
b
ranc
h
'jp
/
refs
'
commit
|
commitdiff
|
tree
2007-04-22
Junio C H
a
mano
Merge
branc
h
'jc/quickf
e
tch
'
commit
|
commitdiff
|
tree
2007-04-22
Junio
C
Hamano
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-21
Jun
i
o C Ha
m
ano
GI
T
1
.
5
.
1
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C
H
ama
n
o
lockfile
:
record
the p
r
imary pro
c
ess
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hamano
c
o
nvert
.
c: restructure the attribute checking p
a
rt
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hamano
F
i
x bogus linked
-
list m
a
nagement for us
e
r defin
e
d merge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Ham
a
no
gi
t
-clone: fix dumb
p
rotocol transport to clone from
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Jun
i
o C H
a
m
ano
git-add
-u: match the index with working tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
J
u
nio C Hamano
Merge branc
h
'm
a
int
'
commit
|
commitdiff
|
tree
2007-04-20
Juni
o
C
H
amano
Doc
u
ment
gitattributes(5)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Ju
n
io C Hamano
Update '
c
rlf' attrib
u
te
s
e
mantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Ju
n
io C Hamano
Docum
e
ntation: support
manual section (5) - file
f
ormats
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
Junio C Hamano
Merge bra
n
ch
'maint'
commit
|
commitdiff
|
tree
2007-04-19
Junio
C
Hamano
Simplify code
to
find re
c
u
r
sive merge driver
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
Juni
o
C Hama
n
o
Counto-fix in merge-rec
u
rsive
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
H
aman
o
M
erge branch 'maint
'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Fix funny types used in attribu
t
e value
rep
r
esentati
o
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C
H
a
man
o
Allow low-le
v
e
l
driver to specify different
b
ehaviour
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Custom lo
w
-l
e
vel merge driver: change the configuration
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Allow the defau
l
t l
o
w-level merge drive
r
to be confi
g
ured
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
C
u
stom low-level me
r
g
e driver
s
upp
o
rt
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o
C Ha
m
ano
Merge
b
ranch 'f
l
/cvsserver'
commit
|
commitdiff
|
tree
2007-04-18
J
unio
C
Ha
m
ano
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2007-04-18
Juni
o
C
Hamano
Up
d
ate draft release notes for 1
.
5
.
2 with accumulated
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Mer
g
e br
a
nch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-18
Junio C H
a
mano
S
t
art preparing for 1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
Junio C
H
amano
Merge b
r
anch 'm
a
ster' of git://repo
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2007-04-18
Junio C H
a
mano
Merge
b
ranc
h
'main
t
'
of g
i
t
://repo
.
or
.
c
z
/git-gui into
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
Junio C Ha
m
a
n
o
Merg
e
branc
h
'
jc/rea
d
-tre
e
-df'
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
Add a d
e
mo
n
s
t
ra
t
i
on/te
s
t
o
f cus
t
omiz
e
d merge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C
H
amano
Allow s
p
ecifying spec
i
a
l
ized merge-backend
p
er path
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C
H
a
mano
git-gui: Honor TCLTK_PATH if supplie
d
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C
Ha
m
a
no
merge-recursive: separ
a
te
o
ut xdl_merge()
i
n
t
erface
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Ham
a
no
Allow more than
tr
u
e/false to
a
t
tribut
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C
H
amano
Ma
k
e sure qu
i
ckfetch is not fo
o
led with a previous
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
Junio C
H
amano
Merge branch 'js/wrap-log'
commit
|
commitdiff
|
tree
2007-04-16
Juni
o
C Haman
o
send-email: do not le
a
ve
a
n empty CC: line if no cc
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hamano
Merge bra
n
c
h 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-16
J
u
ni
o
C Hamano
Merg
e
br
a
nch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-15
Ju
n
io C Hamano
Change attribute
n
egation ma
r
ker from '!'
to '-'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Juni
o
C Haman
o
Define a
b
u
ilt-in attribute macro "binary"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Ha
m
ano
a
t
tribute mac
r
o s
u
pport
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Haman
o
Makef
i
le: add patch-ids
.
h
back in
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Haman
o
Fix 'di
f
f' attribute semantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
J
u
nio C
Hamano
Fix 'crlf'
a
ttri
b
u
te s
e
manti
c
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
J
u
nio C Ha
m
a
no
Mer
g
e git://git
2
.
k
ernel
.
org/
p
ub/scm/gitk/gitk into
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Jun
i
o C H
a
mano
Teach 'diff' about 'diff' attribute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Juni
o
C Hama
n
o
Define 'cr
l
f' at
t
ribute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Juni
o
C Hamano
Add basic inf
r
as
t
r
u
cture
t
o ass
i
gn attribu
t
es to paths
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C
Hamano
Me
r
ge
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-14
Junio C Ha
m
ano
R
e
pl
a
ce a pair
of patc
h
es with update
d
ones for
subpro
j
ect
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio
C
H
amano
Do not default to
--no-index when given
t
wo
d
i
r
ecto
r
ies
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
Junio
C
Hamano
M
e
rge branch 'jc/ch
e
rry'
commit
|
commitdiff
|
tree
2007-04-13
J
u
nio C Hamano
Merge branch 'ma
i
nt
'
commit
|
commitdiff
|
tree
2007-04-13
J
u
nio
C Hamano
Fix
g
it {log,show,
.
.
.
}
-
-pretty=em
a
i
l
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Jun
i
o C Hama
n
o
D
ocu
m
entati
o
n: --
c
herry-pick
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
git
-
log
--cherry-pick A
.
.
.
B
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
R
e
f
a
ctor patch-id filterin
g
out of git-cherry and gi
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Add %m to
'--pretty=format:'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
J
unio
C
Ha
m
ano
Merge branch
'
maint
'
commit
|
commitdiff
|
tree
2007-04-12
J
u
nio
C
Hamano
G
I
T 1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-11
Juni
o
C
Hamano
f
sck: do not c
o
mpl
a
in
on detach
e
d HEAD
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
J
u
nio C
H
am
a
no
M
e
rge
b
r
anch 'maint'
commit
|
commitdiff
|
tree
2007-04-10
J
u
nio
C
H
ama
n
o
git-fetch
:
use
fetc
h
-
-too
l
pick-rref
to avoid local
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Ju
n
io C Hama
n
o
git-fetc
h
--
t
ool pick-rr
e
f
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
J
unio C Hamano
t3030: merge-r
e
c
u
r
sive
back
e
nd test
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
J
un
i
o
C H
a
m
a
no
merge-recur
s
ive: handle D/
F
c
o
nflict case more carefully
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
J
un
i
o C Hamano
merge-recursi
v
e: do not b
a
r
f
on "to be remo
v
ed" entries
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
Treat D/F
c
on
f
lict entry
more carefully in
unp
a
ck-trees
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio
C
Hamano
t1000: fix case table
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio
C
Hamano
s
hort
l
og
-
w: mak
e
wrap-
l
ine behavi
o
u
r
opt
i
onal
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Junio
C
Hamano
Merge
bran
c
h '
j
c/push
'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Merge branch 'jc/me
r
ge
-
subt
r
ee'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Ju
n
io C Hamano
Merge
bran
c
h 'js/fetch-progress'
commit
|
commitdiff
|
tree
2007-04-09
J
u
nio C Hamano
M
erge br
a
nch 'm
a
int'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Add
D
ocumentation/c
m
d-list
.
m
a
de t
o
.
gitigno
r
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Juni
o
C Hamano
Sta
r
t 1
.
5
.
2 cy
c
l
e by prepareing RelNotes for
it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
J
unio C Hamano
Merge branch
'
jc/read-tree-df' (earl
y
part)
commit
|
commitdiff
|
tree
2007-04-08
Jun
i
o C Hama
n
o
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
Pre
p
are for 1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C
H
a
m
ano
A n
e
w merge stragety
'su
b
tree'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
i
o
C
H
a
m
ano
g
it-push t
o
mul
t
iple location
s
doe
s
no
t
stop at the
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio
C Hama
n
o
git-
p
ush reports the
U
RL a
f
te
r
faili
n
g
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next