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
Merge branch 'maint'
2007-04-22
Junio C Haman
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hamano
GIT 1
.
5
.
1
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Haman
o
g
i
t-cl
o
ne: f
i
x dumb p
r
o
t
o
c
o
l transpor
t
to clone from
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hama
n
o
Merg
e
bran
c
h 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-19
Junio C Ham
a
no
Merge bran
c
h '
m
aint'
commit
|
commitdiff
|
tree
2007-04-18
J
unio C Hamano
Merge b
r
anch
'
maint'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Ha
m
a
no
Merge branch
'
fl/cvsserve
r
'
commit
|
commitdiff
|
tree
2007-04-18
Junio C
Hamano
Merge br
a
n
c
h 'maint'
commit
|
commitdiff
|
tree
2007-04-18
Junio
C Haman
o
U
pdate draf
t
release notes for 1
.
5
.
2 wit
h
acc
u
mulated
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C H
a
mano
M
e
rge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
S
tart
p
rep
a
ring for 1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
Junio
C Hamano
Merg
e
bra
n
ch 'master' of git:
/
/
repo
.
or
.
cz/g
i
t
-
gui
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o C
Ha
m
ano
Merge branch 'maint'
of git:
/
/repo
.
or
.
cz/git-gui into
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
Merge branch '
j
c/
r
ead-tree-d
f
'
commit
|
commitdiff
|
tree
2007-04-17
J
u
nio C
H
amano
git-g
u
i
:
Honor
T
CL
T
K_PATH if supplied
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-16
Junio C
H
ama
n
o
Merge bra
n
ch 'js/wrap-log
'
commit
|
commitdiff
|
tree
2007-04-16
J
unio
C
Hamano
send-email: do
n
ot leave an e
m
p
t
y
CC: line i
f
no cc
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-16
Junio C
Hamano
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2007-04-16
Junio C Haman
o
M
erge br
a
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-04-15
Junio C H
a
mano
Merge git
:
//
g
it2
.
kerne
l
.
o
rg/pub/scm/gitk/gitk into
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
J
unio
C
H
a
man
o
M
e
rge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-14
Junio C
Ham
a
no
Do not d
e
f
a
ult
t
o
-
-no
-
index when
given two directories
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-13
Junio C
Hama
n
o
Merge branch 'j
c
/c
h
erry
'
commit
|
commitdiff
|
tree
2007-04-13
J
unio C Hama
n
o
M
e
r
ge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hamano
Fix git {l
o
g,
s
ho
w
,
.
.
.
}
-
-pretty=email
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Doc
u
me
n
t
a
tion: --cherry-pick
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
git-log --cherry-pick A
.
.
.
B
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Jun
i
o C Hamano
Refa
c
tor patch-id filtering out of git-cherry and git
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio
C
Ham
a
no
Add %m to '-
-
pretty=format:
'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio
C Hamano
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
GIT
1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-11
Junio C Hamano
fsck: do not
c
om
p
lai
n
on det
a
ched HEAD
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
M
e
rge branc
h
'm
a
int'
commit
|
commitdiff
|
tree
2007-04-10
Junio
C Hamano
t303
0
:
merge-recurs
i
ve backend test
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Ju
n
io C
Hamano
m
e
rge-recursi
v
e:
handle D/F
conflict case more c
a
refully
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio
C
Hamano
merge-re
c
ursive: do not barf on "to
b
e remov
e
d" en
t
r
i
es
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio
C
Hamano
Treat
D
/F conflict entry more caref
u
ll
y
in unpack-tre
e
s
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio
C
Hama
n
o
t1000: fix case table
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
s
h
ortlog -w:
mak
e
wrap-line
b
e
haviour op
t
ional
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Junio C Ham
a
n
o
Merge
branch 'jc/
p
ush'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Merge branch 'jc
/
m
e
rge
-
su
b
t
ree'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Juni
o
C Haman
o
Merg
e
bran
c
h 'js/fetch
-
progress'
commit
|
commitdiff
|
tree
2007-04-09
J
u
ni
o
C Ha
m
ano
Merge b
r
anch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-09
Jun
i
o C Ha
m
ano
Add Docu
m
entation/
c
md-list
.
made to
.
g
i
t
ign
o
re
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Juni
o
C Hamano
Sta
r
t 1
.
5
.
2
cy
c
l
e
by prepareing RelNotes for
it
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
Merge branch 'jc/re
a
d-tre
e
-df' (earl
y
par
t
)
commit
|
commitdiff
|
tree
2007-04-08
J
u
nio
C Ha
m
ano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-08
Junio C Ham
a
no
Pre
p
are
for 1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Juni
o
C Ha
m
ano
A
n
ew merge s
t
r
agety 'subtree'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio
C
Hamano
g
it
-
push to
m
ultiple location
s
does
n
ot
s
top
a
t the
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Ham
a
n
o
git-push re
p
orts the URL after
fa
i
lin
g
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Merge br
a
nc
h
'
j
c/index-
o
u
t
p
ut'
commit
|
commitdiff
|
tree
2007-04-07
Junio
C
Hama
n
o
Merge
bran
c
h 'fp/make-j'
commit
|
commitdiff
|
tree
2007-04-07
J
uni
o
C
Ham
a
no
Me
r
ge branch
'cc/
b
isect'
commit
|
commitdiff
|
tree
2007-04-07
Junio C
H
amano
Merge br
a
nch 'jc/check
o
ut'
(earl
y
part)
commit
|
commitdiff
|
tree
2007-04-07
Jun
i
o C Ham
a
no
Merge branc
h
'main
t
'
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io C Haman
o
Documentati
o
n: tighten
d
ependency for gi
t
.
{
h
tm
l
,t
x
t}
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
J
u
nio C Hama
n
o
git-bisec
t
: allow bisect
i
n
g with only one bad
c
ommi
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Ham
a
no
t6030: add a
b
it more tests to g
i
t-b
i
sect
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Junio C Hamano
g
it-bis
e
c
t: modernization
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Ju
n
io C Ha
m
a
n
o
M
erge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2007-04-05
Junio
C Hamano
Ren
a
me add_file_to_
i
nde
x
() to 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
r
i
a
b
le write_index to upda
t
e_index
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Ju
n
io C Hamano
Rename internal funct
i
o
n "ad
d
_fil
e
_to_cache" in builtin
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Ju
n
io C Hamano
Pro
p
agate cache error
internal to refres
h
_cache() via
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio
C
Ha
m
ano
Fix bogus error messa
g
e from
merge-re
c
ursive erro
r
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
F
i
x
dep
e
ndency of common-cmds
.
h
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
J
unio C Haman
o
RPM s
p
ec: i
n
clu
d
e git-
p
4 in the list
of al
l
packages
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
Hamano
rerere: make sor
t
ing really s
t
ab
l
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio C H
a
ma
n
o
Fix switching
t
o a
branch with D/F when
c
u
rrent branch
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
F
ix twoway_mer
g
e tha
t
pass
e
d d/f confli
c
t
ma
r
ker to
.
.
.
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C
Ham
a
n
o
Fix
r
e
a
d-tree --prefix=dir/
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C Hama
n
o
unpack-trees:
g
et ri
d
of *indp
o
s
pa
r
am
e
ter
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
Ha
m
ano
unp
a
ck_t
r
ees
.
c: pass un
p
a
ck_tree
s
_options structur
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
H
ama
n
o
add_cache_entry(): remo
v
a
l
o
f
file foo does not conflict
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
J
unio C
Hamano
Merge bran
c
h 'jc
/
bisect'
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio C Hamano
Merge
b
ran
c
h 'fl/doc'
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io C
H
a
m
a
no
Me
r
ge branch '
p
ost
1
.
5
.
1/blame
.
e
l
'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Merge bra
n
ch 'post1
.
5
.
1/tcltk'
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o
C Hamano
Merge
branch 'post1
.
5
.
1
/
p4'
commit
|
commitdiff
|
tree
2007-04-04
J
u
n
io
C Hamano
Merge
b
ranch 'lt
/
dirwalk'
commit
|
commitdiff
|
tree
2007-04-04
Junio C
Hamano
gi
t
-read-
t
ree --index-outp
u
t
=<file>
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
i
o
C Hamano
_GIT_IND
E
X_OUTPUT: allow
plumbing t
o
output to an alternat
i
v
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C H
a
man
o
checkout:
al
l
ow det
a
c
h
i
ng to HEAD e
v
en
w
hen sw
i
tch
i
ng
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C
H
amano
GIT 1
.
5
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C Ham
a
no
Merge
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
Jun
i
o C
H
amano
re
r
ere shoul
d
not r
e
peat the earli
e
r h
u
nks in later
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-02
Junio C Hamano
Hop
e
fully final up
d
a
te to
t
he draft Release Notes,
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-01
J
u
nio C H
a
mano
Optional Tck/Tk
:
i
g
nore generat
e
d files
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
Junio
C Ham
a
no
Do no
t
bothe
r
do
c
umenting fetch--tool
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
Junio C Hama
n
o
Upd
a
te draf
t
release notes for 1
.
5
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
J
uni
o
C Hamano
Mer
g
e branch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-03-30
J
u
nio C Haman
o
Merg
e
branch 'mast
e
r'
o
f git:/
/
repo
.
or
.
cz
/
git/mergetool
.
g
it
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
Doc
u
ment
a
tion:
u
nbreak user
-
m
a
nual
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
GIT
1
.
5
.
1-rc3
commit
|
commitdiff
|
tree
2007-03-28
Jun
i
o C Hamano
Update main git
.
h
t
ml pag
e
t
o point at 1
.
5
.
0
.
6 doc
u
men
t
a
tion
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Junio
C Hama
n
o
Merge branc
h
'maint' t
o
sync
h
ronize
w
ith
1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Ju
n
io C Hamano
GIT 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
Fix "--pretty
=
format:" for parent related items
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next