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
gitattributes documentation: clarify overriding
2007-04-24
Junio C Hamano
gitattributes d
o
cumen
t
ation:
clarify
overridin
g
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio C
H
a
m
a
no
t/
t
est-
l
i
b
.
sh: P
r
otect ou
r
selves
f
rom common
misconfiguration
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Jun
i
o C H
a
mano
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-24
Junio
C Ha
m
ano
Build RPM with ETC_GITCONFIG=/etc/
g
i
t
c
onfi
g
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Haman
o
t6030: grab commit object name as we go
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
J
u
nio
C Hamano
t5302: avoid usi
n
g
t
a
il -
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Juni
o
C Hamano
Docu
m
ent "di
f
f=driver
"
attribute
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio C Hamano
Support 'd
i
ff=pgm
'
attr
i
b
u
te
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio C Hamano
pack-
o
bject
s
: make generated pac
k
fil
e
r
ead-only
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Juni
o
C
H
amano
Update t
e
sts not to assume th
a
t ge
n
erated
packfiles
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Juni
o
C Hama
n
o
Fix 'qu
i
ckfix' on pack-objects
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio
C Haman
o
pack-objects: quickfix for
p
e
rmis
s
ion modes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Updat
e
draft
release notes for v1
.
5
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C H
a
mano
D
o
c
umentat
i
on/Makefile: fix sectio
n
(5) installation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Jun
i
o C Hamano
U
pdate documentation
links to po
i
nt at v1
.
5
.
1
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C H
a
m
a
no
Merg
e
branc
h
'lt/objalloc'
commit
|
commitdiff
|
tree
2007-04-22
J
un
i
o C Hamano
Merge
b
ra
n
ch 'jc/add'
commit
|
commitdiff
|
tree
2007-04-22
J
unio C Hamano
Merge
b
ranch '
j
c/attr'
commit
|
commitdiff
|
tree
2007-04-22
Junio
C
Hamano
M
e
rge branc
h
'lt/gitlink
'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
M
er
g
e
b
ranch 'np/pack'
commit
|
commitdiff
|
tree
2007-04-22
Jun
i
o
C
Hamano
Merg
e
b
ran
c
h 'jp
/
refs'
commit
|
commitdiff
|
tree
2007-04-22
Ju
n
io C Hamano
Merge
b
ran
c
h 'jc/
q
u
ickfetch'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Ha
m
a
n
o
Merge branch '
m
ain
t
'
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hamano
GIT 1
.
5
.
1
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hama
n
o
lock
f
ile: record the primary
p
roce
s
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Ha
m
ano
convert
.
c: re
s
tructure the attri
b
ute c
h
ecking part
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C H
a
mano
Fix b
o
gus link
e
d-l
i
st
m
anagement for user d
e
fin
e
d merge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hamano
g
i
t-c
l
one: fix dumb protocol transpor
t
t
o
clone
fro
m
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Ha
m
ano
git-add -
u
: matc
h
the
i
ndex w
i
th working tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Ham
a
no
M
e
rge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2007-04-20
J
u
ni
o
C
H
amano
Document
g
i
tattri
b
utes(5
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C
H
amano
Update 'crl
f
' attrib
u
te semantic
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
J
u
n
i
o C Haman
o
Documen
t
ation: support
m
anual se
c
tio
n
(5) - fil
e
forma
t
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
Junio C Haman
o
Merge b
r
a
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-04-19
Jun
i
o
C
Hama
n
o
Simplify code
t
o
find
r
ecursiv
e
merge
driver
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
J
u
n
io C Ha
m
a
no
Counto-f
i
x in merge-recursiv
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o C H
a
mano
Me
r
ge b
r
anch
'
m
aint'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
F
ix funny
t
ype
s
used in attribute value represen
t
ation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
io
C
H
a
m
ano
A
l
l
ow low
-
level dri
v
er to speci
f
y
different be
h
aviour
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Custom low-level merge
d
river:
change
the configuration
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Allo
w
the d
e
fault lo
w
-le
v
el merge driver to be conf
i
gure
d
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
C
u
stom low-level mer
g
e driver support
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Ha
m
a
no
Merge branch 'fl/cvsse
r
ver'
commit
|
commitdiff
|
tree
2007-04-18
Junio C
H
am
a
no
Merge branch
'maint'
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
Ham
a
no
Update draft release not
e
s for
1
.
5
.
2 with a
c
cumula
t
ed
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Ha
m
ano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Ha
m
ano
Start preparing
fo
r
1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
io C Hamano
Merge bra
n
ch
'
master
'
of git://repo
.
o
r
.
c
z
/git-gui
commit
|
commitdiff
|
tree
2007-04-18
Juni
o
C Hamano
Merg
e
bran
c
h '
m
aint' of git://repo
.
or
.
cz/
g
it-gui into
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
Jun
i
o C H
a
mano
Merg
e
branc
h
'jc
/
read-tree-df'
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
Add a d
e
mons
t
ration/test of customized merge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
Allo
w
specifying
s
pecialized mer
g
e-ba
c
kend per path
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio
C
Hamano
g
it-
g
ui:
Honor TCLTK_PATH if supplied
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C H
a
mano
merge-recur
s
iv
e
: s
e
parat
e
ou
t
x
dl_me
r
ge() int
e
rfac
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
All
o
w mor
e
than true/
f
alse to attr
i
butes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Ha
m
ano
M
ake sure q
u
ickfetch is not fool
e
d with a previou
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
J
unio
C Hamano
Merge
b
ranch 'j
s
/
w
rap
-
log'
commit
|
commitdiff
|
tree
2007-04-16
Jun
i
o C Ham
a
n
o
send-email: do not le
a
ve a
n
empty CC: line if
n
o cc
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
Junio C Ham
a
no
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-16
Junio C
H
aman
o
Merge
branch 'm
a
i
nt
'
commit
|
commitdiff
|
tree
2007-04-15
Ju
n
io C Hamano
Ch
a
n
g
e
attri
b
ute negation
m
arker from '
!
' to
'-'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Define a built-i
n
attrib
u
te ma
c
ro "binary"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Juni
o
C Hamano
attribute mac
r
o suppo
r
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C
Ham
a
no
Makefile
:
add patch-ids
.
h back in
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio
C
H
a
mano
Fix
'
diff'
a
ttribute sem
a
ntics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Fix 'crlf' att
r
i
b
ute sem
a
ntics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
M
e
rg
e
git://git2
.
k
ernel
.
org/pub/scm/gitk/gitk into
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio C H
a
mano
T
each 'diff' ab
o
ut 'diff' att
r
i
b
u
te
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Juni
o
C Hamano
D
efine
'crlf' att
r
ibute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Haman
o
Ad
d
basic infrastructure to assign
attributes to paths
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio
C
H
amano
Merg
e
bran
c
h 'maint'
commit
|
commitdiff
|
tree
2007-04-14
J
unio C Hamano
Replace a pair of patches wit
h
updated ones for
subproject
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio C Ha
m
ano
D
o not default to -
-
no-index
when given tw
o
d
i
rectories
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
Junio C Haman
o
Merge bran
c
h
'
j
c
/
c
herry'
commit
|
commitdiff
|
tree
2007-04-13
Ju
n
io C
H
amano
Merge
b
ra
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-04-13
J
unio C Hamano
Fix git {log,show,
.
.
.
} --pretty=email
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Doc
u
mentati
o
n
: --c
h
erry-pick
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
J
u
nio
C
H
amano
git-log --
c
herry-pick A
.
.
.
B
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
J
unio C Haman
o
R
efact
o
r patch-id filterin
g
out o
f
git-ch
e
rry and git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Add %m to
'
-
-
pretty=for
m
a
t:'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
J
u
nio C Hamano
Merge
b
r
a
nch 'maint'
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
GIT
1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-11
Junio C Ham
a
no
fsck:
do not complai
n
on detached HEAD
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Ha
m
ano
Me
r
ge
b
ran
c
h 'maint'
commit
|
commitdiff
|
tree
2007-04-10
Junio C H
a
ma
n
o
g
it-fetc
h
: use
f
etc
h
--
t
oo
l
pic
k
-r
r
ef to avoi
d
l
ocal
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
g
it-fet
c
h--too
l
pick-rr
e
f
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C
Hamano
t
3030: merge-re
c
ursive backend test
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C
Hamano
merge-
r
e
cu
r
sive: handle D/
F
co
n
flict c
a
se
more carefu
l
ly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hama
n
o
merge-recursive: do
not
b
arf on
"
to
be rem
o
ved" entries
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio
C Hamano
Trea
t
D
/
F c
o
n
flict entry more carefull
y
i
n
unpack-trees
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
J
u
nio C Hamano
t1000: fix case
table
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio
C
Ham
a
n
o
s
ho
r
tlog -w: make wrap-line beh
a
viour optional
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Junio C Ha
m
ano
M
erge branch 'jc/push'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Merge branch 'jc/merge-subtree'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
J
u
nio
C Hamano
Merge branch 'js/fet
c
h-progress
'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Me
r
ge bran
c
h '
m
a
int
'
commit
|
commitdiff
|
tree
2007-04-09
J
unio C Haman
o
A
d
d Documentation/cmd-list
.
made
t
o
.
gitignore
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
J
u
nio
C Hamano
Start 1
.
5
.
2 cycle by prepareing RelNotes for it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Jun
i
o
C
Hamano
Mer
g
e branch 'jc/read-tree
-
df' (early p
a
rt
)
commit
|
commitdiff
|
tree
2007-04-08
Junio
C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
next