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
t/test-lib.sh: Protect ourselves from common misconfiguration
2007-04-24
Junio C Haman
o
t/te
s
t-lib
.
sh: Protect our
s
e
l
ves from common misconfiguratio
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
J
u
nio C
H
ama
n
o
M
erg
e
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hamano
B
u
ild RPM w
i
th
ETC_GITCON
F
IG=/etc
/
gitconfig
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hama
n
o
t6
0
30: grab c
o
mmit object name a
s
we go
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
J
u
nio C Hamano
t5302: avoid us
i
ng
tai
l
-c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio
C
Hama
n
o
Documen
t
"diff=d
r
iver
"
attribu
t
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio C Hamano
Support 'diff=pgm' att
r
ibute
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Ju
n
io C Hamano
pac
k
-objects: mak
e
generated packfile rea
d
-
only
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio C Ham
a
no
U
p
d
a
t
e
te
s
ts no
t
to
a
ss
u
m
e
th
a
t generated p
a
ckfiles
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Fix 'quic
k
fix'
on
pack-obje
c
ts
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
J
u
nio C Hamano
p
a
ck-objects: quickfix for
p
ermission m
o
des
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C H
a
mano
U
pdate
draft
r
elease
n
ot
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 Ha
m
ano
Document
a
tion/Makefil
e
:
f
ix
se
c
tion (5) installati
o
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Ham
a
no
U
pdate do
c
umentatio
n
l
i
nks to point at
v
1
.
5
.
1
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merge
branch 'lt/o
b
jalloc'
commit
|
commitdiff
|
tree
2007-04-22
Junio C
Ha
m
ano
Merge b
r
an
c
h
'jc/add'
commit
|
commitdiff
|
tree
2007-04-22
Junio C
H
a
mano
Me
r
ge b
r
anch 'j
c
/attr'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merge
b
ranch 'lt
/
g
itlink'
commit
|
commitdiff
|
tree
2007-04-22
Jun
i
o C Haman
o
Merge branch 'np/pa
c
k'
commit
|
commitdiff
|
tree
2007-04-22
J
u
nio C Hamano
Mer
g
e
b
ranch 'jp/refs'
commit
|
commitdiff
|
tree
2007-04-22
Juni
o
C Hamano
M
e
r
ge branch 'jc
/
q
uickfet
c
h'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merge branch
'
m
a
i
n
t'
commit
|
commitdiff
|
tree
2007-04-21
Ju
n
i
o
C Ha
m
ano
GIT 1
.
5
.
1
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
J
u
n
io C Hama
n
o
lockfile: reco
r
d the
p
rimary
p
roce
s
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
J
u
nio C H
a
mano
convert
.
c: restruct
u
re
t
he attribute check
i
n
g
par
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hamano
F
i
x
bogus linked-lis
t
manageme
n
t
f
or user defined
m
erge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hamano
git-clone: fix dum
b
p
roto
c
o
l
transport to clone from
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
J
unio C
Ha
m
ano
git-add -u: match
the
index with wor
k
ing
t
r
e
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C H
a
mano
Merge bra
n
ch
'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-20
J
u
n
i
o C Haman
o
Docume
n
t gitattributes(5)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
U
pda
t
e '
c
rlf' a
t
t
r
i
b
ute semantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Jun
i
o C Hamano
Documentat
i
o
n
: su
p
port
m
a
n
ua
l
se
c
tion (5
)
-
f
ile f
o
rmats
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
Junio C Ham
a
no
M
e
rge bra
n
ch
'
maint
'
commit
|
commitdiff
|
tree
2007-04-19
Junio C Haman
o
Simplify co
d
e to find
recursive merge drive
r
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
Junio C Hamano
C
ounto-fix in merge-recursive
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o C Hama
n
o
M
e
rge
branch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-18
Junio C
Ha
m
ano
Fix fu
n
n
y
types us
e
d
in attribute
value represen
t
ation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
unio C
H
amano
A
l
low low-level driver to specify
di
f
ferent
b
ehaviour
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Custom lo
w
-level mer
g
e
driver: change the
co
n
fi
g
uration
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hama
n
o
All
o
w the default low-level mer
g
e driv
e
r to b
e
con
f
igure
d
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
u
n
io C Hamano
Cust
o
m low-le
v
el merge dri
v
er
supp
o
rt
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
io C Haman
o
M
er
g
e b
r
anch 'fl/cvsserver'
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o
C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
Ha
m
ano
Up
d
ate draft release notes f
o
r 1
.
5
.
2 with
accumulated
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
io C Hama
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Sta
r
t prep
a
ring for 1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o C Hama
n
o
M
er
g
e
branch 'master' o
f
git://re
p
o
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2007-04-18
J
unio C Hamano
Merge branch
'
maint'
of
g
i
t
:
/
/
repo
.
o
r
.
c
z
/
git-
g
ui into
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
J
unio
C Haman
o
Merge bra
n
c
h
'jc/read
-
tre
e
-df'
commit
|
commitdiff
|
tree
2007-04-17
Junio
C
Hamano
Add a demonstrat
i
on
/
test of c
u
stomized merge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
J
unio
C
H
amano
All
o
w spec
i
f
y
ing special
i
zed merge-b
a
cken
d
per path
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
J
unio C
Haman
o
git-gu
i
: Honor TCLTK_PATH if supp
l
ied
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
merge-recursi
v
e:
s
eparate out xdl_merg
e
() interface
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Ha
m
ano
Allow more t
h
an true/fa
l
se
t
o
attr
i
butes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
Make sure qui
c
kf
e
tch is
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-
l
og'
commit
|
commitdiff
|
tree
2007-04-16
J
unio C Haman
o
send-email: d
o
not leave an empt
y
CC: li
n
e if
no
cc
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
Ju
n
i
o
C Ha
m
ano
Merge
branch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-16
Junio C
H
amano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-15
Junio
C
Hamano
Change attribute negati
o
n marker from '!' to '-'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
J
u
nio
C Hamano
Define a buil
t
-i
n
a
t
tribute macro "binary"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio
C
Hamano
attr
i
bu
t
e macro supp
o
r
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Ju
n
i
o
C Ha
m
a
n
o
Makefile: add patch-ids
.
h
back in
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Fix
'diff
'
att
r
ibute seman
t
i
c
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio
C
Ham
a
no
Fix
'
crlf' attri
b
ute s
e
mantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C H
a
mano
Merge git://git2
.
kerne
l
.
or
g
/pub/
s
cm/gitk/
g
itk int
o
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio C Ham
a
no
Teach 'diff' about '
d
i
f
f' att
r
ibute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Juni
o
C Hamano
Define
'
c
r
lf' attribute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Ham
a
no
A
dd basic infr
a
structure to as
s
i
g
n
attrib
u
tes to paths
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C
Hamano
M
e
rge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Replace a pair of patc
h
es
w
ith upda
t
ed ones f
o
r
subp
r
oject
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
J
unio
C
Ha
m
ano
Do not
default to --no-ind
e
x when given two dire
c
tories
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
Junio C
H
amano
Me
r
ge
b
r
anch 'jc/cherry
'
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hamano
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hamano
Fix git {
l
og,show,
.
.
.
} --pre
t
ty=email
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C
H
amano
D
ocumentati
o
n
: --cherry-pic
k
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
git-log --che
r
ry-pick A
.
.
.
B
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio
C Hamano
Refac
t
or p
a
t
ch-id filtering out of git-cherry and git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Haman
o
Ad
d
%m to '--pre
t
t
y
=format:'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Me
r
ge branch 'm
a
int'
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
Junio C Hamano
fsck: do
not compla
i
n
o
n detached
HE
A
D
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
J
unio C
H
a
m
a
no
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2007-04-10
J
uni
o
C Ha
m
ano
git-fetch: u
s
e
f
etc
h
--tool pick-rref to av
o
id
loc
a
l
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C
H
aman
o
git-f
e
tch--tool pick-rref
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C
H
amano
t3030: merge-recursive backend tes
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Juni
o
C H
a
m
a
no
merge-recursive: handle D/F conflict ca
s
e more ca
r
ef
u
lly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
J
u
nio C Hamano
me
r
ge
-
recu
r
sive: do
not barf on "to be removed" entries
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
Treat D/F con
f
l
ict
e
n
tr
y
more c
a
re
f
ully
in unpack-trees
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
J
u
nio C Haman
o
t1
0
00: fix case t
a
ble
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
shortlog -w: make wrap-lin
e
behaviour optional
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Jun
i
o
C H
a
mano
Merg
e
branch 'jc/push'
commit
|
commitdiff
|
tree
2007-04-09
Jun
i
o C Hamano
M
erge branch 'jc/me
r
g
e
-subtree'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Juni
o
C
H
am
a
no
M
erge
b
ranch '
j
s/fetch-progress'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-04-09
Ju
n
i
o
C
Hamano
Add D
o
cum
e
nta
t
ion/cmd-list
.
made
t
o
.
gi
t
i
g
n
ore
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Juni
o
C Hama
n
o
Start 1
.
5
.
2 cy
c
le by prepareing
R
el
N
ote
s
for it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
J
u
nio C Haman
o
Merge branch 'jc/re
a
d-tree-
d
f' (e
a
rly
p
a
r
t)
commit
|
commitdiff
|
tree
2007-04-08
J
u
nio C Hamano
M
e
rge b
r
an
c
h 'maint'
commit
|
commitdiff
|
tree
2007-04-08
J
un
i
o C Ha
m
a
no
P
repare for 1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next