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
Merge branch 'fl/cvsserver'
2007-04-18
Ju
n
io C Hamano
M
e
rge bra
n
ch 'fl/cvsserver'
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o C
H
amano
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
io C Haman
o
Update dra
f
t
release notes for 1
.
5
.
2 with a
c
cumulated
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o C H
a
mano
Merge b
r
anch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
H
amano
Start
p
reparing f
o
r 1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Merge branch 'ma
s
ter' of git://repo
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Merge branch 'maint' of git:/
/
r
epo
.
or
.
cz/
g
it-gui into
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
M
erge br
a
nch '
j
c/rea
d
-tree-
d
f'
commit
|
commitdiff
|
tree
2007-04-17
Jun
i
o C Hama
n
o
git-gui: Honor
T
CLTK_PA
T
H if suppli
e
d
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
Junio C Ham
a
no
Merge
b
ra
n
ch 'js/wrap-log'
commit
|
commitdiff
|
tree
2007-04-16
Jun
i
o C Ha
m
a
no
send-email: d
o
no
t
leave
an empty
CC: line if
n
o
cc
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
Junio
C
Haman
o
Merge
bran
c
h 'maint'
commit
|
commitdiff
|
tree
2007-04-16
Jun
i
o C Hamano
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2007-04-15
Junio C
H
amano
Merge g
i
t://
g
it2
.
kerne
l
.
org/pu
b
/scm/gitk/gitk in
t
o
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio C
Hamano
Me
r
ge b
r
anch 'main
t
'
commit
|
commitdiff
|
tree
2007-04-14
Junio C Haman
o
Do not def
a
u
l
t to --
n
o-
i
ndex w
h
en give
n
t
w
o d
i
rectories
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
Junio C
H
amano
Merge branc
h
'jc/cherry'
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hama
n
o
Merge b
r
anch
'
main
t
'
commit
|
commitdiff
|
tree
2007-04-13
Junio
C
H
a
m
a
no
F
i
x git {l
o
g,show,
.
.
.
} --pretty=email
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C
H
amano
D
o
cumentation
:
--cherry-pi
c
k
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio
C
H
amano
git-log --
c
herry-pick
A
.
.
.
B
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio
C
Haman
o
Refactor
patch-id
filt
e
ri
n
g out of git-cherry and git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio
C Hamano
Add %m to '-
-
pretty=f
o
r
mat
:
'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C
H
a
mano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-12
J
un
i
o C Hamano
GI
T
1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-11
Junio
C Hamano
fsck:
d
o not co
m
plain on detac
h
ed H
E
AD
.
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-10
Junio C Hamano
t
3
0
3
0: m
e
rge-
r
ecursive
backend test
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Juni
o
C
Hama
n
o
m
e
rg
e
-rec
u
rsiv
e
: handle
D/
F
conflict case m
o
re carefully
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Ju
n
io C H
a
mano
me
r
ge-re
c
ursi
v
e: do not barf on "to be removed" entries
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
J
un
i
o C Hama
n
o
Trea
t
D/F conflict entry
more ca
r
efull
y
in u
n
p
a
ck-tree
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C
H
a
mano
t1
0
0
0
:
fix case
t
able
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
J
unio C Hamano
short
l
og -w:
make wrap-line behav
i
o
u
r optional
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
J
u
nio C H
a
mano
Mer
g
e branch 'jc/pu
s
h'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Merge branch 'j
c
/mer
g
e-subtree'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Junio C
H
amano
M
erge
branch
'js/f
e
tch-pro
g
ress'
commit
|
commitdiff
|
tree
2007-04-09
Junio C H
a
man
o
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2007-04-09
Junio C
H
a
m
ano
A
dd Documenta
t
ion/cmd-list
.
mad
e
t
o
.
gitig
n
ore
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Juni
o
C
H
amano
Start 1
.
5
.
2 cycle by prepareing Rel
N
otes for it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Junio C H
a
man
o
M
e
rge b
r
an
c
h 'jc/read-tree-df'
(
earl
y
part)
commit
|
commitdiff
|
tree
2007-04-08
J
unio C Hamano
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-08
J
unio C Hamano
Pr
e
pare for
1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Ham
a
no
A new merg
e
stra
g
ety 's
u
btr
e
e
'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
git-pus
h
to mu
l
tiple locations d
o
es not
s
top at the
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
git-pu
s
h
r
eports the URL a
f
ter failing
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio
C Ha
m
ano
Merge branch 'jc/index-
o
utput
'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Ha
m
a
no
Merge branc
h
'fp/mak
e
-j'
commit
|
commitdiff
|
tree
2007-04-07
J
unio C Hamano
Merge branch 'cc/bise
c
t'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Haman
o
M
erge bran
c
h
'
j
c/checkout'
(early part)
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Documentation
:
tighten dependency
f
or g
i
t
.
{ht
m
l,txt}
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Ha
m
a
no
g
i
t-bisect: allow bis
e
ct
i
ng with only one bad commit
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
t
6
030: add a b
i
t more tests to git-bisec
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Jun
i
o C H
a
mano
git-bisect: modern
i
zation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
M
erg
e
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-05
J
unio C Hamano
Rename add
_
file_to_index() to add_file_
t
o
_
c
ac
h
e()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Jun
i
o C Hamano
R
e
name static variable write_inde
x
to u
p
date_index
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
J
unio C
Ha
m
a
no
R
e
name
inter
n
al
function
"add_file_to_cac
h
e
"
i
n
builtin
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C
H
amano
Propagate cache er
r
or inte
r
nal
to re
f
resh_cache() via
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Fix bog
u
s err
o
r me
s
sage fro
m
merge-recu
r
sive err
o
r
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Ha
m
ano
Fix d
e
pendency
o
f commo
n
-cmds
.
h
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C Hamano
RP
M
sp
e
c: in
c
lude git-p4 in
t
h
e lis
t
o
f
all packages
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
Ham
a
no
rerer
e
: make sorting re
a
lly stab
l
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o
C
H
a
mano
Fix swi
t
chi
n
g to a
b
ranch
with
D/F w
h
en current branc
h
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io C Hamano
Fix twoway_merge
t
hat passed d/f
c
o
n
flict ma
r
k
er to
.
.
.
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio
C Hamano
F
ix
read-tree --prefix=
d
ir
/
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C Hamano
unpa
c
k-tre
e
s: get rid
o
f *indpos parameter
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Haman
o
unpack_trees
.
c: pass unpack
_
trees_op
t
i
ons struct
u
r
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio
C
Hamano
add_cache_entry()
:
removal of fi
l
e foo does not conflict
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
H
a
mano
Merge branc
h
'
j
c
/bisect'
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
i
o
C Hamano
Merge
b
ra
n
ch 'fl/do
c
'
commit
|
commitdiff
|
tree
2007-04-04
Junio C
H
am
a
no
M
e
r
ge branch 'post1
.
5
.
1/blame
.
el'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
M
e
r
ge b
r
anch 'post
1
.
5
.
1/tc
l
tk'
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C Hamano
Merg
e
branch '
p
os
t
1
.
5
.
1/p4'
commit
|
commitdiff
|
tree
2007-04-04
J
unio C Ha
m
ano
Mer
g
e branch 'lt/dirw
a
lk
'
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
H
a
mano
g
it-r
e
ad
-
tree --i
n
dex
-
output=<file>
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ha
m
ano
_GIT_
I
NDEX_OUTP
U
T
: a
l
low plum
b
ing to output to a
n
alter
n
ati
v
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C Hamano
ch
e
c
k
out:
a
llow detachi
n
g to HEAD
even when 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
Junio C
Hamano
Merge 1
.
5
.
0
.
7 i
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C Hamano
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 sho
u
ld no
t
repeat
t
he earlier hunks in later
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-02
Junio C Hamano
Hopefully final u
p
date
t
o the draft Release Notes,
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-01
Junio C Hamano
Optional Tck
/
Tk:
ignore ge
n
erated f
i
le
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Junio C
H
amano
Do not
both
e
r documenting fetch--tool
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
J
u
nio C Hamano
Up
d
at
e
draft r
e
lease notes for 1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Junio C H
a
mano
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2007-03-30
Junio C Hamano
Merge br
a
nch
'master' of git:
/
/repo
.
or
.
cz/g
i
t/mer
g
etool
.
git
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
Documentatio
n
:
un
b
r
e
ak user-manual
.
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
Junio C H
a
mano
Update
m
ain
gi
t
.
html pag
e
to point at 1
.
5
.
0
.
6
d
o
cumen
t
ation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
J
u
ni
o
C Haman
o
Merge
b
ranch '
m
a
int'
t
o
s
ynch
r
onize wit
h
1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Ju
n
io C Ham
a
no
GI
T
1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
Fix "--pret
t
y=format:" f
o
r parent related it
e
ms
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
git-commit: "rea
d
-tree
-m HEAD" is no
t
the right way
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
Juni
o
C
H
a
ma
n
o
sha1_file
.
c (write_sha1
_
f
ile): Detec
t
clos
e
fai
l
u
r
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
J
un
i
o C Haman
o
Document git-lo
g
--f
i
rst-pare
n
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-26
Junio
C Hamano
GIT 1
.
5
.
1-rc2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-26
Jun
i
o C Haman
o
Merge branch
'jc
/
fpl'
commit
|
commitdiff
|
tree
2007-03-26
Junio C Hamano
Up
d
ate READM
E
to point a
t
a few ke
y
periodical messages
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next