repo.or.cz
/
git
/
git-svn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
GIT 1.5.1-rc2
2007-03-03
Junio C Hamano
gi
t
-me
r
ge: fail correctly when we ca
n
not fast forwar
d
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-03
Juni
o
C Hamano
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-03-02
J
u
nio C
H
amano
Me
r
ge branch 'j
s
/com
m
it-format'
commit
|
commitdiff
|
tree
2007-03-02
Juni
o
C Hamano
Merge br
a
nc
h
'ma
i
nt'
commit
|
commitdiff
|
tree
2007-03-01
Junio C Hamano
builtin-fetch-
-
tool: fix reflog notes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-01
Junio C
H
ama
n
o
git-fetch
:
reti
r
e
u
p
dat
e
-
local-ref which is no
t
used
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-28
Junio C Ha
m
ano
Add recent changes to draft 1
.
5
.
1
r
e
lease
no
t
es
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-28
Jun
i
o C H
a
mano
Merg
e
b
ranch 'js/commit-by-name
'
commit
|
commitdiff
|
tree
2007-02-28
Junio
C
Hamano
M
erge b
r
anch 'js/bundle'
commit
|
commitdiff
|
tree
2007-02-28
Junio C
H
am
a
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hamano
Start preparing
Re
l
ease Notes for 1
.
5
.
0
.
3
commit
|
commitdiff
|
tree
2007-02-28
Junio C
H
a
mano
D
ocumenta
t
ion:
git-remote a
d
d [-t <branch>] [-m <branch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-28
Junio
C Hamano
i
ndex
_
fd()
:
c
o
nver
t
blob only i
f
i
t is a regular
fil
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hamano
index_fd(): pass
optional path parameter a
s
hint for
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-28
Junio C H
a
ma
n
o
i
n
dex_fd(): use enum object_type inst
e
ad
o
f
type name
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-28
Junio C
H
a
mano
Merge branch 'n
p
/types'
commit
|
commitdiff
|
tree
2007-02-28
Junio
C
H
a
mano
builtin-fetch--tool
:
ma
k
e sure not to overstep ls-remote
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-28
Jun
i
o C Hamano
Merge b
r
anch 'm
c
/se
n
dmail'
commit
|
commitdiff
|
tree
2007-02-28
Ju
n
io C Hamano
Merg
e
b
r
an
c
h 'js/d
i
ff-n
i
' (early part)
commit
|
commitdiff
|
tree
2007-02-28
J
u
nio C
Ha
m
a
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-02-28
Juni
o
C
Ha
m
a
n
o
f
etch-
-
tool:
f
ix uninit
i
alized
b
u
ffer
w
hen
r
eading
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-27
J
unio C Ha
m
an
o
M
a
ke 'c
v
s
c
i' loc
k
less in g
i
t
-
cvsserver by using gi
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-27
Junio C Hamano
bu
i
ltin-fetch-
-
tool: adjust to
updated sha1_ob
j
ect_info()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-27
J
u
nio C Hamano
Merge branch 'np/types' in
t
o jc/fetch
commit
|
commitdiff
|
tree
2007-02-27
J
u
nio C Ham
a
n
o
Me
r
g
e
branch 'maint'
commit
|
commitdiff
|
tree
2007-02-27
J
un
i
o C Ham
a
no
git-apply
:
do
not fix
w
hite
s
paces on context
lines
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
Junio C Hamano
Merge branch 'master' i
n
t
o
js/diff-
n
i
commit
|
commitdiff
|
tree
2007-02-26
Junio C
H
amano
Documentation
:
link i
n
1
.
5
.
0
.
2
materi
a
l
t
o the
t
op
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
J
u
nio C Hamano
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2007-02-26
J
u
n
io
C
Hamano
GIT 1
.
5
.
0
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
J
u
nio C Hamano
Do
c
umentation: describe "-f/-t/-
m
" options to "git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
J
uni
o
C
H
aman
o
diff --cc: fix di
s
play of symlink
con
f
licts during
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
Junio
C H
a
mano
Merge
b
r
a
nch 'maint
'
commit
|
commitdiff
|
tree
2007-02-26
Junio C Ha
m
an
o
Mer
g
e
bran
c
h 'jc/merge-sy
m
link'
i
n
t
o
m
a
i
n
t
commit
|
commitdiff
|
tree
2007-02-26
J
u
nio
C Hama
n
o
merg
e
-recursive: fix longstanding b
u
g in merging
s
ymlinks
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
Juni
o
C
Ham
a
no
merge-index: fix l
o
ngstanding b
u
g in mer
g
ing
symlinks
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
Junio C Hamano
d
i
f
f
-
-
c
ac
h
ed: give more sensi
b
le error
message when
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
Junio C Hamano
M
erge
b
ranch 'm
a
int'
commit
|
commitdiff
|
tree
2007-02-25
J
u
nio C Ham
a
no
Add Release Notes to prepare for
1
.
5
.
0
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
Junio C Ha
m
ano
re
r
ere:
d
o not
d
e
a
l with
symlinks
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
Junio C Hamano
re
r
e
re:
do no
t
skip two conflicted paths next
t
o
each
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
Junio C
H
am
a
no
M
e
r
ge git:
/
/
r
epo
.
or
.
cz/git-gui into maint
commit
|
commitdiff
|
tree
2007-02-25
Junio C Hamano
Don
'
t modify
C
RE
D
ITS-FILE if it hasn't c
h
anged
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-24
J
u
nio C Hama
n
o
g
i
t
-
fetch--to
o
l takes flags before
t
he subcom
m
and
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-24
J
unio C Hamano
Evil
M
erge
branch 'j
c
/
s
t
a
tus' (early
p
art) into js
.
.
.
commit
|
commitdiff
|
tree
2007-02-24
J
u
n
i
o C Haman
o
Mer
g
e branch 'js/
a
pply'
commit
|
commitdiff
|
tree
2007-02-24
Jun
i
o C
Hamano
Merge branch
'js/n
o
-li
m
it-boundary'
commit
|
commitdiff
|
tree
2007-02-24
J
u
ni
o
C
H
a
mano
Merge
branch 'js/etc-config'
commit
|
commitdiff
|
tree
2007-02-24
J
unio C Hamano
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2007-02-24
J
u
nio C
Hamano
diff-patch: Avoid
em
i
tt
i
ng double-
s
lashes
in tex
t
ual
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-24
J
u
nio C H
a
m
a
no
b
undle: reword m
i
s
s
i
n
g
prerequ
i
site erro
r
message
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-24
Jun
i
o C Hamano
Rewor
d
git-am 3
-
way fallback f
a
ilur
e
message
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-23
Junio C Hama
n
o
.
mailmap
m
aintenance after pulli
n
g fr
o
m
git-svn
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-23
Junio C
Ham
a
no
Merge branches '
l
t/crlf' an
d
'jc
/
apply-config'
commit
|
commitdiff
|
tree
2007-02-23
Junio C Haman
o
Merge
branch 'main
t
'
commit
|
commitdiff
|
tree
2007-02-22
Junio C Hamano
run_dif
f
_{files,in
d
ex
}
(): update calling conven
t
io
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-22
J
unio C Hamano
up
d
ate-index: do no
t
d
i
e
t
oo early
i
n
a read-only repository
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-22
J
u
nio
C
Hamano
g
it-status: d
o
not be totally useless
i
n a read
-
on
l
y
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-22
Ju
n
io C Hamano
t41
1
9: test autocomputin
g
-p<n> fo
r
traditional diff
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-22
J
unio
C Hama
n
o
git-
a
pply: gu
e
s
s correct -p<n>
value
for non-git patc
h
es
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
Junio
C Hamano
git-ap
p
ly: notice "
d
if
f
--gi
t
"
patch a
g
ain
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
Junio
C Hamano
Merge bran
c
h
'
m
aint'
commit
|
commitdiff
|
tree
2007-02-21
Junio
C
Hamano
Merg
e
b
r
anch 'master'
o
f
git:
/
/
r
epo
.
or
.
cz/g
i
t-gui
into
.
.
.
commit
|
commitdiff
|
tree
2007-02-21
Junio C
Hamano
Fi
x
botched
"
leak fix"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
Junio C
H
am
a
no
t4119:
add test for traditi
o
n
a
l patch
a
nd differ
e
n
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
Ju
n
io C Hamano
Merge branch 'fk/autoconf
'
commit
|
commitdiff
|
tree
2007-02-21
Juni
o
C Hamano
M
e
r
ge b
r
a
n
c
h
'
js/name-rev-fix'
commit
|
commitdiff
|
tree
2007-02-21
Juni
o
C Ha
m
ano
prefixcmp(): fix-up l
e
ftover strncmp
(
)
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
Junio C Ham
a
no
p
ref
i
x
c
mp():
f
i
x
-up
mechanic
a
l conversion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
Junio C Hama
n
o
M
e
chan
i
cal c
o
nversion to use pr
e
fix
c
mp()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
Junio
C
Hamano
Add pref
i
x
c
mp
(
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
J
u
n
io C Hamano
Merge br
a
n
c
h 'maint'
commit
|
commitdiff
|
tree
2007-02-20
Junio C
Hama
n
o
Link 1
.
5
.
0
.
1 documentation from the m
a
in page
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-20
Junio C Hamano
git-apply: require -p
<
n> whe
n
wo
r
kin
g
in a subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-20
Junio C Ha
m
ano
git-apply:
d
o
n
ot l
o
se cwd when run fro
m
a subdi
r
e
ctory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-20
Junio
C Hamano
Merge branch 'js/diff-color
-
check'
commit
|
commitdiff
|
tree
2007-02-20
Junio C Hamano
Me
r
g
e bran
c
h
'jc/fe
t
ch-notag
s
'
commit
|
commitdiff
|
tree
2007-02-20
Junio C Hamano
Mer
g
e
b
ranch 'main
t
'
commit
|
commitdiff
|
tree
2007-02-19
Junio C Ham
a
no
Merge bran
c
h
'
ap/cvsserver'
commit
|
commitdiff
|
tree
2007-02-19
Junio C Ham
a
no
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-02-19
J
uni
o
C H
a
mano
GIT 1
.
5
.
0
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-18
Jun
i
o C Hamano
T
each 'git apply
'
t
o
look at $HO
M
E/
.
gitconfig even
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-18
Junio C Hamano
Update draf
t
re
l
ease notes for 1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-18
J
u
nio C Hamano
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2007-02-18
Junio C Haman
o
Update draft
r
elease no
t
es for 1
.
5
.
0
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-18
Junio C Ham
a
no
Merge g
i
t:
/
/git
.
ke
r
nel
.
org/pub/scm/gitk/gitk into mai
n
t
commit
|
commitdiff
|
tree
2007-02-17
Junio C Haman
o
Teach core
.
a
utocrlf to 'git apply'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-17
Junio C Ham
a
no
Teach 'git apply' t
o
loo
k
at $GIT_DIR/config
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-17
Junio C Ham
a
no
Do not t
a
ke mode
b
its f
r
om index after type change
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-16
Junio C Ha
m
ano
Merg
e
branch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-02-16
Junio C H
a
man
o
git-merge: minor fix for no_
t
rivial_m
e
rg
e
_s
t
rat
e
gies
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-16
Junio C Hamano
Merge
branch 'm
a
int'
commit
|
commitdiff
|
tree
2007-02-16
Junio C Hamano
p
r
et
e
n
d-s
h
a1: gra
v
e bugf
i
x
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-15
Junio C Hamano
r
emotes
.
not-or
i
gin
.
tagopt
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio C H
a
mano
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-02-14
Junio C Hamano
GIT-VERSION-FIL
E
: check
.
/version firs
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio C
H
aman
o
t0020: add test for auto-c
r
l
f
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Haman
o
[PATCH
]
g
i
tk:
U
se show-ref
instead
of ls
-
remote
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Hama
n
o
[PA
T
CH] Make gitk work
r
eason
a
bly well on C
y
g
w
in
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Jun
i
o C Ha
m
ano
M
a
ke
s
ure packedgitwindowsiz
e
is multi
p
le of (pagesi
z
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next