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
Fix bogus linked-list management for user defined merge drivers.
2007-04-21
Ju
n
io C Ham
a
no
Fix b
o
g
us link
e
d-list man
a
ge
m
e
n
t for
u
se
r
def
i
ned merg
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
J
u
n
io
C Hamano
D
o
cu
m
ent gitattributes(5)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Juni
o
C Hamano
U
p
date
'
crlf'
at
t
ribute semantic
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
J
u
nio C
H
am
a
no
Doc
u
m
en
t
a
t
ion
:
support manual section (5
)
- fi
l
e f
o
rm
a
ts
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
Junio C Hamano
Simplify
c
ode to find recursive me
r
ge d
r
iver
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
Ju
n
i
o
C
Ham
a
no
Counto-fix in
me
r
ge-
r
e
c
u
rsive
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Juni
o
C Ha
m
a
n
o
Fix
f
unny type
s
u
s
ed i
n
attrib
u
te value representati
o
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C Hamano
Allow low-level d
r
iver to specify
d
if
f
erent b
e
ha
v
iour
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o C
H
a
m
a
no
Custom low-l
e
vel
mer
g
e
d
river: change the configuration
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Juni
o
C Hamano
Allow
the
d
efault
l
ow-level merge driver to be config
u
r
e
d
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Custom low-level me
r
ge driver support
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C H
a
man
o
Add a de
m
o
nstration
/
tes
t
of customi
z
ed merge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
J
u
nio C Ham
a
no
A
llow spe
c
ify
i
ng
s
p
ecialized merge-backend per
path
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C H
a
mano
mer
g
e-recursive: sepa
r
a
te out xdl_me
r
ge()
i
nterface
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
Allow m
o
re t
h
an tru
e
/
f
a
ls
e
to attr
i
butes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio
C Hamano
Chang
e
attr
i
but
e
negati
o
n marke
r
from '!'
t
o '-'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Ha
m
a
n
o
Define a bui
l
t
-
in att
r
ibute macro "binary
"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
J
u
nio C Hamano
a
t
tri
b
ute macro s
u
ppor
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Juni
o
C
Ha
m
ano
M
a
k
e
f
ile: add p
a
tch-ids
.
h
b
a
ck in
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hama
n
o
F
ix
'
diff' attri
b
ute se
m
antics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
J
unio C Hamano
Fix 'crlf' attribut
e
sema
n
tics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Teach 'diff
'
a
b
out 'di
f
f
' a
t
t
r
ibute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C
H
a
mano
Define '
c
rlf' a
t
tribute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Juni
o
C Hamano
Add basic infrastructur
e
to assi
g
n at
t
ri
b
utes to
p
aths
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hama
n
o
Merge branch
'
m
aint'
commit
|
commitdiff
|
tree
2007-04-14
J
un
i
o C
H
a
mano
D
o not default to --no-index when given two dire
c
t
or
i
es
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hamano
M
e
rge branch 'jc/c
h
e
rr
y
'
commit
|
commitdiff
|
tree
2007-04-13
Junio
C
Hamano
M
e
rg
e
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-13
J
u
ni
o
C
Hamano
Fi
x
g
i
t {l
o
g,sh
o
w,
.
.
.
}
--pretty=em
a
i
l
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio
C Hamano
D
o
cumentation
:
--cherry-pick
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Ju
n
io C Hamano
git-lo
g
--cherr
y
-pick
A
.
.
.
B
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Re
f
actor patch-id
f
i
l
t
ering o
u
t of git-cherry and
git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Ju
n
io 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 Ha
m
ano
Mer
g
e
branch 'mai
n
t
'
commit
|
commitdiff
|
tree
2007-04-12
J
un
i
o C Hamano
GIT
1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-11
Juni
o
C Hamano
f
s
ck:
do not complain on d
e
tach
e
d
HEAD
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio
C
H
a
m
a
no
M
erge
b
ra
n
ch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-09
Jun
i
o
C Ha
m
a
n
o
Merg
e
branch '
j
c/
p
ush'
commit
|
commitdiff
|
tree
2007-04-09
Ju
n
io
C
H
amano
M
e
rge
b
r
anch 'jc/merge-
s
u
b
tre
e
'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
J
u
nio C Hamano
Merge bran
c
h 'js/fetch-progre
s
s'
commit
|
commitdiff
|
tree
2007-04-09
J
unio C Hamano
Merge branch
'
m
a
i
nt'
commit
|
commitdiff
|
tree
2007-04-09
Junio C H
a
mano
Add Documentation/cmd
-
li
s
t
.
m
a
de
to
.
gitignore
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Junio
C
Hama
n
o
St
a
rt 1
.
5
.
2 cycle by prepareing RelNotes for
it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
M
erge branch 'jc/read-tree-df' (early part)
commit
|
commitdiff
|
tree
2007-04-08
J
u
n
io C Hamano
M
e
rge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2007-04-08
J
u
nio C Haman
o
Prepare f
o
r
1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C
Hama
n
o
A new merge stragety 'subtree'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Haman
o
git-pus
h
t
o
m
u
ltiple l
o
cati
o
n
s
does not stop at
t
he
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Jun
i
o C Hamano
git-push reports the URL a
f
ter
f
aili
n
g
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio
C Hamano
Merge branch 'jc/
i
nd
e
x-outpu
t
'
commit
|
commitdiff
|
tree
2007-04-07
Jun
i
o C Ham
a
n
o
Merge branch 'fp/make-
j
'
commit
|
commitdiff
|
tree
2007-04-07
J
u
nio C
H
a
m
ano
Merg
e
bran
c
h 'cc/bise
c
t
'
commit
|
commitdiff
|
tree
2007-04-07
Junio
C
Hamano
Merge br
a
nch 'jc/che
c
ko
u
t'
(
e
ar
l
y
p
a
r
t)
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
i
o C Hamano
Merge bra
n
c
h
'maint'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Ha
m
ano
Docu
m
entation: tighte
n
d
e
pend
e
ncy f
o
r git
.
{
ht
m
l,txt}
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
J
unio C Hamano
git-bis
e
c
t: allow
bisectin
g
with only one bad comm
i
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
J
u
nio
C Hamano
t6030: add a bit more tests to git-bi
s
ect
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
J
u
n
io
C
Hamano
gi
t
-
bisect: modern
i
zat
i
on
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
J
u
n
io C Hama
n
o
Merge br
a
nch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-05
Junio
C
Hamano
Rename add
_
file_to_index() t
o
add_file_to_cache
(
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio
C Hamano
Ren
a
me static v
a
riable write_index t
o
update_index
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Ju
n
io
C
Ham
a
no
Rename in
t
ernal functi
o
n
"add_fil
e
_
to_
c
ache" in builtin
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio
C
Hamano
Propagate cache e
r
ro
r
i
n
t
e
rnal to refresh_ca
c
he() via
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Jun
i
o C Hamano
Fix bogus error message fr
o
m merge-rec
u
rsive err
o
r
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Fix dependency of common-cmds
.
h
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C Hamano
RPM spec: include git-p4 in
the list of all packages
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
rerere: make sorting really stable
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Fix
s
w
i
tching
to a
branch
w
ith D/F
w
hen curren
t
branch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
uni
o
C Haman
o
Fix t
w
o
w
ay_merge that
p
a
sse
d
d/f
confl
i
ct
marker to
.
.
.
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Fix re
a
d-tree --p
r
efi
x
=di
r
/
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C Haman
o
unpack-trees:
get r
i
d of *indpos par
a
me
t
er
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
un
p
ack_trees
.
c: pass unpac
k
_trees_options str
u
cture
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
u
ni
o
C Haman
o
a
d
d_cache_
e
n
t
ry(): re
m
o
val of
file f
o
o does not c
o
nflict
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Merg
e
b
ra
n
ch 'jc/bis
e
ct'
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
Hamano
Merge
b
ranch 'fl
/
doc
'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
M
erg
e
b
r
anch '
p
os
t
1
.
5
.
1/blame
.
el'
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
i
o
C Hamano
Merge branch
'post1
.
5
.
1/tcltk'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ha
m
an
o
Mer
g
e
branch 'post1
.
5
.
1/p4'
commit
|
commitdiff
|
tree
2007-04-04
Junio C
H
amano
Merge branch 'lt/dirwalk'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
git
-
read
-
tre
e
-
-
index-
o
utput=<file>
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C H
a
m
ano
_GIT_INDE
X
_OUT
P
UT: allow plumbing
to
o
utput to an alternati
v
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
checkout:
allo
w
detaching to H
E
AD
even when s
w
i
t
ching
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C H
a
ma
n
o
G
IT 1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ham
a
no
Me
r
ge 1
.
5
.
0
.
7 in
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
GIT
1
.
5
.
0
.
7
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C H
a
mano
rere
r
e
sh
o
uld not
r
e
peat the
e
ar
l
ier hunks in later
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-02
Junio C
H
amano
Hope
f
ully final update to the draft Releas
e
Notes,
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-01
Junio C
H
a
mano
O
p
tional Tck/Tk: ign
o
re generat
e
d fi
l
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Junio C Ham
a
no
D
o
no
t
bo
t
her docu
m
enting fet
c
h
--tool
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Junio C Hamano
Update draft release notes for 1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-03-30
Ju
n
io C Hamano
Merg
e
bran
c
h 'mas
t
e
r'
o
f git://repo
.
or
.
c
z
/
git/merg
e
tool
.
git
commit
|
commitdiff
|
tree
2007-03-28
Junio C Haman
o
Doc
u
men
t
a
t
ion
:
unbreak
user-manu
a
l
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
GIT 1
.
5
.
1-
r
c3
commit
|
commitdiff
|
tree
2007-03-28
J
unio C Haman
o
Update main git
.
html p
a
ge
to po
i
nt a
t
1
.
5
.
0
.
6 documentation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
J
unio C Hama
n
o
M
erge branch '
m
ain
t
' to s
y
nchronize with 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Junio
C
H
a
m
ano
G
I
T 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Ju
n
io C
H
amano
Fi
x
"--p
r
etty=for
m
at
:
"
for par
e
nt
rel
a
ted items
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
J
u
ni
o
C Hamano
git-commit: "re
a
d-tree -m H
E
AD" is no
t
the right
w
ay
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
Junio
C
Hamano
sha
1
_
f
ile
.
c (wr
i
t
e
_sha1_file): Detect clos
e
f
a
il
u
re
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next