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
Junio
C
H
a
m
ano
Merge branch 'fl/cvsser
v
er
'
commit
|
commitdiff
|
tree
2007-04-18
Junio
C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
Junio C
H
a
mano
U
pdate d
r
aft
r
elease notes for
1
.
5
.
2 with accumul
a
te
d
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
Hamano
Me
r
g
e
branc
h
'maint'
commit
|
commitdiff
|
tree
2007-04-18
Junio C
Hama
n
o
Start
preparin
g
for 1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hama
n
o
Merge branc
h
'mast
e
r' of git://r
e
po
.
or
.
cz/
g
i
t
-gu
i
commit
|
commitdiff
|
tree
2007-04-18
Junio C Haman
o
Merge
b
ranch '
m
aint' of git:/
/
repo
.
or
.
cz/git-gui i
n
to
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
Junio C
Ham
a
no
M
e
rge br
a
nch 'jc/r
e
a
d-t
r
ee-df'
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
git-gui: Honor
TCL
T
K
_PATH if supplied
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
Juni
o
C Ha
m
a
no
Mer
g
e
bran
c
h 'js
/
wrap-log'
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hamano
send-em
a
il:
d
o n
o
t leave an empty CC: line if no
c
c
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
Junio C
H
amano
M
e
rge
b
ranch
'maint'
commit
|
commitdiff
|
tree
2007-04-16
Jun
i
o C Ham
a
n
o
Merg
e
b
r
a
n
ch 'main
t
'
commit
|
commitdiff
|
tree
2007-04-15
Junio C
Hamano
Merge git://git2
.
kernel
.
org
/
pu
b
/scm/
g
itk/gitk
i
nto
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Merge br
a
nch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-14
J
u
nio C
Hamano
D
o not d
e
fault t
o
-
-no-index
w
h
e
n given two directories
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
Jun
i
o C H
a
m
a
n
o
M
e
r
g
e
bra
n
ch
'
jc/
c
herry'
commit
|
commitdiff
|
tree
2007-04-13
J
u
nio C Hamano
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-13
J
u
nio C Ham
a
n
o
F
ix g
i
t {l
o
g,s
h
o
w
,
.
.
.
} -
-
pretty
=
email
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Docu
m
entation: --cherry-pick
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C H
a
mano
git
-
l
o
g --cherry-pick
A
.
.
.
B
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Ju
n
io C Ham
a
no
Refactor pat
c
h-
i
d fil
t
ering out of git-cherry
and gi
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Jun
i
o
C
Hamano
Add %m to '--pre
t
ty=f
o
rmat:'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C H
a
mano
Me
r
g
e
b
ranch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-12
Junio
C
Ha
m
a
no
GIT 1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-11
Junio C Hamano
fs
c
k
:
do not complain on det
a
c
h
ed HEAD
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Haman
o
Merge branch
'
ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
t30
3
0
: merg
e
-recur
s
ive backend test
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
J
u
nio C
Hamano
merge
-
rec
u
r
s
i
ve: handle
D/F conflict case more carefully
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C
H
a
m
ano
merge-recursive: do
not barf on "t
o
be rem
o
ved
"
entries
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
Tre
a
t
D
/F c
o
n
flict
en
t
ry more carefully in unpack-tree
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
t1000: f
i
x case table
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
shortlog -w: make wrap-line b
e
haviour
o
ptional
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Junio C
H
amano
Merg
e
branch 'jc/p
u
sh'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Haman
o
Merge b
r
a
n
c
h
'jc/merge-subtr
e
e'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Junio C Haman
o
Merge
bran
c
h
'js/fet
c
h-pr
o
gress'
commit
|
commitdiff
|
tree
2007-04-09
Juni
o
C
Ha
m
a
no
M
e
r
ge br
a
nch
'
m
aint'
commit
|
commitdiff
|
tree
2007-04-09
Junio C
H
ama
n
o
A
dd Documentation/cm
d
-
list
.
made to
.
g
i
tignore
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
J
unio C Hama
n
o
Start 1
.
5
.
2
c
ycle by prepar
e
ing R
e
lNotes fo
r
it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
J
un
i
o C Hamano
Merge bran
c
h 'jc/read-t
r
ee-df' (early p
a
rt)
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
Prepare
f
o
r
1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C H
a
mano
A new merge stra
g
ety 'subtree'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio
C
Ha
m
ano
git-pu
s
h to multiple
loca
t
ions
does not stop at the
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C H
a
mano
git-p
u
sh reports the UR
L
after failing
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio
C
H
a
mano
Merge b
r
anch 'jc/inde
x
-output'
commit
|
commitdiff
|
tree
2007-04-07
J
u
nio
C
H
a
mano
M
e
rge branch 'fp/make-j'
commit
|
commitdiff
|
tree
2007-04-07
Junio C
H
amano
Merge b
r
anch 'c
c
/bisect'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hama
n
o
M
e
rge
b
ranch 'jc/checkout' (
e
arly part)
commit
|
commitdiff
|
tree
2007-04-07
Juni
o
C Ham
a
no
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2007-04-07
Jun
i
o
C
Ha
m
ano
Document
a
tion:
t
ighten depe
n
dency for git
.
{htm
l
,tx
t
}
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C H
a
m
a
no
git-bisec
t
:
a
llow
b
i
secting with
o
nly one bad
c
omm
i
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io C Hamano
t
6030: add a bit
m
o
re tests to git-bis
e
ct
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Junio C Hamano
git
-
b
i
sect: moderniz
a
tion
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio
C
H
a
m
ano
Merge branch 'm
a
in
t
'
commit
|
commitdiff
|
tree
2007-04-05
Ju
n
io
C
Haman
o
Rename add_file_to_ind
e
x() to add
_
f
ile_to_cache
(
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Ha
m
a
no
Rename sta
t
i
c
variable write_inde
x
t
o update_index
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Ha
m
a
no
R
e
n
ame internal
f
unctio
n
"
a
dd
_
file_to_cache"
i
n builtin
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
J
unio C
H
amano
Pro
p
a
gate cach
e
er
r
o
r
internal
to refresh_cach
e
() via
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Fi
x
bogus error message from merg
e
-rec
u
rsive error
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Fix
d
ependency
o
f
c
ommon-cmds
.
h
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hama
n
o
RPM
s
pec: inclu
d
e git-p4 in
t
he list of all packages
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io C
Hamano
r
e
rere: make sorting really s
t
able
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C H
a
mano
F
ix
s
w
i
tchi
n
g
to a br
a
n
c
h
with
D
/F when c
u
r
r
e
nt branch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Fix
t
woway_merge th
a
t
p
assed d/f conflict
marker to
.
.
.
commit
|
commitdiff
|
tree
2007-04-04
J
u
n
i
o C Hamano
Fix read-
t
re
e
-
-
prefix=dir/
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C
H
ama
n
o
unpac
k
-trees: get rid of
*
indpos
parameter
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C Hamano
un
p
ack_t
r
ees
.
c
: pass un
p
a
c
k_trees_options str
u
ctu
r
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
Hamano
add_
c
a
che_entry()
:
remova
l
of f
i
le foo
d
oes not confli
c
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio C H
a
mano
Mer
g
e bran
c
h 'jc/b
i
sect'
commit
|
commitdiff
|
tree
2007-04-04
J
un
i
o C Hamano
Merge
branch 'fl/doc'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ham
a
no
Mer
g
e
branch
'
p
ost1
.
5
.
1/blame
.
el'
commit
|
commitdiff
|
tree
2007-04-04
Junio C
Hama
n
o
Merge branch 'post1
.
5
.
1/
t
c
ltk'
commit
|
commitdiff
|
tree
2007-04-04
Junio C
H
a
mano
M
e
rge branc
h
'post1
.
5
.
1
/
p4'
commit
|
commitdiff
|
tree
2007-04-04
J
uni
o
C Hamano
Merge bra
n
c
h 'lt/dirwal
k
'
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io
C
Hamano
gi
t
-read-tree
-
-in
d
ex-output=<fil
e
>
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
_GIT_INDEX_OUTPUT: allow plumbi
n
g
to outpu
t
to an
alte
r
nativ
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C H
a
mano
chec
k
out: allow detaching t
o
HEAD e
v
en when switching
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o
C Haman
o
GIT
1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio C Ha
m
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
H
amano
GIT 1
.
5
.
0
.
7
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C Hamano
r
erere
sho
u
ld
n
ot repeat t
h
e earli
e
r hunks
i
n la
t
e
r
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-02
Junio C Ha
m
an
o
H
o
pefully fi
n
al update to the draft Release Notes
,
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-01
Ju
n
io C Ha
m
ano
Optional T
c
k/Tk: ignore
gener
a
ted f
i
les
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Junio
C
Haman
o
Do not bother do
c
umenting fetch--
t
ool
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Junio C Ha
m
ano
Update draft release notes for 1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Junio C
Hamano
M
e
rg
e
branch 'maint'
commit
|
commitdiff
|
tree
2007-03-30
Junio C Ha
m
ano
Merge branc
h
'master' of g
i
t://repo
.
or
.
cz/git/merge
t
ool
.
git
commit
|
commitdiff
|
tree
2007-03-28
Junio C H
a
man
o
Documentation: unbreak user-manual
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Jun
i
o
C
Hamano
GIT
1
.
5
.
1-
r
c3
commit
|
commitdiff
|
tree
2007-03-28
Junio C
Hamano
Up
d
a
te
main
git
.
html page to point at 1
.
5
.
0
.
6 documentation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Junio C Ham
a
no
Merge branc
h
'mai
n
t' to
s
y
nc
h
ronize
w
it
h
1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Junio
C
Hamano
GIT 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Juni
o
C Hamano
Fix "--pretty=form
a
t:" for
parent r
e
lated items
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Ju
n
i
o
C Hamano
git-c
o
mmit: "
r
e
a
d-tree -m HEAD"
i
s not the r
i
ght way
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
Junio C Hamano
sha1_file
.
c (wr
i
te_sh
a
1_f
i
le): Det
e
c
t
clos
e
failure
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
Ju
n
io C Hamano
Docume
n
t
git-lo
g
--first-par
e
nt
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-26
J
unio C Hamano
GIT 1
.
5
.
1-rc2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-26
J
unio
C Hamano
Mer
g
e
b
ranch
'jc/
f
p
l
'
commit
|
commitdiff
|
tree
2007-03-26
Junio C Hamano
U
p
date RE
A
D
M
E to point a
t
a few key periodica
l
me
s
sage
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next