repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
convert.c: restructure the attribute checking part.
2007-04-21
Junio C Hamano
con
v
ert
.
c: res
t
ructure the
a
ttribute checking part
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio
C
Hamano
F
ix bogus linked-list management for user def
i
ned
me
r
ge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
D
o
cument
git
a
t
t
ributes(5)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C
Hamano
Up
d
ate
'
crlf' attribute semantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
Documentation: support m
a
n
u
a
l
section (5) -
file
formats
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
Junio C Hamano
Simplify code to find
r
e
cursive merge driver
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
J
u
nio C Hamano
Counto-fix
in merge-r
e
cursive
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
io C
H
ama
n
o
F
i
x
funny t
y
pes
u
s
ed in attribute
v
alue
r
epresentation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
io C Hamano
Allow low-level driver to specify dif
f
erent behaviour
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Custom low-level merge driver:
ch
a
ng
e
the co
n
figurati
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C H
a
m
a
no
All
o
w
the
defaul
t
l
o
w
-level merge dr
i
ver t
o
be conf
i
gured
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Custom lo
w
-level merge dri
v
er sup
p
ort
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
J
unio C Hamano
A
dd a demon
s
tration/test of cus
t
omi
z
ed
m
e
r
g
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
All
o
w speci
f
ying
s
pecial
i
zed me
r
ge-backend per path
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Jun
i
o C Hamano
me
r
ge-recursive
:
separate out xdl_merg
e
() interf
a
ce
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Ju
n
io C Haman
o
A
l
low m
o
r
e
than true/false to
attri
b
utes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
J
u
n
io C Hamano
C
h
an
g
e at
t
ribute negation
m
arker from '!' to '-'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C H
a
mano
Define a bu
i
lt-in at
t
ribute m
a
cro
"
binary"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio
C
Hamano
attribute
mac
r
o
s
upport
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
J
u
nio C Ha
m
ano
Ma
k
efile: a
d
d p
a
tch-id
s
.
h back in
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
J
u
ni
o
C
Hamano
F
ix
'diff' attribut
e
seman
t
ics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
F
i
x
'crlf'
a
ttribute semantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Teac
h
'
diff' about
'
d
iff' attribute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C
H
aman
o
Define 'crlf' attrib
u
te
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Ju
n
io C Hama
n
o
A
d
d basic i
n
fra
s
tructure to assig
n
a
t
t
ribut
e
s
t
o p
a
ths
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2007-04-14
Junio C
H
a
m
ano
D
o
not
d
e
fault to --no-index when
g
i
ven two direc
t
ories
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
Juni
o
C Hamano
Merge
b
r
a
nch 'jc/cherry'
commit
|
commitdiff
|
tree
2007-04-13
Junio C Ham
a
no
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hama
n
o
Fix
git {log,
s
how,
.
.
.
} --pretty=email
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Jun
i
o
C Hamano
D
o
cumentat
i
on: --cherry-pick
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio
C
H
a
m
ano
gi
t
-log --cherry-pick A
.
.
.
B
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio
C Hamano
R
efactor patch-id filteri
n
g
o
ut of gi
t
-cherry and git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Add %m to '--pr
e
t
t
y
=format:'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Ham
a
no
Merge bran
c
h 'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-12
Junio
C
H
a
mano
GIT 1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-11
Ju
n
io
C Hamano
fs
c
k: do not compla
i
n on d
e
tached HEAD
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Ju
n
io C Haman
o
Mer
g
e
branch
'
maint'
commit
|
commitdiff
|
tree
2007-04-09
J
u
n
i
o C Hamano
M
erge b
r
anch 'jc/pus
h
'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Ha
m
ano
Merge bra
n
ch
'
jc/mer
g
e-
s
ubtr
e
e'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Junio
C
Hamano
Merge branch 'js
/
fet
c
h-progress'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Merge b
r
anch 'm
a
int'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Add Docume
n
tation/
c
md-list
.
made to
.
g
i
tignore
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Junio
C H
a
mano
Start 1
.
5
.
2 cycle
b
y prepare
i
ng RelNotes for it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Junio C
Haman
o
Merge branch
'jc/read-t
r
ee-df' (early part)
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
M
erge b
r
a
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
Prepare for
1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io C Hamano
A new merge
s
trag
e
ty 'subtr
e
e
'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
git-p
u
sh to mult
i
ple loc
a
tions does
not stop at the
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
J
unio C Hamano
git-push r
e
ports the UR
L
after failing
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Ham
a
no
Merge branc
h
'jc
/
index-outp
u
t'
commit
|
commitdiff
|
tree
2007-04-07
J
un
i
o C Ham
a
no
Merge b
r
a
n
ch 'fp/make-j'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hama
n
o
M
e
r
ge branch 'cc/bisect'
commit
|
commitdiff
|
tree
2007-04-07
Junio
C H
a
m
ano
Merg
e
branch
'
jc/checkout' (e
a
rly pa
r
t)
commit
|
commitdiff
|
tree
2007-04-07
J
un
i
o C Ham
a
no
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io C Hamano
D
o
cument
a
tio
n
:
tighten dependency for git
.
{
html,txt}
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
git
-
bisect: al
l
ow bisecting
w
ith only
o
ne bad comm
i
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
J
u
n
io C
H
a
m
an
o
t6030: add
a
b
it more tests to git-b
i
se
c
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Junio C Ha
m
ano
git
-
b
i
sect:
modern
i
z
at
i
on
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
J
u
n
io
C Hamano
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-05
J
u
nio
C Hamano
Rename add
_
file_t
o
_in
d
ex()
to add_file_t
o
_cache
(
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
J
u
nio C Hama
n
o
Re
n
ame
static
va
r
iable write
_
index to update_index
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Rena
m
e internal fu
n
ction "ad
d
_file_
t
o_cache" in builtin
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
J
unio C
H
ama
n
o
P
rop
a
gate ca
c
he e
r
r
or
i
n
terna
l
to r
e
f
re
s
h
_cac
h
e()
vi
a
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
F
ix
b
o
gu
s
error messa
g
e
f
r
om mer
g
e-r
e
cursive error
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
J
u
nio
C
H
amano
Fix de
p
endency of c
o
m
m
on-cmds
.
h
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
RPM spec: include git-p4 in the list
o
f all pac
k
ages
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
i
o C Hamano
rerere: make sorting really s
t
able
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C Haman
o
Fix swit
c
hing to a
b
ranch
with D/F wh
e
n
cu
r
r
ent
branch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
Hamano
Fix tw
o
way
_
m
erge that passed d/f conflict marker to
.
.
.
commit
|
commitdiff
|
tree
2007-04-04
Junio C
Hamano
Fi
x
re
a
d
-tree
--pr
e
fi
x
=dir/
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o
C
Hamano
un
p
ack-trees: ge
t
rid of *
i
n
d
pos parameter
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C Hamano
unpa
c
k_tre
e
s
.
c: pass unpack_trees_option
s
struct
u
re
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
a
d
d_cache_entr
y
(): rem
o
v
al of file foo doe
s
no
t
conflict
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ham
a
no
Merge branch 'jc/bisect'
commit
|
commitdiff
|
tree
2007-04-04
Junio C H
a
mano
Merge br
a
nch 'fl/doc
'
commit
|
commitdiff
|
tree
2007-04-04
Junio C
Hamano
Merge branch 'p
o
st1
.
5
.
1/
b
l
a
m
e
.
el'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Me
r
ge branch 'post1
.
5
.
1/tcl
t
k'
commit
|
commitdiff
|
tree
2007-04-04
J
unio C H
a
mano
Merge branch 'post1
.
5
.
1/p4
'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ha
m
ano
M
e
rg
e
branch '
l
t/dirw
a
lk
'
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io
C
H
amano
g
i
t
-
read
-
tree --i
n
dex-output=<file>
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
u
n
io C
Hamano
_
GIT
_
INDEX_OUTPUT: allow plumbing to outpu
t
to
a
n alternativ
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o
C Hamano
checkout: all
o
w de
t
aching to HEAD even when swit
c
hing
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C Hama
n
o
GI
T
1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
un
i
o C Hamano
Mer
g
e 1
.
5
.
0
.
7 in
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
unio
C
Hamano
GIT 1
.
5
.
0
.
7
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o
C
Hamano
rerere sho
u
l
d
not repeat the earlier
hunk
s
in later
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-02
Junio C Hamano
Hopefully final update
t
o the
dr
a
ft R
e
le
a
se Not
e
s
,
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-01
Junio C
H
ama
n
o
Optional
T
ck/Tk: ig
n
ore generated files
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Ju
n
io C Hama
n
o
Do not bother documenti
n
g fetch--tool
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Jun
i
o C
H
a
m
ano
U
p
d
ate draft
r
e
l
e
a
se 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
Junio
C
H
amano
Merge
b
ranch 'maste
r
'
of
git:/
/
repo
.
or
.
cz/git
/
m
ergetool
.
git
commit
|
commitdiff
|
tree
2007-03-28
Juni
o
C Hamano
D
ocumentation: unb
r
e
a
k u
s
er-m
a
nual
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
J
uni
o
C Hamano
GIT 1
.
5
.
1-r
c
3
commit
|
commitdiff
|
tree
2007-03-28
J
u
n
i
o C Ha
m
a
n
o
Update m
a
i
n
g
it
.
html page to point at 1
.
5
.
0
.
6
docu
m
e
n
tation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
J
unio C Hamano
Merge branch 'maint' to synchro
n
ize w
i
th 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Junio C Haman
o
GIT 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
J
unio
C Hama
n
o
Fi
x
"--pretty=
f
ormat:" f
o
r pa
r
ent r
e
lated items
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
git-
c
ommit: "read-tree -m HEAD" is not the
r
ight way
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next