repo.or.cz
/
git
/
jrn.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-03-05
Ju
n
i
o
C Haman
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-03-05
Junio C Hama
n
o
G
I
T 1
.
5
.
0
.
3
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-04
Junio C H
a
mano
diff-ni: allo
w
r
u
nnin
g
fro
m
a sub
d
irectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-04
Junio C Hamano
M
erge
b
ranch 'js/diff-ni' (ea
r
ly part)
commit
|
commitdiff
|
tree
2007-03-04
Junio C Hamano
Mer
g
e bra
n
ch
'main
t
'
commit
|
commitdiff
|
tree
2007-03-03
Junio C Hama
n
o
git-merge:
f
ail correctly
w
he
n
we c
a
nnot fa
s
t fo
r
ward
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-03
Ju
n
io C
Hamano
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2007-03-02
Junio C Hamano
Mer
g
e branch 'js/commi
t
-f
o
rmat'
commit
|
commitdiff
|
tree
2007-03-02
Junio C
Ha
m
ano
Merge
bra
n
ch '
m
aint'
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hamano
Add recent changes
t
o
d
r
a
f
t 1
.
5
.
1
releas
e
not
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hamano
Merge
branch 'js/c
o
mmit-by-n
a
me'
commit
|
commitdiff
|
tree
2007-02-28
J
u
nio C
H
amano
Mer
g
e branch 'js/bundle'
commit
|
commitdiff
|
tree
2007-02-28
Jun
i
o C
H
amano
Merge branch
'
m
aint'
commit
|
commitdiff
|
tree
2007-02-28
Junio
C
H
amano
Star
t
p
reparing Re
l
ease Notes
f
or 1
.
5
.
0
.
3
commit
|
commitdiff
|
tree
2007-02-28
Ju
n
io
C Ha
m
ano
Doc
u
ment
a
tion: git-remote add [-t <br
a
nch>] [-m <branch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hamano
i
ndex_fd(
)
: con
v
ert
blob only if it i
s
a
regular file
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hamano
in
d
ex_fd(): pas
s
optional p
a
th par
a
me
t
e
r
as hint for
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hamano
index_fd(): use enum object_type instead
o
f
type name
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-28
J
u
nio C Hama
n
o
Me
r
ge branch 'np/ty
p
e
s
'
commit
|
commitdiff
|
tree
2007-02-28
J
u
n
io C H
a
mano
Merge branch 'mc/sendmail'
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hamano
Merge
b
r
a
nch 'js/diff-ni' (early part)
commit
|
commitdiff
|
tree
2007-02-28
J
u
ni
o
C Ha
m
a
n
o
Merge branch '
m
ain
t
'
commit
|
commitdiff
|
tree
2007-02-27
J
u
nio C Ha
m
a
no
M
ak
e
'
c
vs
c
i' lockless in
git-cvsser
v
er
b
y usin
g
g
i
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-27
Ju
n
io C Hamano
Mer
g
e branch
'
main
t
'
commit
|
commitdiff
|
tree
2007-02-27
Junio C
H
a
man
o
g
it-apply: do not
f
i
x
wh
i
tespa
c
es
on c
o
ntex
t
lin
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
J
un
i
o C Ha
m
ano
Merge branch
'master' into
js/diff
-
ni
commit
|
commitdiff
|
tree
2007-02-26
Junio C Hamano
Documenta
t
ion: link in 1
.
5
.
0
.
2
m
a
t
eri
a
l
t
o
t
h
e
top
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
Junio
C
Ham
a
n
o
M
erg
e
br
a
nch 'maint'
commit
|
commitdiff
|
tree
2007-02-26
Junio C
Hamano
GIT 1
.
5
.
0
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
Ju
n
io C H
a
mano
Docume
n
t
ation: d
e
scribe
"-f
/
-t/-m" options t
o
"gi
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
Junio
C Hamano
d
iff --cc: fi
x
display of sym
l
ink conflicts durin
g
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
Junio C Hamano
Merge br
a
nch 'main
t
'
commit
|
commitdiff
|
tree
2007-02-26
Ju
n
io C Hamano
Merge branch 'jc/merge-
s
ymlink
'
into m
a
int
commit
|
commitdiff
|
tree
2007-02-26
Ju
n
io C
Hamano
merge-recursive: fix
lo
n
gstanding bu
g
in me
r
ging symlinks
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
Junio C Ha
m
ano
merge-index: fix longst
a
nding bug i
n
merg
i
ng
symlin
k
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
Junio C
Ha
m
ano
diff --cached: give more sensib
l
e error mess
a
g
e
when
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
J
u
nio
C
H
amano
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2007-02-25
J
u
n
i
o C Hamano
Add
Release Notes to prep
a
re fo
r
1
.
5
.
0
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
J
unio
C H
a
m
ano
rer
e
re: do
n
o
t
d
eal with symlinks
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
J
unio C Ha
m
ano
r
e
rere: do not
s
kip two con
f
licted pat
h
s n
e
xt to
e
ach
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
Junio C Hamano
Merge git://repo
.
or
.
cz
/
git-gui into mai
n
t
commit
|
commitdiff
|
tree
2007-02-25
Junio C
Ham
a
no
Don't modify CREDITS-FILE if it hasn't changed
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-24
Junio C Ham
a
no
E
v
il M
e
r
g
e
branc
h
'jc/st
a
tus'
(early par
t
) i
n
to js
.
.
.
commit
|
commitdiff
|
tree
2007-02-24
Junio C
Hamano
Merge b
r
anch 'j
s
/apply'
commit
|
commitdiff
|
tree
2007-02-24
Junio C Hama
n
o
Merge branch 'js/no-
l
imit-bou
n
dar
y
'
commit
|
commitdiff
|
tree
2007-02-24
J
u
nio C Hamano
Merge branch 'js/etc-conf
i
g
'
commit
|
commitdiff
|
tree
2007-02-24
Junio
C
Hamano
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2007-02-24
Junio C Ha
m
ano
diff-patch: Avoid emitting double-slashes in textual
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-24
Junio C Ham
a
no
bundle: r
e
word missing pr
e
re
q
uis
i
te er
r
or
messag
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-24
Junio C Hamano
Reword git-am
3
-
w
a
y fal
l
back
f
a
ilure
m
ess
a
ge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-23
Ju
n
i
o
C Hamano
.
mailmap maintenance after pulli
n
g from git-svn
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-23
Junio C Hamano
Merge
branch
e
s 'lt/cr
l
f' and 'jc/apply-config'
commit
|
commitdiff
|
tree
2007-02-23
Junio C Hamano
Merge bran
c
h 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-02-22
Junio C Hamano
run
_
diff_
{
file
s
,index
}
(): update calling convention
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-22
Junio C Hamano
update-ind
e
x: do
n
ot die t
o
o e
a
rly in a read-only rep
o
sitory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-22
J
unio C Hamano
git-status: do not be to
t
ally usele
s
s in
a read-
o
nly
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-22
Junio C Ha
m
ano
t4119:
test a
u
tocomputing -p
<
n>
for tradit
i
on
a
l
diff
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-22
Junio C
H
a
mano
g
i
t-apply:
g
uess
c
o
r
rect -p<n> value for non-git patches
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
J
u
nio C Hamano
git-ap
p
ly: notice "
d
if
f
--git" patch
a
g
a
in
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
Junio C Hamano
Merge branch '
m
ai
n
t'
commit
|
commitdiff
|
tree
2007-02-21
Jun
i
o C Hamano
Merge branch 'master' of
git://
r
e
p
o
.
or
.
cz/git-gui into
.
.
.
commit
|
commitdiff
|
tree
2007-02-21
Junio C Hamano
Fix botched
"lea
k
fix"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
Junio C Hamano
t
4
1
19: add
t
est for t
r
aditional patch and different
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
J
u
nio C Ha
m
ano
M
e
r
g
e bran
c
h 'fk/au
t
oconf'
commit
|
commitdiff
|
tree
2007-02-21
Junio C
H
amano
M
erge branch 'js/name-rev-
f
ix'
commit
|
commitdiff
|
tree
2007-02-21
Junio C Haman
o
pre
f
ixcmp(): fix-up leftover st
r
ncmp
(
)
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
Junio C Hamano
p
r
e
fixcmp(): fix-up mechanical conve
r
sion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
Junio C Ham
a
no
Mechanica
l
conversion to use prefixcmp()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
Jun
i
o C Hamano
Add prefix
c
mp(
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
Junio C Haman
o
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2007-02-20
J
u
nio C H
a
man
o
Link
1
.
5
.
0
.
1
documentation from the
ma
i
n page
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-20
Jun
i
o C
H
amano
git-apply: require -
p
<n
>
when
w
o
r
king
i
n a subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-20
Junio C Hama
n
o
git-apply: do not lose cwd when run from a subdir
e
ct
o
ry
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-20
Jun
i
o C Ha
m
ano
Merge branch 'js/diff
-
color-che
c
k
'
commit
|
commitdiff
|
tree
2007-02-20
Junio C Hamano
Mer
g
e branch 'jc/f
e
tch-n
o
tag
s
'
commit
|
commitdiff
|
tree
2007-02-20
Junio
C H
a
mano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-02-19
Junio C Ham
a
no
M
erge branch 'ap/cvsserver'
commit
|
commitdiff
|
tree
2007-02-19
Junio
C
Hamano
M
e
rge branch 'main
t
'
commit
|
commitdiff
|
tree
2007-02-19
Ju
n
io
C
Hamano
GIT
1
.
5
.
0
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-18
Junio C Hamano
T
e
a
c
h 'gi
t
apply' to lo
o
k at $H
O
ME/
.
gitco
n
fig even
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-18
Ju
n
io C Hamano
Update draft release notes
for 1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-18
Junio C Hamano
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2007-02-18
Junio C
Ha
m
ano
U
p
date draft rele
a
se notes
for 1
.
5
.
0
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-18
Junio C Hamano
M
er
g
e git://git
.
kernel
.
org/pub/scm/git
k
/gi
t
k int
o
maint
commit
|
commitdiff
|
tree
2007-02-17
Junio
C
Ha
m
ano
Teach c
o
re
.
a
u
tocrlf t
o
'git appl
y
'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-17
Junio C Hamano
T
e
ach
'git apply' to look at $GIT_DIR/config
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-17
Jun
i
o C Haman
o
Do not take mod
e
bits f
r
om index after type change
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-16
Junio
C
Ham
a
no
Merge bra
n
c
h
'mai
n
t'
commit
|
commitdiff
|
tree
2007-02-16
Junio C
Hamano
git-merge: minor fix for
n
o_trivial_merge_strategies
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-16
Junio C Haman
o
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2007-02-16
Junio C Hamano
pret
e
nd-
s
ha1: g
r
ave bugfix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-15
J
unio C Hama
n
o
remotes
.
not-origin
.
ta
g
opt
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Hamano
M
erge b
r
anch 'm
a
int'
commit
|
commitdiff
|
tree
2007-02-14
Junio
C
H
a
mano
GIT-
V
ERSION-FILE: check
.
/ver
s
i
o
n
first
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Ha
m
ano
t0
0
20: add test for auto-
c
rlf
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio C H
a
mano
[PATCH] gitk: Use show-ref in
s
tea
d
of ls-remote
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Hamano
[PAT
C
H
]
Make gitk work re
a
sonably well on Cygwin
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
J
uni
o
C
H
amano
Mak
e
s
ure pac
k
edg
i
t
windowsize is multip
l
e
of (pagesize
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Jun
i
o C Hamano
Add Rel
N
otes 1
.
5
.
0
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Ju
n
io C Hamano
Stil
l
updatin
g
1
.
5
.
0 release notes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next