repo.or.cz
/
git
/
raj.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jc/attr'
2007-04-22
Ju
n
io C Hamano
M
erge branc
h
'jc/attr'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merge br
a
nch 'lt/g
i
t
l
ink'
commit
|
commitdiff
|
tree
2007-04-22
J
un
i
o C Hamano
Merge branch
'n
p
/pack'
commit
|
commitdiff
|
tree
2007-04-22
J
u
nio C Hamano
Me
r
ge b
r
anch 'jp/r
e
fs'
commit
|
commitdiff
|
tree
2007-04-22
J
unio C Hamano
M
e
rge branch
'
jc/quickfetch'
commit
|
commitdiff
|
tree
2007-04-22
J
u
nio C Hamano
Merge branch 'maint'
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
J
u
nio C Hamano
lockfile
:
reco
r
d the primary process
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
J
unio
C Hamano
c
onv
e
rt
.
c: rest
r
uctu
r
e
t
he attribute check
i
ng
p
a
r
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Ju
n
i
o
C Ha
m
a
no
F
ix b
o
gus
l
inked-list
m
anagem
e
n
t
f
o
r
user defined merg
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Junio
C
Hama
n
o
gi
t
-
clone: fix
dum
b
protocol transport to clone fro
m
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Jun
i
o C
Hamano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-20
Junio C
Ha
m
ano
Document gitattr
i
butes(5
)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
Upd
a
te 'crlf
'
a
t
tribute
semantics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Juni
o
C Ha
m
ano
Docu
m
e
ntation: support manu
a
l section (5) -
f
il
e
form
a
t
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-19
Junio C Hamano
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-19
J
u
nio C Hamano
Simpli
f
y code to find recursive merge
d
river
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-19
Junio C Hamano
Counto-fix in merge-recu
r
sive
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C
Haman
o
Merge bra
n
c
h
'maint'
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
Ha
m
a
n
o
Fix funny types
used in attribute val
u
e represen
t
atio
n
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Allow
lo
w
-level driver to spe
c
ify di
f
ferent
b
ehaviour
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C
Hamano
Cus
t
om low-
l
evel merge
drive
r
: change the configu
r
at
i
on
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Haman
o
Allow the defaul
t
l
o
w-l
e
vel
merge dri
v
e
r
to be con
f
igured
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C H
a
mano
Custom
low
-
level
merge
driv
e
r sup
p
ort
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Merge branch '
f
l
/cvsse
r
v
e
r
'
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
Hamano
Merge
branch 'maint
'
commit
|
commitdiff
|
tree
2007-04-18
Junio C H
a
m
ano
Upd
a
te draft re
l
ease
notes for
1
.
5
.
2 with accum
u
lated
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
i
o C Ham
a
no
M
er
g
e bra
n
c
h
'maint'
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C Haman
o
Start pre
p
ar
i
ng
f
or 1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Merg
e
branc
h
'
m
a
ste
r
' of git://re
p
o
.
or
.
c
z/git-
g
ui
commit
|
commitdiff
|
tree
2007-04-18
Junio C Haman
o
M
erge bra
n
ch 'maint' of
gi
t
://repo
.
or
.
cz/gi
t
-
g
u
i into
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
Junio C Haman
o
Merge branc
h
'jc/read
-
tree-df'
commit
|
commitdiff
|
tree
2007-04-17
J
unio C Ha
m
an
o
Add a dem
o
n
s
t
ration/test of
c
us
t
omized
m
e
r
ge
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
J
u
n
io C
H
aman
o
Allow
spe
c
ifying speciali
z
ed me
r
ge-backend per path
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
J
unio C Hamano
git-gui: 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-recursive: separate out xdl_m
e
rge() interface
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
Allow more
than true/false to attrib
u
tes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
Make sure q
u
ickf
e
tch is not
fooled w
i
th a
previous
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-16
Ju
n
i
o
C
H
a
m
a
no
Merge branch 'js/wrap-log'
commit
|
commitdiff
|
tree
2007-04-16
J
unio C Haman
o
send-email: do not leave
an e
m
p
t
y CC: l
i
ne
i
f no
c
c
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-16
Ju
n
io
C
H
a
mano
Merge branch
'maint'
commit
|
commitdiff
|
tree
2007-04-16
J
u
nio
C Haman
o
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-15
J
unio C Hamano
Change attribute n
e
gation mar
k
er from '!' to '-'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Ju
n
io C Hamano
Define a bui
l
t-in at
t
ribute macro "binary"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Juni
o
C Hamano
attribute
m
acro support
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Ju
n
io
C Hamano
Makefile:
a
dd p
a
t
ch-ids
.
h
b
ac
k
in
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio
C
Ha
m
ano
Fix
'd
i
ff' attribu
t
e seman
t
ics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Ha
m
a
no
Fix 'crlf' att
r
ibute sem
a
n
tics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
J
unio C Hamano
Me
r
ge git://
g
it2
.
ker
n
el
.
org/pub/scm/
g
itk
/
gitk into
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio C Ha
m
ano
T
each 'diff' a
b
out
'diff' attribute
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Jun
i
o C Ham
a
no
Def
i
ne 'c
r
lf
'
a
tt
r
i
b
ute
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
J
u
n
io C
H
aman
o
Add bas
i
c
i
n
f
r
astructure to assign
a
ttri
b
u
t
es to
p
a
t
hs
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Ham
a
no
Merge
b
ranch '
m
a
int'
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
R
e
place a pair of patche
s
with up
d
a
t
ed one
s
for
s
ubproj
e
ct
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio
C
Ham
a
no
D
o not de
f
ault to --no-index when give
n
two directories
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-13
Junio C Ha
m
a
no
Me
r
ge br
a
nch 'jc/cherry'
commit
|
commitdiff
|
tree
2007-04-13
J
unio
C
Hamano
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2007-04-13
Junio C H
a
m
a
no
Fix gi
t
{
l
og,show,
.
.
.
} -
-
pretty=em
a
il
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Juni
o
C H
a
mano
Doc
u
mentation:
-
-cher
r
y-pick
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
g
it-
l
o
g
-
-cher
r
y-pi
c
k A
.
.
.
B
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
J
unio C Hamano
Refactor
p
atch-id filterin
g
out of git
-
c
h
erry
a
nd git
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Ha
m
ano
Add %m to '--pretty=format:'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-12
J
u
ni
o
C Hamano
GIT 1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-11
Junio C Hamano
fsck
:
do
n
ot complain on detached HEAD
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
J
uni
o
C Hamano
M
erge branch 'ma
i
n
t
'
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
g
i
t
-
f
e
tch: u
s
e
f
et
c
h
-
-
t
ool pi
c
k-rref
t
o avoid local
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
g
it
-
fetch--tool p
i
ck-rref
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
t3030: merge-re
c
u
r
s
ive backend
test
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio
C Hamano
merge-recursive:
h
a
ndle D/F conflict
c
a
s
e
more
carefully
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
merge-r
e
cursive
:
do not b
a
r
f on
"to be removed
"
entries
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
Tre
a
t D/F conflict entry
m
o
r
e
c
a
refull
y
in unpack-trees
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Jun
i
o
C Ha
m
ano
t1000: fi
x
case tab
l
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
shortlog -
w
: make wrap-line behaviour op
t
ional
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Junio C H
a
m
ano
M
erge branch 'jc/push'
commit
|
commitdiff
|
tree
2007-04-09
Jun
i
o C Haman
o
Merge branch 'jc/merge-s
u
b
tr
e
e
'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Junio C H
a
mano
Merge br
a
n
c
h
'
j
s
/
f
etc
h
-progress'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Ham
a
no
M
e
rge
branch 'maint
'
commit
|
commitdiff
|
tree
2007-04-09
Jun
i
o C Hamano
Add Documentation/cmd-list
.
made to
.
gitignore
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Ju
n
io
C Hamano
Start
1
.
5
.
2 cycle
by prepareing Re
l
Notes for it
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Junio C H
a
mano
Merge branch 'jc/read-tree-df' (e
a
rly par
t
)
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
Merge br
a
nch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-08
J
unio C H
a
mano
Prepare for 1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio
C
Hamano
A ne
w
merge stragety
'subtree'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
gi
t
-push to multi
p
le loc
a
tions doe
s
no
t
stop at the
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
git
-
push reports t
h
e UR
L
a
f
ter
fai
l
i
ng
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hama
n
o
Merge br
a
nch 'jc/index-output'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hama
n
o
Merge br
a
n
ch
'fp/make-j'
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io C Hamano
Merge branch 'cc/bisect'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hama
n
o
Merge b
r
a
nch
'jc/checkout'
(
early part)
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-07
Junio C H
a
mano
Documenta
t
i
o
n: tighten dependency fo
r
gi
t
.
{
h
tml,txt}
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Jun
i
o C H
a
mano
git-bisect:
allow bisecting with o
n
l
y
o
n
e bad
comm
i
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
t6030:
a
dd a bit more tests to git-bisect
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Junio C Hamano
g
i
t-bisect: modernization
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
J
u
nio
C
Hamano
M
e
rge
b
ranch 'm
a
int'
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
R
ename add_fil
e
_
to_i
n
dex() to add_file_to_cache()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio
C Hamano
Rename static va
r
iable wr
i
te_index to updat
e
_
i
n
dex
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio
C Hamano
Rename internal function "ad
d
_
file_to_c
a
che
"
in b
u
iltin
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Pr
o
pagate cache err
o
r internal to refresh_cache() via
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next