repo.or.cz
/
git
/
gitweb.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
Juni
o
C Hamano
Merge b
r
anch
'maint
'
commit
|
commitdiff
|
tree
2007-04-18
Junio
C Haman
o
M
e
rge b
r
anc
h
'fl/c
v
s
se
r
ver'
commit
|
commitdiff
|
tree
2007-04-18
Junio C
H
amano
Merge
b
r
anch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
Juni
o
C
H
am
a
n
o
Update draft re
l
eas
e
notes
fo
r
1
.
5
.
2 with accumula
t
ed
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C H
a
ma
n
o
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2007-04-18
J
unio C Hamano
Start preparing
for 1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
Junio C
H
amano
Merge branch 'master' of g
i
t://repo
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2007-04-18
J
u
n
i
o C Hamano
M
erge bran
c
h
'ma
i
nt' of git://repo
.
or
.
c
z
/git-
g
ui int
o
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
J
unio C H
a
mano
Merge branch 'jc/read-tree-df'
commit
|
commitdiff
|
tree
2007-04-17
J
u
n
io C
H
amano
git-g
u
i: Honor
TCLTK_P
A
TH if supplied
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-16
Junio C Ha
m
ano
Merge bra
n
c
h
'js/wrap-
l
og'
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hamano
se
n
d-e
m
ail: do not leave an empty CC: line
i
f n
o
c
c
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-16
Junio C H
a
m
a
no
M
e
rge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hama
n
o
M
e
rge
b
ra
n
ch 'm
a
int'
commit
|
commitdiff
|
tree
2007-04-15
Jun
i
o C Hama
n
o
Merge git:
/
/
g
it2
.
kernel
.
org/pub/scm
/
gitk/gitk into
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Merge
b
ran
c
h 'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
D
o
not def
a
ult to --
n
o-index whe
n
given two directories
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hamano
Mer
g
e branch
'jc/ch
e
rr
y
'
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hamano
Mer
g
e br
a
nch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-13
Jun
i
o C Hama
n
o
Fi
x
git
{log
,
show,
.
.
.
} --p
r
etty=email
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
D
o
cumentation: --cherry-pick
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C
H
amano
g
it-log --cherry-pick A
.
.
.
B
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
J
u
nio C Hamano
Refactor patch-id filtering
o
ut of git
-
cher
r
y and git
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Add %m to '--
p
retty=f
o
rm
a
t:'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C
Haman
o
Merge
bran
c
h 'maint'
commit
|
commitdiff
|
tree
2007-04-12
J
u
nio
C
Ham
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
fsck: do not complain o
n
detached HEAD
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Jun
i
o
C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-10
J
unio
C Hamano
t3030:
m
erge-recu
r
sive back
e
nd tes
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
merge-recur
s
ive: ha
n
d
l
e
D
/F conf
l
i
c
t
c
ase more
c
ar
e
ful
l
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C H
a
ma
n
o
merge-rec
u
rs
i
v
e
: do n
o
t barf
on
"
to b
e
r
emov
e
d
" entrie
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
Treat D/F con
f
lict e
n
try
m
o
r
e
c
a
refull
y
in unpack-trees
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
J
u
nio C Hamano
t100
0
: fix
c
ase tabl
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C H
a
mano
sh
o
rt
l
og -w:
m
ake wrap-
l
i
ne behaviou
r
opti
o
nal
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
J
unio C
H
a
m
a
n
o
Merge bran
c
h 'jc/push'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Haman
o
Merg
e
branc
h
'
j
c/mer
g
e
-subtree'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Ju
n
io C Hamano
Merge branch '
j
s
/
fe
t
ch-pr
o
g
r
es
s
'
commit
|
commitdiff
|
tree
2007-04-09
Jun
i
o C Ham
a
no
Merg
e
b
ranch 'maint
'
commit
|
commitdiff
|
tree
2007-04-09
J
u
nio C Hamano
A
d
d
D
ocument
a
tion/cmd-l
i
st
.
made t
o
.
gitignor
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
J
uni
o
C Hamano
Start 1
.
5
.
2 cycle by
prep
a
reing RelNotes fo
r
it
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Ju
n
io C Hamano
Merge branch 'jc/read-t
r
ee-df
'
(
e
arly part)
commit
|
commitdiff
|
tree
2007-04-08
Ju
n
io
C
Hamano
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2007-04-08
Junio C Ham
a
no
Prepar
e
for 1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
J
u
nio
C
Hamano
A new
m
erge st
r
aget
y
'subtree
'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C
Hamano
g
i
t
-push to multiple locations does no
t
stop at t
h
e
.
.
.
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 failing
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
J
u
ni
o
C Hamano
Merge br
a
nch
'j
c
/index
-
output'
commit
|
commitdiff
|
tree
2007-04-07
J
unio
C
Ham
a
no
M
e
r
ge bran
c
h 'fp/ma
k
e-j'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Ham
a
no
Merge
branch 'cc/bisect
'
commit
|
commitdiff
|
tree
2007-04-07
J
unio C Ham
a
no
Merge
b
ra
n
ch
'jc/checkout' (early
part)
commit
|
commitdiff
|
tree
2007-04-07
Juni
o
C
Hamano
Merge b
r
anch 'm
a
int'
commit
|
commitdiff
|
tree
2007-04-07
J
unio C Haman
o
Do
c
umentatio
n
: tighte
n
depend
e
ncy for git
.
{
html,txt}
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C
H
amano
git-bi
s
ect: allow bisecting w
i
th only one
bad commi
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
t6030: add a bit
more
t
ests to
g
it-bisect
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Junio C
Hamano
git
-
bi
s
ec
t
:
modernization
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Me
r
ge
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-05
Junio
C
Ha
m
ano
R
e
name
add_file_t
o
_index() to add_file_to
_
cache()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Juni
o
C Hamano
Renam
e
static vari
a
ble
w
rite
_
index to update_index
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Ham
a
no
Rena
m
e intern
a
l
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
Hamano
Pr
o
pagate
c
a
che error i
n
ternal to refres
h
_ca
c
he
(
)
via
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Fi
x
b
o
gus error message from me
r
ge-rec
u
rsive error
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio
C
Hamano
Fix dependency of common-
c
mds
.
h
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
J
unio C
H
a
m
an
o
RPM spec: include git-p4 in the li
s
t of all packages
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
r
erer
e
: make sortin
g
reall
y
stable
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
J
unio C Ham
a
no
F
i
x
switching to a branch with
D
/F when curr
e
nt branch
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
J
u
n
io C
Hamano
Fix twoway_merge t
h
a
t
pa
s
sed d/
f
conflict mar
k
er to
.
.
.
commit
|
commitdiff
|
tree
2007-04-04
J
uni
o
C Haman
o
F
i
x read-tree --
p
r
e
f
ix=dir/
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C H
a
mano
unpack-
t
rees: get rid of
*indp
o
s
parameter
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
u
np
a
ck_trees
.
c: pass unpack_t
r
ees_
o
p
t
ions structure
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
add_
c
ache
_
entry(): remo
v
al of fil
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 branch 'jc/bisect'
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C
Ham
a
n
o
Merge branch 'fl/doc'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Merge branch
'
post1
.
5
.
1/blame
.
el
'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ha
m
ano
Merge branch '
p
o
st1
.
5
.
1/t
c
ltk'
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io C Hamano
Merge
b
ranch 'pos
t
1
.
5
.
1/p4
'
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C
Hamano
Merge branch 'l
t
/
d
ir
w
alk'
commit
|
commitdiff
|
tree
2007-04-04
Junio C H
a
m
ano
g
i
t-r
e
ad-tree --index-outp
u
t=<file>
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
J
u
n
i
o C
H
amano
_GIT_INDE
X
_OUTPUT: allow plumbing
t
o
o
u
t
put to an alternativ
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io C
H
amano
checkout: allow detaching to HEAD ev
e
n when swi
t
c
h
ing
.
.
.
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 Hama
n
o
Merge 1
.
5
.
0
.
7 in
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C Hama
n
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 n
o
t repeat the ea
r
lie
r
hu
n
ks i
n
la
t
er
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-02
Junio C Haman
o
H
opefully final up
d
ate to the draf
t
Rel
e
ase
N
otes,
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-01
J
u
n
io C Hamano
Opt
i
onal Tc
k
/Tk: i
g
nore ge
n
erated files
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
Junio
C
Haman
o
Do not
b
o
t
her do
c
umenti
n
g
fetch--tool
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
Junio C Haman
o
U
pdate draft
r
e
l
ea
s
e notes for 1
.
5
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-03-30
Junio C Ha
m
ano
Merge branch
'
m
as
t
er'
of
g
it://repo
.
or
.
cz/git/mergetool
.
g
it
commit
|
commitdiff
|
tree
2007-03-28
J
u
n
i
o C Hamano
D
ocumenta
t
ion: unbreak u
s
er-manua
l
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Jun
i
o C Hamano
G
IT 1
.
5
.
1-rc3
commit
|
commitdiff
|
tree
2007-03-28
Ju
n
io C Hamano
Update main
git
.
html page to point
at 1
.
5
.
0
.
6 doc
u
m
entat
i
on
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Junio C
H
aman
o
M
e
r
g
e branch 'maint' to sync
h
ronize with 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 Haman
o
Fix "--pretty=fo
r
mat:" for parent related items
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
J
uni
o
C Ha
m
a
n
o
git-com
m
it: "read-tr
e
e -m HEAD" is not the right way
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
Junio C Hamano
sha1_file
.
c
(write_
s
ha
1
_file): D
e
tect cl
o
se failu
r
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
Jun
i
o C Haman
o
Docu
m
ent git-log --first-pare
n
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-26
J
unio C Ha
m
ano
GIT 1
.
5
.
1-rc2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-26
Jun
i
o
C Hamano
Merge branc
h
'jc/fpl'
commit
|
commitdiff
|
tree
next