repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Add a demonstration/test of customized merge.
2007-04-17
Junio C
Hamano
Add
a
demonstration
/
test
of customized
merge
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
J
u
nio
C Ham
a
n
o
All
o
w
s
p
e
c
ifyin
g
specialized
m
erge-backend per path
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C
H
a
m
ano
merge-recursive: separate out xdl
_
m
e
r
g
e()
i
nterface
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C
Hamano
Al
l
ow
more than
true/false
t
o
a
ttributes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C
H
ama
n
o
Change attri
b
ut
e
negation marker from '!' to '-
'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
J
unio C Hamano
Define a
b
uilt-in att
r
ibute macro "binary"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
attribute mac
r
o supp
o
rt
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio
C
H
a
mano
Ma
k
efile: add patch-ids
.
h back in
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C
H
a
mano
F
i
x 'd
i
ff' attribute semantics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Ham
a
no
Fix 'c
r
lf' attribute
sema
n
tics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Juni
o
C Hamano
Teach 'di
f
f' a
b
o
u
t 'dif
f
' attribute
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio C
Hamano
D
efine
'crlf' attribute
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Ha
m
ano
Add bas
i
c infrastructure to assign at
t
ributes to
p
aths
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio
C
Hamano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-14
Junio C
H
a
m
ano
Do not default to --n
o
-
i
n
dex when given t
w
o directories
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-13
Juni
o
C
Hamano
Me
r
ge bra
n
ch '
j
c/
c
her
r
y'
commit
|
commitdiff
|
tree
2007-04-13
Junio
C
Haman
o
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hamano
Fix git {log,sho
w
,
.
.
.
} --pretty=email
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio
C
Hamano
Documen
t
ation
:
--cher
r
y-p
i
c
k
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
gi
t
-log
-
-ch
e
rry
-
pick
A
.
.
.
B
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Ha
m
ano
Refact
o
r
patch
-
id
fi
l
terin
g
out of git-che
r
ry and
gi
t
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
A
d
d
%
m to '-
-
p
r
etty=fo
r
mat:'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Jun
i
o C Hamano
Mer
g
e
b
r
anch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-12
Ju
n
i
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 Ham
a
no
fsck: do not comp
l
a
i
n on detached HEA
D
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio
C
Hamano
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-09
Jun
i
o C Hamano
M
erge br
a
nch 'jc/push'
commit
|
commitdiff
|
tree
2007-04-09
J
u
nio C
H
am
a
no
Merge branch 'jc/merge-subtree'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Ju
n
io C Hamano
Merge
b
r
a
nch 'js/fetch-progress
'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Haman
o
Add Doc
u
m
entation/cmd-
l
ist
.
made to
.
gitigno
r
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Juni
o
C Hamano
Start 1
.
5
.
2 cycle
b
y prepareing
RelNotes for i
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
J
u
n
io C Ham
a
no
Merge bran
c
h 'jc/read-
t
r
e
e-df' (
e
arly
p
art)
commit
|
commitdiff
|
tree
2007-04-08
J
u
n
io C
H
amano
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
Pre
p
a
re for 1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Haman
o
A new merge stragety 'subtree
'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
git-push to m
u
l
tiple locations do
e
s
not stop
at the
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C
H
a
mano
git-push reports th
e
U
R
L af
t
e
r
fai
l
ing
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Jun
i
o
C
Ha
m
an
o
Merg
e
branch 'jc/
i
ndex-output'
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io C
H
am
a
no
Merg
e
branch 'fp/ma
k
e-j'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Merge branch 'cc/bisect'
commit
|
commitdiff
|
tree
2007-04-07
Junio
C Hama
n
o
Merge bra
n
ch
'
jc/checko
u
t' (ear
l
y
par
t
)
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io C Ha
m
ano
Merge b
r
anch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-07
Juni
o
C Hamano
D
o
cumentation: tighten dependen
c
y for git
.
{html,txt}
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
J
u
nio C Hamano
g
i
t
-bisect: a
l
low bisecting with only one bad commit
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io
C
Hamano
t6030: add a bit more test
s
to git-bisect
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Junio C Hamano
git-bi
s
ect:
modernization
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
J
unio C Ha
m
ano
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2007-04-05
Junio C
H
a
mano
Rename add_fil
e
_to_ind
e
x() to add_f
i
le_
t
o_cache()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Jun
i
o C Hama
n
o
Rename stat
i
c
v
ariable write_index to upd
a
te_index
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio
C H
a
mano
Rename in
t
ernal function
"
a
dd_file_to_
c
ache" in builtin
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
J
u
n
i
o C
H
amano
P
r
o
p
agate cache e
r
ror internal to refresh_cache() via
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
J
unio C Hamano
Fix
b
ogus error
mess
a
ge from mer
g
e-recu
r
sive
e
r
r
or
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Fix de
p
e
n
dency
of common-cm
d
s
.
h
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C H
a
mano
RPM spec: include git-p4 in the list
o
f all packages
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
H
aman
o
r
e
rere
:
make
s
o
rting really stable
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
J
unio C Hama
n
o
Fix switching
to a branc
h
with
D/F wh
e
n
cu
r
r
ent bra
n
ch
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Fi
x
tw
o
way_mer
g
e that
pa
s
sed d/f con
f
lict marke
r
t
o
.
.
.
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
Hamano
Fix read-tree --pre
f
i
x=
d
ir
/
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io C Hamano
u
n
pack-trees: get r
i
d of *indpos pa
r
ameter
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
unpac
k
_trees
.
c
: pass unpack_t
r
e
es_options structure
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
add_cach
e
_entr
y
():
r
em
o
val of fi
l
e
foo does not conflict
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C Hamano
M
erge branch
'
jc/
b
isect
'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Merge bran
c
h 'fl/do
c
'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Merge bra
n
c
h 'post1
.
5
.
1/
b
la
m
e
.
el'
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o
C
Ham
a
no
Merge branch
'
post1
.
5
.
1
/
tcltk'
commit
|
commitdiff
|
tree
2007-04-04
Junio C H
a
mano
Merge bran
c
h 'po
s
t1
.
5
.
1/p4'
commit
|
commitdiff
|
tree
2007-04-04
Junio C
H
aman
o
M
erge bra
n
ch
'lt/
d
irwalk'
commit
|
commitdiff
|
tree
2007-04-04
J
u
n
i
o C Hamano
git-
r
ead-tree --
i
ndex
-
ou
t
put=<
f
ile>
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C Hamano
_GIT_INDEX_OUTPUT: allow plumb
i
ng
t
o
o
u
t
p
ut to
an alternativ
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
Hamano
checko
u
t: al
l
ow detaching to
H
EAD
e
ve
n
wh
e
n swi
t
ching
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
Hamano
G
IT 1
.
5
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
J
unio C
H
am
a
no
Mer
g
e 1
.
5
.
0
.
7 in
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
GI
T
1
.
5
.
0
.
7
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C H
a
mano
re
r
ere should
n
ot
r
epeat the earlier hun
k
s in later
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-02
Ju
n
io C Hamano
Ho
p
efully final up
d
ate to t
h
e dra
f
t
Release Notes
,
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-01
Junio
C Haman
o
Op
t
ional Tck/Tk:
ignore gene
r
ated fil
e
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
J
unio C Ham
a
no
Do not bother do
c
umenting fetch--tool
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
Junio C
Hamano
U
p
date
dra
f
t
r
elease n
o
tes for 1
.
5
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
Junio
C Ham
a
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-03-30
Junio C Hamano
Me
r
ge branc
h
'master' o
f
g
i
t
:
//
r
ep
o
.
or
.
cz/git/merg
e
tool
.
git
commit
|
commitdiff
|
tree
2007-03-28
Jun
i
o C Ha
m
a
n
o
Doc
u
mentation: u
n
break user-
m
a
nual
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Junio C H
a
mano
G
I
T 1
.
5
.
1-rc3
commit
|
commitdiff
|
tree
2007-03-28
Junio C Haman
o
U
pdat
e
m
ain gi
t
.
html page to point at
1
.
5
.
0
.
6 docum
e
ntation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Jun
i
o
C Ham
a
n
o
M
e
r
g
e br
a
nch 'maint' to synchronize with
1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Junio C H
a
ma
n
o
GIT 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
J
u
nio C Hama
n
o
F
ix
"
--pretty=forma
t
:"
f
o
r
p
arent rel
a
te
d
i
t
ems
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
gi
t
-commit: "read
-
t
r
e
e
-
m H
E
AD"
i
s not the right way
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
Junio
C
Hamano
sha1_fi
l
e
.
c (write_
s
ha1_file)
:
Detect close
failure
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
Junio C
Hama
n
o
Document git-lo
g
-
-first-parent
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-26
Junio C
Ham
a
no
GIT 1
.
5
.
1
-
rc2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-26
Junio
C Hamano
M
e
rge
b
ranch '
j
c/fpl'
commit
|
commitdiff
|
tree
2007-03-26
Junio
C Hamano
Update README to point at a few key p
e
ri
o
dical messa
g
es
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-25
Ju
n
i
o
C
H
amano
Merge bran
c
h '
m
a
i
nt'
commit
|
commitdiff
|
tree
2007-03-25
Ju
n
io C
Hamano
M
e
rge branc
h
'
maint'
o
f
git
:
//linux-nfs
.
org/~bf
i
elds
.
.
.
commit
|
commitdiff
|
tree
2007-03-25
Juni
o
C Hamano
Merge b
r
anch 'js/remote-sho
w
-push
'
commit
|
commitdiff
|
tree
2007-03-25
Junio C Haman
o
Merge bran
c
h 'maint
'
commit
|
commitdiff
|
tree
2007-03-24
Junio C
H
a
man
o
git-am documentation: describe what i
s
taken fro
m
where
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-24
Junio C Hama
n
o
ma
k
e the previous
optimiz
a
tion work a
l
s
o
on path
-
li
m
i
t
ed
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-24
Junio C
H
amano
re
v
-
l
ist --bisect
:
F
i
x "halfway" o
p
timizati
o
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next