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
Mer
g
e branc
h
'fl
/
cvsse
r
ver'
commit
|
commitdiff
|
tree
2007-04-18
J
u
n
i
o C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Ha
m
ano
Update draft r
e
le
a
se no
t
es for 1
.
5
.
2 with
accumula
t
ed
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Me
r
ge branch
'
m
a
int'
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C Hamano
S
tart
p
r
epari
n
g for 1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
M
erge branch
'master' of gi
t
://repo
.
o
r
.
cz/
g
it
-
gui
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C
H
am
a
no
M
e
rge branch
'
m
aint'
o
f
g
it://repo
.
or
.
cz/git-g
u
i into
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
Ju
n
io C Haman
o
Merge bra
n
ch '
j
c
/
read-tr
e
e
-d
f
'
commit
|
commitdiff
|
tree
2007-04-17
Junio
C Hamano
git-
g
ui: Honor TCLTK_PATH
i
f
s
u
p
plied
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-16
Junio
C Hamano
Mer
g
e branch '
j
s
/w
r
ap-log'
commit
|
commitdiff
|
tree
2007-04-16
Jun
i
o
C
Hamano
send-email: d
o
not leave a
n
empt
y
CC:
l
ine if n
o
cc
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-16
Junio C
Hamano
Merge
b
ranch 'maint
'
commit
|
commitdiff
|
tree
2007-04-16
Jun
i
o C Hamano
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2007-04-15
Junio C
H
amano
M
e
rge git://git2
.
k
e
r
nel
.
org/pub/sc
m
/
g
i
tk/gitk into
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio
C
Hamano
M
erge
b
ranch
'
m
aint'
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Do not def
a
u
l
t
to
-
-no-index when give
n
two directories
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-13
J
unio C Hamano
Merge bra
n
ch
'
j
c/cherry'
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hamano
Me
r
ge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2007-04-13
J
u
nio
C
Hamano
F
i
x git {log
,
s
h
ow,
.
.
.
} --pretty=email
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio
C
Hamano
Doc
u
mentat
i
o
n
: --
c
herry-
p
ick
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio
C
H
amano
git-log
--cherry-pick A
.
.
.
B
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
J
u
n
io C Hamano
Refactor patch-id fi
l
tering out of
g
it-che
r
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 '--pretty=format:
'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Me
r
ge bra
n
ch '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 Haman
o
fsck: d
o
not
c
o
mplain on
de
t
ached HEAD
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
J
u
nio
C Hamano
Merge br
a
n
ch
'
maint'
commit
|
commitdiff
|
tree
2007-04-10
J
unio C H
a
mano
t3
0
30: mer
g
e-r
e
c
ursive backend test
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C H
a
m
ano
m
e
rge-recur
s
ive: handle
D
/F c
o
nflic
t
case more c
a
refully
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Ju
n
io C Hamano
merge-
r
e
cursi
v
e: do not
b
a
rf
on "to be removed"
e
ntries
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Ha
m
ano
Tre
a
t D/F c
o
nflic
t
e
ntry mor
e
carefully
in unpack-trees
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
J
u
nio C Hamano
t10
0
0: fix case table
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Ha
m
ano
s
h
ortlog -
w
:
m
ake wra
p
-lin
e
behaviour optional
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Junio C Ham
a
no
M
e
rge bran
c
h 'jc
/
p
ush'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Ha
m
ano
Merge branch '
j
c/merge-subtre
e
'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Junio C
H
ama
n
o
Merge branch
'js/f
e
tch
-
progress
'
commit
|
commitdiff
|
tree
2007-04-09
Ju
n
io C H
a
mano
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2007-04-09
J
u
nio C
Hamano
Add
D
ocumentation/cmd
-
list
.
made to
.
gitignore
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
Start 1
.
5
.
2 cycle by prepa
r
e
i
ng RelN
o
tes for it
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
Merge branc
h
'jc/read-tre
e
-df' (e
a
rly part)
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
Merge br
a
nch 'ma
i
n
t'
commit
|
commitdiff
|
tree
2007-04-08
Jun
i
o C Hamano
Prepare 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 stra
g
ety 's
u
btree
'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
J
unio C Ham
a
no
git-push to mult
i
p
le loc
a
tions doe
s
n
o
t st
o
p at the
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C
H
amano
g
i
t-
p
ush rep
o
r
ts t
h
e U
R
L
after
f
a
iling
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
J
u
nio C Hama
n
o
Merge
b
ranch 'jc/index-output'
commit
|
commitdiff
|
tree
2007-04-07
Junio
C Hamano
M
e
rge branch '
f
p/mak
e
-j'
commit
|
commitdiff
|
tree
2007-04-07
J
u
n
io C
Hamano
Mer
g
e branch 'cc/bisect'
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
i
o
C Hamano
Me
r
ge branch 'jc/
c
h
e
c
k
o
ut'
(
e
arly part)
commit
|
commitdiff
|
tree
2007-04-07
Junio
C
H
a
m
ano
M
e
r
ge
branch '
m
a
i
nt'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hama
n
o
Doc
u
mentatio
n
: tighten
d
e
p
e
ndency for
g
i
t
.
{html,t
x
t}
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio
C
Hamano
git-bisect: allow bi
s
ecting wit
h
o
n
ly o
n
e ba
d
commit
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Jun
i
o C Hama
n
o
t6030:
a
dd a bit more t
e
s
ts to
git-
b
isect
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Junio C Hamano
g
i
t-bis
e
ct: modernization
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
J
unio C
H
amano
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2007-04-05
Junio C
Hamano
Rename add_file_to_index() to add_file_to
_
cac
h
e
(
)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio
C
Haman
o
Rename st
a
tic va
r
iable write_inde
x
to update
_
inde
x
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
J
unio
C
Ham
a
no
Rename in
t
ern
a
l function "add
_
file_t
o
_ca
c
he
"
in
b
u
i
ltin
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C H
a
mano
P
r
opagat
e
cache
error inte
r
nal to refr
e
sh_cache()
via
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Jun
i
o
C Hamano
Fix bogus e
r
ror message from merge-recurs
i
v
e
err
o
r
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C
H
a
m
ano
F
ix dependency of
c
ommon-cmds
.
h
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
H
amano
RPM spec: incl
u
de git-p4 in the l
i
st of
a
ll
pack
a
ges
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
J
unio
C
Hamano
rerere: make so
r
t
i
n
g
really stable
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C
Hamano
Fix swi
t
c
h
i
ng
to a branch with
D/F wh
e
n current branch
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Haman
o
Fix twow
a
y_merge tha
t
pa
s
s
e
d d/f conflict marker
t
o
.
.
.
commit
|
commitdiff
|
tree
2007-04-04
J
unio C Hamano
F
ix
r
ead
-
tree --prefix=dir/
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
unpack-trees:
g
et ri
d
of *indpos parameter
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
unp
a
ck_
t
rees
.
c: pass
u
n
pack
_
tree
s
_opti
o
n
s str
u
cture
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C Hamano
add_cache_e
n
try
(
): removal of file foo
does not conflict
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C H
a
mano
Mer
g
e branch 'jc/
b
isect'
commit
|
commitdiff
|
tree
2007-04-04
J
uni
o
C Hamano
Merge
b
r
a
n
ch 'fl/do
c
'
commit
|
commitdiff
|
tree
2007-04-04
Junio
C Hamano
Merge br
a
nch 'post1
.
5
.
1/b
l
a
m
e
.
el'
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio
C
Hamano
Merg
e
branch '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
Ju
n
io C Ham
a
no
Merge branch
'
lt/di
r
walk
'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
git-re
a
d
-tree
-
-
i
ndex-
o
utput=<file>
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io
C
Hamano
_G
I
T_I
N
DEX
_
OUTPUT: allow
plumbing to ou
t
p
ut to
a
n alternat
i
v
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io
C Hamano
checkout: allow det
a
ching to HEAD even when switching
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C Ha
m
a
no
GIT
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
Ju
n
io
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
rerere should not repeat the earlier hunks in later
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-02
Junio C Haman
o
Hopefully f
i
nal u
p
date
t
o
the draft R
e
lea
s
e Notes,
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-01
Junio C Hamano
Optional
T
c
k/Tk: ign
o
r
e
g
en
e
rated files
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
Junio C Ha
m
ano
Do
not bother doc
u
menting fetch--too
l
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
Junio
C
Ham
a
n
o
Update draft release notes f
o
r 1
.
5
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
Junio
C
Hamano
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-03-30
Junio C Haman
o
Me
r
g
e
b
r
anch '
m
as
t
er' of git://repo
.
or
.
cz/git/
m
ergetool
.
git
commit
|
commitdiff
|
tree
2007-03-28
Ju
n
io C Hamano
Documentat
i
on: unbreak
u
ser-man
u
al
.
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
Juni
o
C Ha
m
a
no
Update main gi
t
.
html page t
o
point at 1
.
5
.
0
.
6 d
o
cumentation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
Merge branch 'main
t
' to
s
y
n
chro
n
ize
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
H
amano
F
ix "--
p
r
e
tty
=
format:" for parent related items
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Junio C
Hamano
git-commit:
"
read-tree -m
HEAD" is not the r
i
ght way
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
Junio C Ha
m
ano
sha1_fil
e
.
c (write_
s
ha1_file): Det
e
c
t
close failure
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
J
u
nio C
Hamano
Document
g
i
t
-log --first-parent
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-26
J
u
n
io
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
Merge b
r
anch 'jc/fpl
'
commit
|
commitdiff
|
tree
2007-03-26
J
unio
C
Hamano
U
p
date README to
point at
a few ke
y
periodical
m
e
s
sag
e
s
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next