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
Juni
o
C Ha
m
an
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-21
Ju
n
io C Hamano
GIT 1
.
5
.
1
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio
C
Hamano
git-clone: fix dumb
protocol trans
p
ort to c
l
one
from
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Ju
n
io C Haman
o
Me
r
g
e
br
a
nch 'maint'
commit
|
commitdiff
|
tree
2007-04-19
Junio
C
H
a
m
ano
Merge b
r
a
n
ch 'maint
'
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C Hamano
Merge branch 'ma
i
nt
'
commit
|
commitdiff
|
tree
2007-04-18
J
u
n
i
o C Hamano
M
erge
branch
'
fl/cvsserver'
commit
|
commitdiff
|
tree
2007-04-18
Junio
C Hamano
Merge bra
n
c
h 'maint'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
U
pdate draft release note
s
for 1
.
5
.
2 with accumulate
d
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
u
n
i
o C
H
amano
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2007-04-18
Junio C H
a
mano
Start prepa
r
ing for 1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
Junio C Haman
o
Merge branch 'master' of git://repo
.
or
.
c
z/gi
t
-gui
commit
|
commitdiff
|
tree
2007-04-18
Juni
o
C Hamano
Merge branch 'maint' of git:/
/
repo
.
o
r
.
cz/git-gui into
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
Merge branch 'jc/read-tree-df'
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hama
n
o
g
i
t-gui: Hono
r
TCLTK_PATH
i
f
supp
l
ied
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
Junio C Ha
m
an
o
Merge br
a
n
c
h 'js/w
r
ap-log'
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hamano
send-e
m
a
i
l
:
do not le
a
ve an empty CC: line if no cc
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
Junio
C
H
amano
Merge bran
c
h
'
maint'
commit
|
commitdiff
|
tree
2007-04-16
Ju
n
io
C
H
a
mano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-15
J
u
nio C Hamano
Merge git://git2
.
kernel
.
org/pub/scm/gitk/gi
t
k
in
t
o
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hama
n
o
Merge branch
'maint'
commit
|
commitdiff
|
tree
2007-04-14
Juni
o
C
Hamano
Do n
o
t
default to --no-ind
e
x when g
i
ven two direct
o
ri
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
Junio
C
H
a
mano
Me
r
ge branch 'jc/cherry'
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hamano
Merge
b
ranch
'
maint'
commit
|
commitdiff
|
tree
2007-04-13
Jun
i
o C Hamano
Fix git {lo
g
,sho
w
,
.
.
.
}
-
-
p
r
etty
=
ema
i
l
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Jun
i
o
C Hama
n
o
Documentation:
-
-cherry
-
p
ick
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Ju
n
io C
H
aman
o
git-log --cherry-pick
A
.
.
.
B
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio
C
Hamano
R
efact
o
r patch-id filte
r
ing
out o
f
gi
t
-cher
r
y a
n
d
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=for
m
at:'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Ju
n
io C Hamano
Merge b
r
anch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-12
J
u
nio
C
H
a
mano
GIT 1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-11
J
u
nio C Hamano
fsck: do not
c
omplain on detached HEAD
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
J
u
nio
C Hamano
Merge
b
ranch 'maint
'
commit
|
commitdiff
|
tree
2007-04-10
J
u
nio C H
a
mano
t
3
0
30: merge-
r
e
c
u
rsive
backend test
.
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
m
ore ca
r
efu
l
ly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
J
unio C Hamano
m
e
r
g
e-re
c
ursive:
d
o not bar
f
on "to
be remov
e
d" entries
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hama
n
o
Treat D/F confl
i
ct entr
y
more carefully in unpack-trees
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Ham
a
no
t100
0
:
f
ix case table
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Juni
o
C Hamano
shortlog -w:
m
a
ke wrap-line beha
v
iour
o
ptional
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Ju
n
io C Hamano
Merge br
a
nch
'jc/push'
commit
|
commitdiff
|
tree
2007-04-09
J
u
n
i
o C Hamano
M
e
rge branch 'jc/merge-subtree
'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
J
unio C Hama
n
o
Merge
branch 'js/
f
etch-progress
'
commit
|
commitdiff
|
tree
2007-04-09
Juni
o
C H
a
mano
M
e
r
g
e branch
'
maint'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Ha
m
ano
Ad
d
Docum
e
ntation
/
cmd-list
.
m
a
d
e to
.
g
i
ti
g
no
r
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Junio
C Hamano
Start 1
.
5
.
2
c
y
c
l
e
b
y
pr
e
pareing Rel
N
otes for
i
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Junio C
H
amano
Merg
e
b
r
anch 'jc/r
e
ad-tree-d
f
'
(
early p
a
rt)
commit
|
commitdiff
|
tree
2007-04-08
J
unio C
Hamano
Merg
e
b
ran
c
h 'maint'
commit
|
commitdiff
|
tree
2007-04-08
Ju
n
io C Haman
o
P
r
epare for 1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
A
new m
e
r
g
e stragety 'subtree
'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
J
u
nio C Hamano
git-push to mu
l
ti
p
le locations does
n
ot stop at the
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio
C Hamano
git-push
r
eports the URL after fail
i
n
g
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Merge
branch 'jc/inde
x
-
o
ut
p
ut'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
M
erge
b
r
a
nch
'fp/make-j'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Merge
branch '
c
c/bisect
'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Merge
branch
'
jc/checkout' (early pa
r
t)
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Mer
g
e
b
ranch 'main
t
'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Ha
m
ano
Do
c
umen
t
ation: tighten dependency fo
r
git
.
{html,txt}
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
J
u
nio C Ham
a
no
git-b
i
sect: allow bisecti
n
g with only one bad commit
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hama
n
o
t6030: add a
b
it
m
ore
t
ests to
git-bisect
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Junio C
H
amano
git-bisect: modern
i
z
ation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Re
n
ame add_file_to_in
d
e
x
() to add
_
file_to_cac
h
e()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Juni
o
C
H
amano
Rename st
a
t
ic vari
a
ble write_index
to update_i
n
d
ex
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Juni
o
C
Hamano
Rename inte
r
na
l
func
t
ion "add_file_to_cache
"
in builtin
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio
C
H
amano
Propagate
cache
erro
r
inter
n
al to
r
efresh_cache()
v
ia
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Juni
o
C H
a
mano
Fi
x
b
o
gus er
r
o
r
me
s
sage f
r
om m
e
r
g
e
-
recursive error
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Fix dependency o
f
commo
n
-
cmds
.
h
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io C Haman
o
RPM spec: i
n
clude git-p4
i
n the list o
f
al
l
packages
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
rerere:
ma
k
e sorting re
a
lly stable
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
i
o
C Hamano
F
i
x sw
i
tching t
o
a
b
r
a
nch
with D/F when
c
urrent bran
c
h
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
unio
C Ham
a
no
F
i
x twoway_merge that passed
d
/f conflict
m
arker t
o
.
.
.
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ha
m
ano
Fi
x
read-tree --prefix
=
dir
/
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ha
m
ano
unpack-t
r
ees: ge
t
r
id of *ind
p
os parameter
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ha
m
ano
unpac
k
_
t
rees
.
c:
pas
s
unpack_t
r
ees_o
p
ti
o
ns structure
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio C Hamano
add_cache_e
n
try(): remo
v
al of file foo
does not conflict
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
Haman
o
M
e
rge branch 'jc/bisec
t
'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Merg
e
branch 'fl/do
c
'
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C Hamano
Merge branch 'post1
.
5
.
1/b
l
a
m
e
.
el'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
M
e
r
g
e br
a
nch 'po
s
t
1
.
5
.
1/tcltk'
commit
|
commitdiff
|
tree
2007-04-04
Junio C H
a
mano
Merge branch
'post1
.
5
.
1/p4'
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio C
H
a
m
an
o
M
erge branch 'lt/dirw
a
l
k'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
git-read-tree --index-output=<fil
e
>
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C H
a
mano
_GIT
_
INDEX_OUTPUT: allow plumbing to ou
t
put t
o
an alterna
t
iv
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
Hamano
checkout: allow
detac
h
i
ng to HE
A
D ev
e
n when switchi
n
g
.
.
.
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
Jun
i
o
C Hamano
Merge 1
.
5
.
0
.
7 in
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Haman
o
GIT
1
.
5
.
0
.
7
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
r
erere should
not repeat the e
a
rlie
r
hunks
i
n later
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-02
J
u
nio C
Hamano
Hopefully final
update to the draf
t
Releas
e
Notes,
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-01
Junio
C Hamano
O
p
tional T
c
k/T
k
: ignore ge
n
e
r
ated
files
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
J
u
ni
o
C Ha
m
ano
Do
not bo
t
her docume
n
ting
fetch--too
l
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Junio C Hamano
Up
d
at
e
d
raft release notes
f
or
1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Junio C H
a
mano
M
erge b
r
anch 'm
a
int'
commit
|
commitdiff
|
tree
2007-03-30
Junio C Ham
a
no
Merge bra
n
ch 'm
a
ster' of git:/
/
repo
.
or
.
cz/git/
m
er
g
eto
o
l
.
git
commit
|
commitdiff
|
tree
2007-03-28
Junio C
H
a
m
ano
Documentation: unbreak user-man
u
al
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Junio C Ha
m
ano
GIT 1
.
5
.
1-rc3
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
Upd
a
te main git
.
html
page to p
o
i
n
t
a
t 1
.
5
.
0
.
6 documen
t
a
tion
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Juni
o
C
Ham
a
no
Merge
br
a
n
ch
'm
a
int' to
s
ynchronize with 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
J
u
nio
C
Hamano
GIT 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
J
uni
o
C Haman
o
Fix "--pretty=format:" for parent re
l
ated items
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next