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
H
a
mano
convert
.
c: restr
u
ct
u
re the att
r
ibute ch
e
ck
i
ng part
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Juni
o
C Hamano
F
i
x bo
g
us link
e
d-l
i
st manag
e
m
en
t
for user de
f
i
n
ed me
r
ge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio
C
Hamano
Document gitat
t
ributes(5)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
Upd
a
te
'
crlf' attri
b
ute semant
i
cs
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
Documentatio
n
:
suppo
r
t manual section (5) - fil
e
formats
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
Junio C
H
a
mano
Simplify code
t
o
find
r
e
cursive
m
erge
d
river
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
Junio C Hamano
Counto-fi
x
in merge-re
c
ursive
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Haman
o
Fix funn
y
types
u
sed in attribute value representati
o
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
Hamano
Allow low
-
level driver to specify different
behaviour
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
Hamano
Cu
s
tom lo
w
-l
e
v
e
l m
e
rge drive
r
: change the configuration
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Allow the
d
e
f
ault l
o
w
-
level me
r
ge
driver to
b
e
configured
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C Hamano
Custom low
-
level merge driver su
p
port
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Ju
n
io C Hamano
A
dd a dem
o
nstration/test of c
u
s
t
o
m
i
zed merge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
J
u
nio C Ham
a
no
Allo
w
specifying specialized
merge-backe
n
d p
e
r pat
h
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio
C Hamano
merge-recursive: separate out xdl_merge() interf
a
ce
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
Allow m
o
re
tha
n
tru
e
/false
t
o attributes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Jun
i
o C Hamano
C
h
a
nge attribute neg
a
ti
o
n marker fr
o
m
'!' t
o
'-'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
D
efine a built-in attribute ma
c
ro "bi
n
ary"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Jun
i
o C Ham
a
no
attri
b
ute macro su
p
port
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio
C
H
amano
Makefile: ad
d
patch-
i
ds
.
h back in
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Fix 'di
f
f' a
t
tribute semantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Ju
n
io C
H
am
a
no
Fix
'c
r
lf'
a
ttri
b
ute semantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
T
e
a
ch 'd
i
ff' about 'diff'
a
ttribute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Ju
n
i
o C
H
amano
De
f
i
ne 'crlf
'
attribute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C
Hamano
Ad
d
basic infrastructure to assi
g
n attributes to paths
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
J
unio C Hamano
Merg
e
bra
n
c
h
'
m
a
int'
commit
|
commitdiff
|
tree
2007-04-14
Junio C Haman
o
D
o
not default to --no-i
n
dex w
h
en g
i
ven two
d
irectories
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
Juni
o
C
H
amano
Merge branch 'jc/cher
r
y'
commit
|
commitdiff
|
tree
2007-04-13
Junio C Haman
o
Merg
e
branc
h
'm
a
int'
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hamano
Fix git
{
log,sho
w
,
.
.
.
}
--pr
e
tty=email
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C
H
a
mano
Documentat
i
on: --cherry-pick
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hama
n
o
git-log --cherry-pick A
.
.
.
B
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Ju
n
io C Hama
n
o
Ref
a
c
tor patch-id filt
e
ring
ou
t
of git-
c
he
r
ry an
d
git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Add %m to '-
-
pre
t
ty
=
f
o
rmat:'
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
Junio C
H
aman
o
GIT 1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-11
J
unio C Hamano
fsc
k
: do
n
ot complain
o
n det
a
ched HEAD
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Ju
n
io C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-09
J
un
i
o C Hamano
Merge bran
c
h
'
jc
/
p
u
sh'
commit
|
commitdiff
|
tree
2007-04-09
J
unio C
H
amano
Merge b
r
anch 'j
c
/merge-sub
t
r
e
e'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Ju
n
io C Ham
a
n
o
Merge branch 'js/fetch-progress'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hama
n
o
M
erge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2007-04-09
Junio C
Hamano
Add Documentation/cmd-li
s
t
.
made to
.
giti
g
n
o
re
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
J
unio C Ha
m
ano
S
tart 1
.
5
.
2 cycle by prepareing RelNotes for
it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
J
unio C
Hamano
M
e
r
ge branch 'jc
/
rea
d
-tr
e
e-
d
f' (early
pa
r
t)
commit
|
commitdiff
|
tree
2007-04-08
Junio
C
H
a
man
o
Mer
g
e
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-08
Junio C Ham
a
no
P
r
epare for 1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Jun
i
o C Hamano
A new merge stragety 'subtree'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
git-p
u
sh to mul
t
iple locatio
n
s
d
oes not
s
top
a
t
the
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio
C
Hamano
g
i
t
-
p
ush reports the URL afte
r
fail
i
ng
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Merge branch
'
jc
/
index-output'
commit
|
commitdiff
|
tree
2007-04-07
J
u
ni
o
C H
a
mano
Me
r
ge branch 'fp/make-j'
commit
|
commitdiff
|
tree
2007-04-07
J
u
ni
o
C Hamano
Me
r
ge branch 'cc/bise
c
t'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Ha
m
ano
M
e
r
g
e b
r
anch '
j
c/
c
he
c
ko
u
t' (e
a
rly part
)
commit
|
commitdiff
|
tree
2007-04-07
Juni
o
C
Ham
a
no
Merge branch
'
ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-07
Junio C
H
am
a
no
Documentat
i
o
n
: tighte
n
dep
e
ndency for
git
.
{
html,txt}
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C H
a
mano
git-
b
isect: allow bisec
t
ing with onl
y
one bad commi
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
t
6030
:
ad
d
a bit more
tests
to
git
-
bisect
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Junio
C Haman
o
gi
t
-bisect: m
o
de
r
ni
z
a
t
ion
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
J
u
nio
C Hama
n
o
Mer
g
e
br
a
nch 'm
a
int'
commit
|
commitdiff
|
tree
2007-04-05
Junio
C
Hamano
R
e
n
a
me ad
d
_file_to_index(
)
t
o
add_fil
e
_to
_
cache()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Ju
n
io C Hamano
Rena
m
e static variable write_index t
o
up
d
ate_index
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio
C Hamano
Rename internal
function "add_fi
l
e_to_cache" in builtin
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hama
n
o
Propagate ca
c
h
e
err
o
r internal to
refresh_cache() via
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio
C Hamano
Fix b
o
gus error
m
es
s
age from merge-recursive error
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
J
u
n
i
o C Hamano
Fix dependency of common
-
cmd
s
.
h
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C H
a
mano
RPM
spec: in
c
lude
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
Haman
o
rerere:
make sor
t
ing really
stable
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Fix switchin
g
to a branch with
D
/F w
h
e
n
current
b
ranch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C H
a
mano
Fix twowa
y
_me
r
ge th
a
t passed d/f conflict marker to
.
.
.
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
F
i
x read-t
r
ee
-
-p
r
efix=dir/
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
Hamano
unp
a
ck-trees:
g
et rid of *ind
p
os paramete
r
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
u
n
io
C
Hamano
unpack_trees
.
c: p
a
ss unpack_trees_options structure
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
u
n
i
o
C
Hamano
ad
d
_cach
e
_e
n
t
r
y(): rem
o
val
o
f file foo
d
oe
s
not conflict
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
unio C
H
amano
Merg
e
branch 'jc/bisect'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Merg
e
bran
c
h 'fl/doc'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Me
r
ge
b
ranc
h
'post1
.
5
.
1/blame
.
el'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
M
e
rge branch 'po
s
t1
.
5
.
1/t
c
ltk'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Merge branc
h
'post1
.
5
.
1/p4'
commit
|
commitdiff
|
tree
2007-04-04
Junio C
Hamano
Merge
b
ranch 'lt/
d
irwal
k
'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hama
n
o
git-
r
ead-tree --i
n
d
e
x-ou
t
put=<file
>
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
H
ama
n
o
_GI
T
_INDEX_OUT
P
U
T
: allow pl
u
mbing to outpu
t
to an alter
n
ativ
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio C Hamano
check
o
ut
:
allow detaching to HEAD ev
e
n wh
e
n switchi
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
GIT 1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
unio C Hamano
Me
r
g
e 1
.
5
.
0
.
7
in
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io
C
H
a
mano
GIT 1
.
5
.
0
.
7
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
Ha
m
ano
rerere should no
t
repeat the earlier
hunks in later
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-02
Junio C Hamano
Hopefully final
update to the draf
t
Rel
e
ase Notes
,
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-01
Juni
o
C Hamano
Optional Tck/T
k
: ignore generated files
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Junio C Ha
m
ano
D
o not bot
h
e
r
documenting fetch--
t
ool
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Ju
n
io C Hamano
U
p
d
ate draft releas
e
no
t
es 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 Hamano
Me
r
g
e
b
r
anc
h
'm
a
ster' of git://repo
.
o
r
.
cz/git/merg
e
tool
.
git
commit
|
commitdiff
|
tree
2007-03-28
Junio C
Hamano
D
oc
u
mentati
o
n: unbrea
k
user-manu
a
l
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
J
unio C Hamano
GIT
1
.
5
.
1-rc
3
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
Update ma
i
n git
.
html pa
g
e to
p
oint at 1
.
5
.
0
.
6 documen
t
ation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Junio C Haman
o
Merge branch 'maint' to synch
r
on
i
ze with 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Junio C Ham
a
no
GIT 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Ju
n
io C
Ham
a
no
Fix "--pretty=format:" for parent re
l
a
t
ed items
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
J
unio
C
H
amano
g
i
t
-commit: "read-tree
-
m
HEAD" is not the ri
g
ht way
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next