repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
apply: do not get confused by symlinks in the middle
2007-04-19
J
unio
C
Hamano
Counto-fix in
m
erg
e
-recursive
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
J
un
i
o C Hama
n
o
Merge bran
c
h
'maint'
commit
|
commitdiff
|
tree
2007-04-18
J
u
n
i
o C Hamano
Fix funny type
s
used i
n
a
t
t
r
ibute
value rep
r
esentation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
J
unio C
Hamano
Allow low-level driver to
s
pe
c
ify
d
ifferen
t
beha
v
iour
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
J
u
n
i
o
C
H
am
a
no
Custom
l
o
w-level merge driver: chang
e
the
configurati
o
n
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C H
a
mano
Allow the
d
efault lo
w
-level
m
e
rge dr
i
v
e
r to be configured
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Cus
t
om
l
o
w-level merge driver support
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
J
u
ni
o
C Hamano
Mer
g
e branch
'fl/cvsserv
e
r
'
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o C Haman
o
Merge
b
ran
c
h
'
maint'
commit
|
commitdiff
|
tree
2007-04-18
Junio C H
a
m
ano
Update
draft
relea
s
e notes for 1
.
5
.
2 with
accumulated
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C
Ha
m
ano
Merge br
a
nch
'
maint'
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
io C Ha
m
ano
Start preparing f
o
r 1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
io
C
Hamano
Merg
e
branch 'mas
t
er
'
of g
i
t://r
e
po
.
o
r
.
cz/git-gu
i
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Merge branch 'maint' o
f
git://rep
o
.
or
.
cz/gi
t
-gui into
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
Junio C H
a
mano
Merge branc
h
'jc/re
a
d-tree-df'
commit
|
commitdiff
|
tree
2007-04-17
Juni
o
C Hama
n
o
Add a demons
t
ration/test of cust
o
mi
z
ed mer
g
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Ju
n
i
o
C Hamano
Al
l
ow sp
e
cifying sp
e
cial
i
ze
d
merge
-
bac
k
e
nd per path
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Ham
a
no
git-gui: Honor TCLTK_PATH
i
f suppl
i
ed
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Juni
o
C Haman
o
m
erge
-
recursive: se
p
arate out
xdl_merge(
)
interface
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio
C Hamano
A
l
l
ow more than t
r
ue/f
a
lse to attribute
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C
H
a
mano
Make s
u
re quic
k
fetch
is not fooled with a pr
e
vious
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-16
Junio C
H
amano
M
e
r
g
e branch '
j
s/w
r
ap-log'
commit
|
commitdiff
|
tree
2007-04-16
Jun
i
o
C Hamano
send-email: do not leave an
e
mpty CC: line if no cc
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-16
J
unio C H
a
mano
M
erge branch 'ma
i
n
t'
commit
|
commitdiff
|
tree
2007-04-16
J
u
nio C Hamano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-15
Junio C
H
amano
Change at
t
rib
u
te nega
t
io
n
ma
r
ker fro
m
'!' to '-'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
D
e
f
ine a b
u
ilt-in attribute macro "
b
inary"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
attribute macro su
p
port
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
J
u
nio C Ha
m
ano
Makefile: add pa
t
ch-i
d
s
.
h bac
k
in
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Jun
i
o C Hamano
F
ix 'd
i
ff
'
att
r
i
b
ute semantics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
J
u
nio C Ham
a
no
Fix 'crlf' attribute semantics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
J
u
nio
C
H
a
ma
n
o
Me
r
ge g
i
t://git2
.
kernel
.
org/pub/scm/gitk/gitk into
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
J
u
nio C Hama
n
o
Teach 'd
i
f
f
'
a
b
out
'diff' attrib
u
t
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Jun
i
o
C
Hamano
Define 'crlf' attribute
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hama
n
o
Add basic infrastructure t
o
as
s
ign attributes to path
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Ju
n
io
C
Hamano
M
erge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-14
Junio C Ham
a
n
o
Replac
e
a pair of
p
atches with updated
o
nes f
o
r
subpro
j
e
ct
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
J
uni
o
C Hamano
Do
n
o
t
de
f
au
l
t to -
-
no-index when gi
v
e
n
t
w
o
d
i
rector
i
e
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hamano
Mer
g
e branch '
j
c/
c
herr
y
'
commit
|
commitdiff
|
tree
2007-04-13
Junio C H
a
m
a
no
M
erge
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-13
Junio
C
H
amano
F
i
x
git {log,show,
.
.
.
} --pr
e
tty=email
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C
Hamano
Docum
e
nt
a
tion:
--cherry-pick
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Juni
o
C
H
ama
n
o
g
it-log --
c
herry-
p
ick A
.
.
.
B
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Refactor
patch-id filtering out o
f
git-cherry and gi
t
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio
C
Hama
n
o
Add %m to '--pret
t
y=form
a
t
:
'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio
C
Hamano
Me
r
ge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2007-04-12
Ju
n
io C Ha
m
a
n
o
GIT
1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-11
Junio C Haman
o
f
sck
:
do
n
ot compla
i
n on deta
c
hed
HEAD
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C
Hama
n
o
Mer
g
e branch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-10
Junio C
Hamano
git-f
e
t
c
h: use
f
etch--to
o
l pick-r
r
ef to
avoid
l
o
c
a
l
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
git-f
e
t
ch--to
o
l pick-rref
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Juni
o
C Hamano
t3030: merge
-
r
ecursive backe
n
d t
e
s
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio
C
Hamano
merge-recursive: handle D/F conflict case more carefully
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Jun
i
o
C Hamano
m
er
g
e-re
c
ursive: do not barf on "to
b
e removed
"
entrie
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Ju
n
io C H
a
m
a
no
Treat D
/
F c
o
nflict en
t
ry more carefully in unpack-trees
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Ju
n
io
C
Hamano
t1000
:
fix
c
a
s
e table
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
J
unio
C Hamano
shortlog -w:
make
wra
p
-line beh
a
viour optional
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Junio C
H
am
a
no
Merge branch 'jc/
p
ush
'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Ha
m
ano
Me
r
ge branch 'jc/merge-subtree'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Merge branch '
j
s/fetc
h
-progress'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Ha
m
an
o
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Add Documentation/cm
d
-l
i
st
.
made to
.
gitignore
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
Sta
r
t 1
.
5
.
2 cycle b
y
pr
e
pareing RelNotes for it
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Junio
C
Ham
a
no
Merge branch 'jc
/
read
-
tree-df' (early part)
commit
|
commitdiff
|
tree
2007-04-08
J
u
n
io C Ha
m
ano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-08
Junio C H
a
mano
Prep
a
re for 1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
J
u
nio C Hamano
A new merge straget
y
'subtree
'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio
C H
a
m
ano
git-push t
o
mul
t
iple l
o
c
ations does not stop
a
t the
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio
C Hamano
git-
p
u
sh report
s
the URL after fa
i
ling
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C
H
a
mano
Merge branch
'
jc/inde
x
-
o
u
t
pu
t
'
commit
|
commitdiff
|
tree
2007-04-07
Jun
i
o C Hamano
M
e
rge bran
c
h 'fp/ma
k
e-j'
commit
|
commitdiff
|
tree
2007-04-07
J
u
nio C Hama
n
o
Merge branch 'cc/b
i
sect
'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Ham
a
no
Merge
b
ranch 'j
c
/
c
h
eck
o
ut' (
e
arly part)
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Merge branc
h
'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-07
Junio C H
a
mano
Docum
e
ntation: tighte
n
dependency for git
.
{html,txt}
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
i
o C Haman
o
gi
t
-bisec
t
: allo
w
bisecting with only one
b
ad co
m
mit
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C H
a
mano
t
6030: add a bit more tests to git-bisect
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Junio C Ham
a
no
git-bisect: mod
e
rnization
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
M
e
r
ge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-04-05
Junio C Ham
a
no
Re
n
ame
a
d
d_file_to_in
d
ex(
)
t
o add_file_to_cache()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C
Hamano
Rena
m
e s
t
atic variable w
r
ite_in
d
ex to update_in
d
ex
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
J
u
nio C H
a
mano
Ren
a
me interna
l
fu
n
ction "ad
d
_file_to_cac
h
e" in
buil
t
in
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Juni
o
C
Hamano
Propagate cache
e
r
r
or internal to refres
h
_cache() via
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio
C
Hamano
Fix bogus error m
e
ssage
f
rom mer
g
e-recur
s
ive er
r
or
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio
C Hamano
F
i
x de
p
end
e
ncy
o
f common-cmds
.
h
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
RPM spec:
i
nclude
g
i
t
-p
4
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:
ma
k
e sorting reall
y
s
t
able
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Fix swi
t
ching to a branc
h
wi
t
h
D/F wh
e
n cu
r
rent br
a
nch
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io
C
Hamano
Fix twoway_merge t
h
at pass
e
d d/f confl
i
ct mar
k
e
r
to
.
.
.
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
H
aman
o
Fix read
-
t
r
ee
-
-pr
e
fix=di
r
/
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C Hamano
u
npack-trees: get rid of
*
i
ndp
o
s paramete
r
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Haman
o
u
n
pack_trees
.
c: pass u
n
pack_trees_options stru
c
ture
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
a
dd_
c
ache_entr
y
(): remova
l
of file foo does not conflict
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
J
unio C Haman
o
M
erge
b
ranch 'jc/
b
isect'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Haman
o
Me
r
g
e
branch 'fl
/
doc'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Merge bran
c
h 'post1
.
5
.
1/blame
.
el'
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio
C
H
a
mano
Merge bran
c
h 'post1
.
5
.
1/tcltk'
commit
|
commitdiff
|
tree
2007-04-04
J
unio C Hamano
M
erg
e
branch
'
post1
.
5
.
1/p4'
commit
|
commitdiff
|
tree
2007-04-04
Junio C H
a
mano
Merge branch 'l
t
/dirwalk'
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C Haman
o
git-rea
d
-tr
e
e --index-outpu
t
=<fi
l
e>
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next