repo.or.cz
/
git
/
vmiklos.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-18
Junio C Hamano
Merge b
r
an
c
h 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o
C
H
am
a
n
o
S
t
a
rt preparing for
1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o C Hamano
Me
r
ge br
a
nch 'master' of git://repo
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
Hamano
Merge
b
ranch 'maint' of git://repo
.
or
.
cz/git-gui int
o
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
J
unio C Hamano
M
erge branch
'
jc/read-tree-df'
commit
|
commitdiff
|
tree
2007-04-17
J
unio
C
Haman
o
git-gui: Honor TCLTK
_
PATH
if supplied
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-16
Junio C Haman
o
Merge branch 'js/wra
p
-
log'
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hamano
send-email: d
o
not leave an em
p
ty CC:
line
i
f no cc
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-16
Jun
i
o
C Hamano
Merge branch
'
m
aint'
commit
|
commitdiff
|
tree
2007-04-16
Junio C
Hamano
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-15
Jun
i
o
C
Hamano
Merge git://git2
.
kernel
.
o
r
g/pub/scm/
g
itk/gi
t
k i
n
to
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Jun
i
o C Ha
m
ano
Merge branch 'ma
i
n
t'
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Do not default t
o
--n
o
-inde
x
when given two direct
o
r
i
es
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-13
J
unio C Hamano
Merg
e
bra
n
ch 'jc/c
h
erry'
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hamano
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-13
J
u
nio C Hamano
Fix git {lo
g
,show,
.
.
.
} --pretty=e
m
a
i
l
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Ju
n
io
C
Hamano
Doc
u
mentation: --cherr
y
-pick
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C H
a
mano
g
it
-
l
o
g
--cherry-
p
ick A
.
.
.
B
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C
Ha
m
ano
Refactor
p
atch-id
f
ilter
i
ng ou
t
of git-cher
r
y and git
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C
H
amano
Add %m to '--pre
t
ty=format:'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C
H
amano
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2007-04-12
J
u
ni
o
C Hamano
GIT
1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-11
Junio C
H
aman
o
fsck: do not comp
l
a
in on
d
e
ta
c
he
d
HEAD
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
Merge bran
c
h 'm
a
in
t
'
commit
|
commitdiff
|
tree
2007-04-10
Junio
C Hama
n
o
t303
0
:
merge-recursive backend test
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio
C
Ham
a
n
o
merge-recurs
i
ve: handl
e
D/F conflict cas
e
more carefull
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Ju
n
io C Hamano
merge
-
re
c
ursive: d
o
n
o
t barf on "to be removed" entries
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
Treat D/F
c
onflict ent
r
y
m
ore carefully in unpack-trees
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Ham
a
no
t1000: fix ca
s
e table
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
J
unio C Ha
m
ano
shortlog -
w
: make wrap-line behaviour optio
n
al
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Merge branch 'jc/push'
commit
|
commitdiff
|
tree
2007-04-09
J
u
nio C Hamano
Merge
bran
c
h 'j
c
/merge-subtree'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Ju
n
io C
H
ama
n
o
Merg
e
bran
c
h
'js/fetch
-
progr
e
ss'
commit
|
commitdiff
|
tree
2007-04-09
Junio C
Hamano
Me
r
ge branc
h
'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-09
Jun
i
o C Hamano
Add Documentation/cmd-list
.
m
a
de to
.
g
i
t
i
gnore
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Junio
C
Hamano
Start 1
.
5
.
2 cycle by prepareing RelNotes
f
o
r it
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Ju
n
io C Ham
a
no
Merge branch 'jc
/
read-tree-df' (early part)
commit
|
commitdiff
|
tree
2007-04-08
J
un
i
o C Ha
m
ano
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hama
n
o
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 st
r
agety 's
u
btree'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C H
a
man
o
g
i
t-push t
o
m
u
ltiple loc
a
t
i
o
n
s does
n
ot st
o
p at the
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io C Hamano
git-push reports the U
R
L after fai
l
ing
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Ham
a
n
o
Mer
g
e b
r
anch 'jc/index
-
output'
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io C Hamano
M
e
rge
b
r
a
n
ch 'fp/make-j'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hama
n
o
M
erge b
r
anch
'cc/bis
e
ct'
commit
|
commitdiff
|
tree
2007-04-07
Junio
C
Hamano
Merge bran
c
h 'jc/checkout' (ear
l
y
p
art)
commit
|
commitdiff
|
tree
2007-04-07
J
u
nio C Hamano
Mer
g
e bra
n
ch
'm
a
int'
commit
|
commitdiff
|
tree
2007-04-07
Junio C
H
aman
o
Docume
n
tation:
t
igh
t
en dependency
for git
.
{
html
,
txt}
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Jun
i
o C
Hamano
git-
b
isec
t
:
allow bisec
t
ing with only one
b
a
d
c
omm
i
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C H
a
mano
t6
0
30: add
a
bit more tests to git-bisect
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Ju
n
i
o
C Hamano
git-bisec
t
: moder
n
ization
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Ha
m
ano
M
e
rg
e
branch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-05
Juni
o
C
Hamano
Rename a
d
d_file_to_index
(
) to add_file_
t
o_cach
e
()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Ju
n
io
C Haman
o
Rename stati
c
v
a
r
iab
l
e write_index to update_ind
e
x
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Ju
n
io C Ham
a
no
Rename inter
n
al function
"add_fil
e
_to_cache" in builtin
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hama
n
o
Propagate cache error
i
nte
r
nal
t
o refresh_
c
a
che() via
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C H
a
m
a
no
Fix bogus error mess
a
g
e
from merge-recursive error
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio
C
H
a
ma
n
o
Fix dependency o
f
common-c
m
ds
.
h
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio C Hamano
RPM
spec:
include
git-p4 in the l
i
st of al
l
packages
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ham
a
no
rer
e
re: make sorting
really s
t
able
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o
C
H
a
mano
Fix s
w
itching to
a
b
ra
n
ch with D/F whe
n
current b
r
anch
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Fix twowa
y
_merg
e
that passed d/f conflict marke
r
to
.
.
.
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hama
n
o
Fix
read-tre
e
--pre
f
ix=dir/
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
H
a
m
ano
unpack-trees
:
get rid of *indpos para
m
et
e
r
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
Hama
n
o
u
n
pack_trees
.
c:
p
ass un
p
ack_trees_options structure
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
J
unio C Hamano
add_cache
_
e
n
try()
:
removal of file foo does not
confli
c
t
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
H
a
m
a
no
Merge branch
'
jc/bisect'
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C Ha
m
an
o
Merge br
a
nch
'
fl/do
c
'
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C
H
a
mano
Merge bran
c
h 'p
o
st1
.
5
.
1/b
l
ame
.
el'
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io
C H
a
m
a
no
Merge branch 'post1
.
5
.
1/tcltk'
commit
|
commitdiff
|
tree
2007-04-04
J
unio
C Hamano
Merge branch 'post1
.
5
.
1/p4'
commit
|
commitdiff
|
tree
2007-04-04
J
u
ni
o
C Hamano
Mer
g
e b
r
anch 'lt/dirwalk'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
git-r
e
ad-tree
-
-
i
ndex-output=<file>
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
Hamano
_GI
T
_IND
E
X_OUTPUT: allow p
l
umbing to output to an a
l
terna
t
iv
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
checkout: allow
d
e
taching to HEAD eve
n
when switc
h
ing
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
H
amano
GIT 1
.
5
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ha
m
ano
Merge 1
.
5
.
0
.
7 in
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ham
a
no
GIT
1
.
5
.
0
.
7
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io C Hama
n
o
rerere s
h
ou
l
d not repeat the earlier
hunks
i
n later
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-02
Junio C
H
amano
Ho
p
efully final u
p
da
t
e to the d
r
aft Release Notes,
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-01
Junio C Ham
a
no
Optional Tck/Tk: i
g
nore generated files
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
Ju
n
io C Hamano
Do not bothe
r
documenti
n
g fetch--too
l
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
Junio C
Ham
a
no
Update
draft releas
e
notes for 1
.
5
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
Junio C
H
amano
M
e
rge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-03-30
Ju
n
io
C Hamano
Merge branc
h
'master' of git:/
/
repo
.
or
.
cz/git/mergetool
.
git
commit
|
commitdiff
|
tree
2007-03-28
Junio
C Ha
m
ano
Documentation: unbre
a
k
u
ser-manual
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Junio
C
H
a
m
ano
GIT
1
.
5
.
1-
r
c
3
commit
|
commitdiff
|
tree
2007-03-28
Junio C Ham
a
no
U
pdat
e
main git
.
html page
t
o point at 1
.
5
.
0
.
6
documentation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Ju
n
io C Hamano
Merge br
a
nch
'ma
i
n
t
'
to
s
y
nchronize wit
h
1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
G
IT 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
Fix "--
p
retty=f
o
r
mat:" for pa
r
ent relate
d
i
tems
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Junio
C
Hamano
git-
c
om
m
it: "read
-
t
ree -m
H
EAD" is
n
ot t
h
e
right way
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
Junio C Hamano
sha1_fi
l
e
.
c (write_s
h
a1_file): Detect close failure
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
Junio C Hamano
Document git-log --fir
s
t-
p
arent
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-26
Ju
n
io C Hamano
GI
T
1
.
5
.
1-rc2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-26
Junio C H
a
mano
M
erge
branch 'jc/f
p
l'
commit
|
commitdiff
|
tree
2007-03-26
Ju
n
io
C
Hamano
U
pd
a
te README to poi
n
t at a few k
e
y
p
e
r
iodical mes
s
ages
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-25
Junio C Hamano
Merge branch 'ma
i
n
t
'
commit
|
commitdiff
|
tree
2007-03-25
Junio C Hamano
M
e
rge branch
'
m
ai
n
t' of
gi
t
://linux
-
nfs
.
o
r
g
/~bfields
.
.
.
commit
|
commitdiff
|
tree
2007-03-25
J
u
nio C Hamano
M
e
r
g
e branch 'js/remote-sho
w
-push'
commit
|
commitdiff
|
tree
next