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
Support 'diff=pgm' attribute
2007-04-23
Junio C Haman
o
Support 'diff=pgm' attribute
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
Junio C Hamano
pack-object
s
: ma
k
e g
e
n
e
rated packfile rea
d
-
only
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
Junio
C
Ha
m
ano
Upd
a
te t
e
s
ts n
o
t
to
a
ssume that generated packf
i
les
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
J
unio C
H
am
a
no
Fix 'quickfix'
o
n pack-obj
e
ct
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
J
u
nio C Ha
m
ano
pack-objects: quickfix for permission modes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Junio C
Ham
a
no
Update d
r
a
ft release no
t
e
s for v1
.
5
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
J
u
nio C Ham
a
no
Documentati
o
n/Makefi
l
e: fix
s
ec
t
ion (5) installation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Junio C
H
amano
Update documentation
li
n
ks
to
p
o
int
a
t
v
1
.
5
.
1
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Juni
o
C
Haman
o
Merg
e
branc
h
'l
t
/objall
o
c'
commit
|
commitdiff
|
tree
2007-04-22
J
unio C
H
amano
Merge branch 'jc/add'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merge branch 'jc/attr'
commit
|
commitdiff
|
tree
2007-04-22
Juni
o
C Ha
m
ano
Merge branch 'l
t
/gitlink'
commit
|
commitdiff
|
tree
2007-04-22
Junio C
Hamano
Mer
g
e
b
ranc
h
'np/pack'
commit
|
commitdiff
|
tree
2007-04-22
Jun
i
o C Hamano
Merge branc
h
'j
p
/refs'
commit
|
commitdiff
|
tree
2007-04-22
Junio
C
Hamano
Me
r
ge branch 'jc/quickfetch'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Me
r
g
e
branch 'mai
n
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 Hamano
lo
c
kfile: record the primary
p
r
o
cess
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Junio
C Ham
a
no
conve
r
t
.
c: rest
r
ucture the at
t
ri
b
ute checking
par
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Junio C
H
a
mano
Fix bogus linked-l
i
st m
a
nage
m
ent for user defined merge
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Jun
i
o
C
H
am
a
no
git-clon
e
: f
i
x dumb
p
rotocol trans
p
ort to
clone from
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Haman
o
git-add -u:
m
atch the inde
x
with work
i
ng tre
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
J
u
nio C Ha
m
ano
Merg
e
branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-20
Junio C H
a
m
a
n
o
Do
c
ument gita
t
tributes(5)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Juni
o
C Hamano
Update 'crlf' attribute sema
n
tics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Ju
n
io C Hama
n
o
Doc
u
m
e
nta
t
i
o
n:
s
u
pport manual secti
o
n
(
5) - file f
o
rmats
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-19
Junio
C Hamano
Merge
b
ra
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-04-19
Junio C
H
amano
Simp
l
ify c
o
d
e
to find recursive me
r
ge driver
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-19
Junio C Hama
n
o
Coun
t
o-f
i
x in merg
e
-recursive
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio
C H
a
ma
n
o
Merge
bran
c
h 'm
a
int'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Ham
a
no
Fi
x
funny t
y
pe
s
u
sed i
n
attribute value representation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Allow
low-level driver
t
o
specify diff
e
re
n
t
b
ehav
i
o
ur
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o C Ham
a
n
o
Custom low
-
l
e
vel merge driver: cha
n
ge the configuration
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Al
l
o
w
t
he d
e
fault lo
w
-l
e
vel merge dri
v
er
to
be configured
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
J
unio C Hamano
Custo
m
low-l
e
vel
me
r
ge d
r
iv
e
r
support
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
i
o
C H
a
mano
Merge
branch 'f
l
/cvsserver'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Merge b
r
a
n
ch 'main
t
'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Update draft release
n
ote
s
for 1
.
5
.
2 with accumulated
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Ha
m
ano
Mer
g
e branch 'm
a
in
t
'
commit
|
commitdiff
|
tree
2007-04-18
J
unio C H
a
mano
Star
t
preparing for 1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
Junio C Haman
o
Merge b
r
anch
'
master' of g
i
t://repo
.
or
.
c
z
/
g
it-gui
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Merge branch 'maint' of
git://repo
.
or
.
cz/git-gu
i
into
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
Juni
o
C H
a
ma
n
o
Merge branch 'jc/rea
d
-tree-df
'
commit
|
commitdiff
|
tree
2007-04-17
J
u
nio C Hamano
Add a
d
emonstr
a
tion/tes
t
of custo
m
ized merge
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Ju
n
io
C
Hamano
Allo
w
s
p
e
c
ifying specialized merge-ba
c
kend per path
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
git-gui: Honor TCLT
K
_PATH
if supplied
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
merge-rec
u
rsive: separate o
u
t
x
dl_
m
erge() i
n
terf
a
ce
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C H
a
mano
Allow
m
or
e
than tru
e
/false to attributes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio
C Hamano
M
a
ke s
u
re qui
c
kfet
c
h i
s
not fooled with a previous
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hamano
Merge branch 'js/wrap-lo
g
'
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hamano
send-email: do not le
a
v
e
a
n
empty CC:
l
ine if n
o
cc
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-16
J
unio C Hamano
Mer
g
e branch 'maint
'
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hamano
Mer
g
e branch 'm
a
int'
commit
|
commitdiff
|
tree
2007-04-15
Junio C
H
a
m
ano
C
h
ange attrib
u
te negation marker from '!' to '-'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C H
a
mano
Define a built-in
a
t
tribute
m
acr
o
"
binary"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio
C
H
a
mano
attribute macro suppo
r
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
J
u
nio C
H
a
mano
Makefile: add patch-ids
.
h
back in
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Ju
n
i
o
C Hamano
F
i
x '
d
iff' attribute s
e
m
an
t
ics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hama
n
o
Fix 'crlf' attribute semantics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio
C Hamano
M
e
rge g
i
t://git2
.
kernel
.
o
rg/pub/
s
cm/gi
t
k
/
g
i
tk into
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio C H
a
mano
T
e
ach 'diff' about 'diff
'
attribute
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
De
f
ine 'crl
f
' attribute
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
J
u
nio C Ham
a
no
Add basi
c
in
f
ras
t
ructure to assign
a
t
t
rib
u
tes to
p
at
h
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Ju
n
io C Hamano
Me
r
ge br
a
n
c
h '
m
aint'
commit
|
commitdiff
|
tree
2007-04-14
Jun
i
o
C
Ham
a
no
R
eplace a pair of
patches
with updat
e
d one
s
for subproje
c
t
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Do not defa
u
lt
t
o
--no
-
index
when g
i
ven two directories
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-13
Jun
i
o C Ham
a
no
Merge bran
c
h 'j
c
/cherry'
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hamano
Mer
g
e branc
h
'maint'
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hamano
Fix git {log,show,
.
.
.
} --pretty=email
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Jun
i
o C Hamano
Documentation:
--cherry-pick
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Juni
o
C Haman
o
git-log
-
-c
h
e
rry-
p
i
ck A
.
.
.
B
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio
C
Hamano
R
e
f
a
ct
o
r
p
atch
-
id filter
i
ng out of git-cherry
and git
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Jun
i
o C
H
amano
Add %m
t
o
'--pretty=format:'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C H
a
mano
Merge bra
n
ch 'ma
i
nt'
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
Ju
n
i
o C Hamano
fsck: do n
o
t complain on detached
H
EAD
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Ju
n
io C H
a
mano
M
e
r
g
e
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
git-fetch: use fetch-
-
t
ool pick-rref to
a
v
o
id local
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Jun
i
o
C Hamano
git-fet
c
h
--tool
p
ick-rref
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
J
unio
C
H
amano
t3
0
30: m
e
rge-recursive backen
d
t
e
st
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
J
u
n
io C Hamano
mer
g
e-rec
u
rsive: ha
n
d
l
e D
/
F confl
i
ct c
a
s
e mor
e
carefully
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
J
unio C
H
amano
merge-recursive: do not b
a
rf on "to
be rem
o
ved" entries
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Ju
n
io C Hamano
Treat D/F c
o
n
flict e
n
try more carefully in unpack
-
trees
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Haman
o
t
100
0
:
f
ix case
t
a
ble
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Jun
i
o C
Hamano
shortlo
g
-w:
make wrap-line behavi
o
ur optional
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Junio C Haman
o
Merge branch 'jc/push'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
M
e
r
g
e bra
n
ch
'
jc/merge-sub
t
ree'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Junio C H
a
mano
Mer
g
e
b
ra
n
ch 'js/fetch-
p
rogress'
commit
|
commitdiff
|
tree
2007-04-09
Junio
C Ham
a
no
Merge bra
n
ch
'
maint'
commit
|
commitdiff
|
tree
2007-04-09
J
unio C Hamano
Add D
o
cumentation/cmd-list
.
made to
.
gitig
n
o
r
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
J
u
nio C Hamano
Start
1
.
5
.
2 c
y
c
l
e by
p
r
epareing
RelNotes for it
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
Merge b
r
an
c
h 'jc
/
read
-
tree-df' (e
a
rly part)
commit
|
commitdiff
|
tree
2007-04-08
Junio
C
Hamano
M
e
r
g
e
b
ranch 'maint'
commit
|
commitdiff
|
tree
2007-04-08
Juni
o
C Haman
o
P
r
epare for 1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
J
u
nio C Hamano
A new mer
g
e strag
e
ty 'su
b
tree
'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
git-push to
m
ulti
p
le locat
i
ons do
e
s not stop at the
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C
Ham
a
n
o
git-push
rep
o
rts
the U
R
L after failing
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
J
un
i
o
C
Hamano
Merge branch 'jc/index-out
p
ut'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hama
n
o
M
erge branch 'fp/make-j'
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io C Hamano
Merge branch
'cc/bisect'
commit
|
commitdiff
|
tree
next