repo.or.cz
/
git
/
jnareb-git.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 Ham
a
no
Merge branch 'js/commit-b
y
-name'
commit
|
commitdiff
|
tree
2007-02-28
Junio C Haman
o
Merge
branch '
j
s/bundle'
commit
|
commitdiff
|
tree
2007-02-28
J
unio C Hamano
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2007-02-28
Junio C Ha
m
ano
St
a
rt preparing Re
l
ease Notes for 1
.
5
.
0
.
3
commit
|
commitdiff
|
tree
2007-02-28
Junio C
Haman
o
Documentation
:
git-remote add [-t <
b
ranch>] [-m
<br
a
nch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-28
Junio C H
a
mano
i
n
d
e
x
_fd()
:
convert bl
o
b only if it is a
r
egular
f
ile
.
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 path parameter as
h
int for
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hamano
i
n
dex_fd(): use e
n
u
m
object_type
i
nstead of type name
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-28
Junio
C
Hama
n
o
M
e
rge branch 'np/types'
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hamano
b
u
iltin-fe
t
ch--too
l
: make sure no
t
to overstep ls-rem
o
te
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-28
Junio
C
Hamano
Me
r
g
e
b
r
anch 'm
c
/send
m
ail'
commit
|
commitdiff
|
tree
2007-02-28
Juni
o
C
Ha
m
ano
Merg
e
branch
'j
s
/dif
f
-ni' (early
p
ar
t
)
commit
|
commitdiff
|
tree
2007-02-28
Ju
n
io
C
Ha
m
ano
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2007-02-28
Junio C
Haman
o
fet
c
h--tool: fix un
i
nit
i
a
lized buff
e
r when reading
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-27
Junio C Hamano
Mak
e
'cvs ci' lockless in git-
c
vss
e
rv
e
r by using git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-27
Junio C Ha
m
ano
built
i
n-fetch
-
-
t
ool:
a
djust to updated sh
a
1_obj
e
ct_in
f
o()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-27
Junio C Hamano
Merge bra
n
ch 'np/
t
ypes' into jc/fetch
commit
|
commitdiff
|
tree
2007-02-27
Ju
n
io C
H
amano
Merge bra
n
c
h
'maint'
commit
|
commitdiff
|
tree
2007-02-27
Junio C Ha
m
ano
g
i
t
-
apply: d
o
not fix
w
h
i
tespaces on
c
onte
x
t lines
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
Junio C Hamano
Mer
g
e bran
c
h
'
m
aster' int
o
j
s/diff-ni
commit
|
commitdiff
|
tree
2007-02-26
Junio C Haman
o
Docume
n
tation: link in 1
.
5
.
0
.
2
material to th
e
top
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
Junio C Hamano
Merg
e
branch '
m
aint'
commit
|
commitdiff
|
tree
2007-02-26
J
u
nio C Hamano
GIT 1
.
5
.
0
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
Junio C Ha
m
ano
Docume
n
tation:
d
e
scri
b
e "-f/-t/-m" op
t
io
n
s
t
o
"git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
Junio C Hamano
d
iff --cc:
fix display of
symlink
conflicts
d
uring
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
Junio C
H
amano
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2007-02-26
Junio C Hama
n
o
Merge
b
ranch
'
j
c
/merge-
s
ymlink'
into main
t
commit
|
commitdiff
|
tree
2007-02-26
J
un
i
o C Hamano
merge-recursive: fix long
s
tand
i
ng bug in merging symlinks
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
Junio C Hamano
me
r
g
e-index: fix longstanding
b
u
g
in merging s
y
mli
n
ks
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
Junio C Hamano
diff --cached: give mo
r
e sensible
error message when
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
Junio C Hamano
Merge branch
'
main
t
'
commit
|
commitdiff
|
tree
2007-02-25
Junio C
H
am
a
no
Add
R
eleas
e
Notes to p
r
ep
a
re for 1
.
5
.
0
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
J
u
nio C Haman
o
re
r
e
re: do not
deal
with s
y
m
links
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
Junio C
H
a
mano
rerere:
do not
skip two conflicted pat
h
s next to each
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
Junio C H
a
mano
Merge
g
it://repo
.
or
.
c
z
/git-gui
i
nto maint
commit
|
commitdiff
|
tree
2007-02-25
Junio C Hamano
Don't modify CREDITS-FILE
i
f it
h
asn't cha
n
ged
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-24
Juni
o
C Hamano
git
-
fetch-
-
tool take
s
flags
before th
e
sub
c
ommand
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-24
Junio C Ham
a
no
Evil Merge
b
ra
n
ch
'
jc/st
a
t
us' (e
a
r
ly pa
r
t) into js
.
.
.
commit
|
commitdiff
|
tree
2007-02-24
Junio
C Hamano
Me
r
ge b
r
anch 'js/
a
pply'
commit
|
commitdiff
|
tree
2007-02-24
Junio C Ham
a
no
Mer
g
e b
r
anc
h
'js/no
-
l
imit-boundary
'
commit
|
commitdiff
|
tree
2007-02-24
Junio C Hamano
Merge branch 'js/etc-con
f
ig'
commit
|
commitdiff
|
tree
2007-02-24
Junio
C
Hamano
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2007-02-24
Junio C Hama
n
o
diff-patch
:
Avoi
d
emitt
i
ng double-slashes in textual
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-24
Junio C
Hama
n
o
bundle: reword
missing prerequisite e
r
ror me
s
sage
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-24
J
u
nio C Hama
n
o
Rewo
r
d g
i
t-am
3-way f
a
llback
f
ailur
e
message
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-23
Junio C
Hamano
.
mail
m
a
p
maint
e
nance after pull
i
ng from gi
t
-svn
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-23
Junio
C Hamano
Merge
branc
h
e
s
'l
t
/
c
rlf' and 'jc/
a
pply-con
f
ig'
commit
|
commitdiff
|
tree
2007-02-23
Junio
C
Hamano
M
erge
b
ranch 'main
t
'
commit
|
commitdiff
|
tree
2007-02-22
Junio C Hamano
run_diff_{files,index}():
u
pdate calling
co
n
vention
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-22
Junio C H
a
mano
update-ind
e
x: do not die too early in a
read-only re
p
ository
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-22
Junio C Hamano
g
it-st
a
t
u
s: d
o
not be tot
a
lly
u
sele
s
s in a read-only
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-22
Junio C
H
a
m
ano
t4119: test
a
utoco
m
puting -p<n> for
t
r
aditional diff
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-22
J
unio C Hamano
git-apply: guess co
r
rect -
p
<n> val
u
e for n
o
n-git patches
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
Juni
o
C
Hamano
git-app
l
y: n
o
tice "
d
iff --git" patch again
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
Junio C
H
aman
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-02-21
Junio
C Hamano
Merge bran
c
h 'ma
s
ter
'
of git://
r
epo
.
o
r
.
cz/
g
it-gu
i
into
.
.
.
commit
|
commitdiff
|
tree
2007-02-21
Junio C Hamano
Fix botched "leak
f
ix"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
Junio
C
H
amano
t4119: add test for traditio
n
al patch and different
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
J
u
n
i
o C H
a
mano
Merg
e
br
a
n
c
h '
f
k/aut
o
conf'
commit
|
commitdiff
|
tree
2007-02-21
Junio C Hamano
Merge branch 'js
/
nam
e
-rev-fix'
commit
|
commitdiff
|
tree
2007-02-21
Juni
o
C
H
amano
pr
e
fixcmp():
f
ix-up le
f
tover strn
c
mp()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
Junio C Hamano
prefixcmp(
)
: fix
-
up me
c
hani
c
a
l
c
onversi
o
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
Ju
n
io C Hamano
M
e
ch
a
nical conversion to use prefix
c
mp(
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
J
u
nio C Ha
m
ano
Add prefix
c
mp()
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-20
Ju
n
i
o
C
Hamano
L
ink 1
.
5
.
0
.
1 d
o
cumentation f
r
om the main page
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-20
Ju
n
io C Ha
m
a
n
o
git-apply
:
r
equire -p
<
n> when
w
o
r
king in a s
u
bdirector
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-20
J
u
n
io C Haman
o
git-apply: do not
l
ose cwd whe
n
run fr
o
m a subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-20
Junio C Haman
o
Merge b
r
a
nch 'js/diff-colo
r
-check
'
commit
|
commitdiff
|
tree
2007-02-20
Juni
o
C Hamano
Merge
b
ranc
h
'jc/
f
e
t
ch-notags'
commit
|
commitdiff
|
tree
2007-02-20
Junio C Hamano
M
erge br
a
n
c
h 'maint
'
commit
|
commitdiff
|
tree
2007-02-19
J
unio
C Hamano
Merge branch 'ap/
c
vsser
v
er'
commit
|
commitdiff
|
tree
2007-02-19
J
unio C Haman
o
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2007-02-19
J
un
i
o C
Hama
n
o
GI
T
1
.
5
.
0
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-18
Junio
C
Hamano
T
e
ach 'git app
l
y
' to
lo
o
k at $HOME
/
.
gitconfig even
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-18
Junio
C Hamano
Update
d
raft rele
a
se notes for 1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-18
Junio C Hamano
M
e
rg
e
branch 'maint'
commit
|
commitdiff
|
tree
2007-02-18
Junio
C Ham
a
no
U
p
date draft
release not
e
s
f
o
r 1
.
5
.
0
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-18
Junio C Hamano
M
erge git:
/
/git
.
kernel
.
org
/
pub/sc
m
/gitk/git
k
into ma
i
nt
commit
|
commitdiff
|
tree
2007-02-17
Junio C Hamano
Te
a
ch
co
r
e
.
autocrlf to
'g
i
t
app
l
y'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-17
Junio
C Hamano
Tea
c
h 'git apply'
t
o loo
k
at $GIT_DIR/co
n
fi
g
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-17
J
u
nio C Hamano
Do not take m
o
de
bits from i
n
dex after type change
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-16
J
unio C
Ha
m
ano
M
e
r
g
e
bra
n
c
h
'maint'
commit
|
commitdiff
|
tree
2007-02-16
Junio C
H
amano
g
i
t
-
merge: mi
n
or
f
ix for no_trivial_merge_
s
trate
g
ies
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-16
Junio C Hamano
M
e
rge
bran
c
h 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-02-16
Junio C Hamano
pretend-sha
1
: gra
v
e bugfix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-15
Jun
i
o C Hamano
remo
t
es
.
not-or
i
gin
.
t
a
gop
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Hamano
M
e
r
ge bra
n
ch 'm
a
i
n
t'
commit
|
commitdiff
|
tree
2007-02-14
Junio C Hamano
G
I
T-VERS
I
ON-
F
ILE
:
check
.
/version fi
r
st
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Hamano
t00
2
0:
add te
s
t for auto-crlf
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio
C
Hamano
[PATCH] gitk: Use show-r
e
f instead of ls-remote
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
J
unio C Hamano
[PATCH] Make
gitk work reasonably we
l
l on C
y
gwi
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Jun
i
o C Ham
a
no
Make sure
p
acked
g
i
t
windowsize is multiple of (pagesize
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Juni
o
C
H
a
ma
n
o
Add RelNotes 1
.
5
.
0
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
J
unio C
H
amano
Still updating
1
.
5
.
0 r
e
lease n
o
te
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Jun
i
o C Hamano
Clarify two backward incompatible r
e
posito
r
y o
p
t
i
ons
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Hamano
Po
i
nt t
o
p
-leve
l
RelNot
e
s l
i
n
k
at 1
.
5
.
1 rele
a
se notes
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Juni
o
C
Hama
n
o
Add Rel
N
otes 1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Jun
i
o C Hamano
Document --ig
n
o
re
-
space-at-
e
ol
option
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Hamano
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
next