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 'maint'
2007-02-28
Junio C H
a
mano
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2007-02-28
Jun
i
o C Hamano
Start preparing Re
l
ease No
t
es for 1
.
5
.
0
.
3
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hamano
Documen
t
at
i
on:
g
it-
r
emote add
[
-
t <bra
n
ch>
]
[-m <branch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-28
Juni
o
C Hamano
index_fd():
c
onv
e
rt blob only if
i
t is a regular f
i
le
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hamano
index_fd(): pass optiona
l
pat
h
p
arameter as hint
f
o
r
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-28
J
u
n
i
o C Hamano
index
_
fd(): u
s
e enum
object_typ
e
instead of typ
e
name
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hamano
Merge branch 'np/typ
e
s'
commit
|
commitdiff
|
tree
2007-02-28
J
u
nio C Hamano
Merge branch 'mc
/
sendmail'
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hamano
Merg
e
b
ranch 'js/d
i
f
f
-ni' (early part)
commit
|
commitdiff
|
tree
2007-02-28
Junio
C
Hamano
M
e
rge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2007-02-27
Junio C Ha
m
ano
Make 'cv
s
ci'
lo
c
kless
in git
-
cvsse
r
v
e
r
by using
g
i
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-27
J
u
ni
o
C Hamano
Me
r
ge branch 'maint
'
commit
|
commitdiff
|
tree
2007-02-27
J
u
nio C Hamano
g
i
t-appl
y
: do not fix white
s
p
aces on context lines
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
J
unio
C
H
a
mano
Merg
e
bran
c
h
'
master' into js
/
d
i
ff-ni
commit
|
commitdiff
|
tree
2007-02-26
Junio C Hamano
Documen
t
ation: l
i
nk in 1
.
5
.
0
.
2 material to
t
he top
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
Juni
o
C Hamano
Mer
g
e
b
ra
n
ch 'maint
'
commit
|
commitdiff
|
tree
2007-02-26
Jun
i
o C Hamano
G
IT 1
.
5
.
0
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
J
unio C
H
a
m
ano
Documenta
t
ion
:
d
e
scribe "-f/-t/-m"
options
t
o "git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
Junio C Hamano
diff
--cc: fi
x
display of sym
l
ink co
n
fl
i
cts
d
urin
g
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
Junio C Hamano
Merge
b
ranc
h
'm
a
int
'
commit
|
commitdiff
|
tree
2007-02-26
Junio C Hamano
Me
r
ge
b
ranch 'jc/merge-sy
m
link
'
in
t
o
m
a
i
nt
commit
|
commitdiff
|
tree
2007-02-26
J
unio C H
a
mano
m
e
rge-r
e
cursive: fix longstandin
g
b
u
g i
n
merging symlinks
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
Juni
o
C Hamano
merge-in
d
ex
:
fix lo
n
gstanding b
u
g i
n
merging sym
l
inks
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
Juni
o
C Hamano
diff --cac
h
ed: give more sensib
l
e error mes
s
age when
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
J
unio
C Hama
n
o
Merge
bran
c
h 'mai
n
t'
commit
|
commitdiff
|
tree
2007-02-25
J
uni
o
C Hamano
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
Jun
i
o C Ham
a
no
rerere: do not deal with symlinks
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
Jun
i
o C
H
amano
rerere: do
not skip two conflicted paths next to each
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
J
u
ni
o
C Haman
o
Merge
git://re
p
o
.
or
.
c
z
/git-
g
ui into
m
aint
commit
|
commitdiff
|
tree
2007-02-25
Junio C Ha
m
ano
Don't
modif
y
C
REDITS-FILE if it hasn't changed
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-24
Ju
n
io C Hama
n
o
Evi
l
M
e
r
ge branch 'jc/statu
s
' (early part) int
o
j
s
.
.
.
commit
|
commitdiff
|
tree
2007-02-24
Junio C Hamano
Me
r
ge br
a
nc
h
'js/apply
'
commit
|
commitdiff
|
tree
2007-02-24
Junio C Hamano
M
e
rge branch 'js/no-l
i
mit-bou
n
dary'
commit
|
commitdiff
|
tree
2007-02-24
Junio C Hama
n
o
Merge branc
h
'js/etc-co
n
fig'
commit
|
commitdiff
|
tree
2007-02-24
Junio C Ham
a
no
Merge br
a
n
c
h
'maint'
commit
|
commitdiff
|
tree
2007-02-24
Junio
C
Hamano
diff-patch: Avoid emitting double-
s
lashes in
t
extual
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-24
Junio C Hamano
Rew
o
rd git
-
am 3-way fallback failure m
e
ss
a
ge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-23
Junio
C H
a
ma
n
o
.
mailmap mainten
a
n
c
e
a
fter pul
l
ing fr
o
m git-svn
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-23
Jun
i
o
C Hamano
Mer
g
e branche
s
'lt/cr
l
f' and
'jc/apply-config'
commit
|
commitdiff
|
tree
2007-02-23
Junio C Ham
a
no
Merg
e
b
r
anch 'm
a
i
n
t
'
commit
|
commitdiff
|
tree
2007-02-22
Jun
i
o C Hamano
run_diff_{f
i
les,index}(
)
: update call
i
n
g
convention
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-22
Junio C H
a
mano
u
pdate-index: do not die too early in
a
read-
o
nly repository
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-22
J
u
nio
C
Hamano
git-status: do no
t
be totally useless in a read-on
l
y
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-22
J
u
nio
C
Hamano
t4119: test auto
c
om
p
uting -p
<
n> for tradi
t
ional diff
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-22
Junio C Hamano
git-app
l
y: guess c
o
rrect -p<
n
> value for n
o
n
-
git pa
t
ches
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
Junio C Hamano
git-
a
p
p
ly: notice "diff --git" patch again
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-02-21
Junio
C Hamano
Merge bran
c
h 'm
a
ster' of git:
/
/repo
.
or
.
cz/git-
g
ui i
n
to
.
.
.
commit
|
commitdiff
|
tree
2007-02-21
J
u
nio C Hamano
Fix botched "leak fix"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
Junio C Ham
a
no
t
4119: a
d
d test for tradition
a
l patc
h
and diff
e
rent
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
Junio C Hamano
M
e
r
g
e
b
ranch 'fk/autoconf'
commit
|
commitdiff
|
tree
2007-02-21
Junio C H
a
mano
Merge
branch 'js/name
-
rev-fix'
commit
|
commitdiff
|
tree
2007-02-21
Junio C H
a
mano
prefixcmp()
:
fix-u
p
leftov
e
r
st
r
n
cmp()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
Junio C
Hamano
prefixcmp(): fix
-
up mechani
c
a
l conversion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
J
u
nio C Hamano
Me
c
hani
c
al conversion to u
s
e
p
refixcmp(
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
Ju
n
io
C
Hamano
A
dd prefix
c
mp()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
Junio C
H
amano
Me
r
ge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-02-20
J
u
nio C
Hamano
Link 1
.
5
.
0
.
1
d
o
cumentation from the
main
p
age
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-20
J
u
nio C
Ha
m
ano
git-apply:
r
equire -p<n> when working in a subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-20
Junio C
Hamano
git-ap
p
ly:
d
o not lose cwd when
r
u
n
from a subdirec
t
ory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-20
Junio C Hamano
M
e
rge
branc
h
'js/diff-color-check'
commit
|
commitdiff
|
tree
2007-02-20
Junio C
Hamano
M
e
rge br
a
nch 'jc/
f
et
c
h-no
t
a
g
s
'
commit
|
commitdiff
|
tree
2007-02-20
Junio
C Ha
m
ano
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2007-02-19
Junio
C
H
a
mano
Merge branch 'ap/cvsserver
'
commit
|
commitdiff
|
tree
2007-02-19
Junio C Hamano
Merge branch 'mai
n
t
'
commit
|
commitdiff
|
tree
2007-02-19
Junio C Hamano
GIT
1
.
5
.
0
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-18
Junio C H
a
ma
n
o
Teach 'git apply'
to lo
o
k at
$
HOME/
.
g
i
tco
n
fig even
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-18
Junio C Hamano
Updat
e
dr
a
ft relea
s
e notes for
1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-18
Junio C
H
a
mano
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2007-02-18
Junio C Hamano
Update
d
raft rel
e
ase
n
otes for 1
.
5
.
0
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-18
Junio
C Ha
m
ano
Merge
git://git
.
kernel
.
or
g
/
pub/scm/gitk/gitk
i
nto mai
n
t
commit
|
commitdiff
|
tree
2007-02-17
Junio
C Hamano
Tea
c
h
core
.
autocrlf to '
g
i
t apply'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-17
Junio C Hamano
Te
a
ch 'git
a
pply' to look at $GIT_DIR/confi
g
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-17
Jun
i
o C
H
amano
Do not take
mode bits from in
d
ex after
type change
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-16
J
u
nio C Hamano
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-02-16
J
unio C Ham
a
no
git-
m
erge: minor fix for no_trivial_
m
er
g
e_stra
t
egies
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-16
Ju
n
io
C Ha
m
ano
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2007-02-16
Junio C H
a
mano
pre
t
end-sha1
:
g
rave bu
g
fix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-15
Junio C Ha
m
ano
remo
t
es
.
not-origin
.
tagopt
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Hamano
Merge br
a
n
c
h 'main
t
'
commit
|
commitdiff
|
tree
2007-02-14
Juni
o
C H
a
mano
G
I
T-
V
ERSION-FI
L
E: ch
e
ck
.
/version f
i
rst
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Ju
n
io C
Hamano
t0020: add test for auto-crlf
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Hamano
[PATCH] gitk
:
U
se sh
o
w-ref
i
nstead of ls-rem
o
te
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Hama
n
o
[PATCH] Make gitk work
r
e
a
sonably well on Cygwin
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Hamano
Make sure
p
acke
d
g
itwindowsiz
e
i
s m
u
ltiple
of (pages
i
ze
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio C
H
a
m
a
n
o
Add RelNo
t
es 1
.
5
.
0
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Juni
o
C
H
am
a
no
Still updating
1
.
5
.
0 release notes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Hamano
Clarify two backward incompatible repository options
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Ham
a
n
o
Poin
t
to
p
-level Rel
N
ote
s
l
ink at 1
.
5
.
1 r
e
lease notes
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Juni
o
C
H
amano
Add RelNotes
1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Hamano
Document --i
g
n
o
r
e
-s
p
a
c
e-at-eol option
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Ju
n
io C Hama
n
o
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2007-02-14
Junio
C
H
aman
o
M
akefile
:
update
check-docs targ
e
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio
C
Hamano
cmd-list: add
git-remote
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Hamano
Docume
n
tatio
n
: Drop
f
ull-stop from gi
t
-fa
s
t
-
import
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
J
u
nio
C
Hamano
blame:
--show-stats for
easier optimiza
t
i
on
work
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio C
H
amano
Merge
b
r
an
c
h
'js/reve
r
se'
commit
|
commitdiff
|
tree
2007-02-14
Junio
C
Hamano
Merge
b
ranch 'jc/diff-
a
pply
-
patch'
commit
|
commitdiff
|
tree
2007-02-14
Junio C Hamano
Mer
g
e
branch 'jc/merg
e
-base' (ear
l
y part
)
commit
|
commitdiff
|
tree
2007-02-14
Junio C Ha
m
ano
Merge
b
ranch
'
jc/deprec
a
te'
commit
|
commitdiff
|
tree
next