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
GIT 1.5.1-rc2
2007-03-03
J
u
nio C Ha
m
ano
gi
t
-
merge: fa
i
l correctly when we cannot fast f
o
rward
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-03
Ju
n
io C Hamano
Me
r
g
e branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-03-02
Ju
n
i
o C H
a
mano
Merge branch 'js/commit-format'
commit
|
commitdiff
|
tree
2007-03-02
Ju
n
io
C
H
amano
Me
r
g
e
branch
'maint'
commit
|
commitdiff
|
tree
2007-03-01
Junio C H
a
mano
builtin-fetch--tool: fix reflog no
t
es
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-01
J
u
nio
C Hamano
git-fetch:
r
etire update-local-ref which is not used
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-28
Junio C Ham
a
no
Add recent changes
t
o draft
1
.
5
.
1
r
el
e
a
s
e not
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-28
J
unio C
H
aman
o
Mer
g
e branch 'js/co
m
m
i
t
-
b
y
-n
a
m
e
'
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hamano
M
e
rge
b
ranch
'
js/bundle'
commit
|
commitdiff
|
tree
2007-02-28
J
uni
o
C Hama
n
o
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2007-02-28
Junio
C
Hamano
Start preparing Release N
o
tes for 1
.
5
.
0
.
3
commit
|
commitdiff
|
tree
2007-02-28
J
unio C
Hama
n
o
D
o
cum
e
ntati
o
n
:
git-remot
e
add
[
-t <branch>] [-m <b
r
anch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-28
J
uni
o
C Hamano
index_fd(
)
: co
n
vert
b
l
ob only if it
i
s a reg
u
lar file
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-28
J
unio C Hamano
index_f
d
(
)
: pass optional path parameter
a
s
h
int for
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-28
Ju
n
io C H
a
mano
ind
e
x
_fd()
:
use
e
num object_type instead
o
f type name
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hamano
M
e
rge branch
'np/types'
commit
|
commitdiff
|
tree
2007-02-28
J
unio C Hamano
built
i
n-
f
etch--tool
:
m
ake su
r
e
not t
o
ov
e
rstep ls-remote
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-28
Juni
o
C
Hamano
Merge branch
'mc/sendm
a
il'
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hamano
Merge branch '
j
s/diff-ni' (ea
r
ly part)
commit
|
commitdiff
|
tree
2007-02-28
Junio C Haman
o
Merge branc
h
'mai
n
t'
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hamano
fetch
-
-
t
o
o
l:
fix unini
t
ialized buffe
r
when r
e
a
ding
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-27
J
unio C Hamano
Ma
k
e 'cvs ci
'
l
o
c
kless i
n
g
it-c
v
sserv
e
r b
y
using gi
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-27
Junio C
H
a
mano
builtin-fet
c
h--tool: adjust
t
o up
d
ated sha1_obje
c
t_i
n
f
o
()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-27
Junio C Hamano
Merge branch 'np/
t
y
pes' int
o
j
c
/fetch
commit
|
commitdiff
|
tree
2007-02-27
Junio
C
H
aman
o
M
e
rge branch
'
mai
n
t'
commit
|
commitdiff
|
tree
2007-02-27
Jun
i
o C Hamano
git-app
l
y
: d
o
not fix whitespaces
on c
o
ntext l
i
nes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
J
unio
C
Hamano
Merge branch 'master' into
j
s/
d
if
f
-
ni
commit
|
commitdiff
|
tree
2007-02-26
J
u
nio C Hamano
D
ocumentation: link in 1
.
5
.
0
.
2 materi
a
l to the top
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
Junio
C Hamano
Merge
branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-02-26
Jun
i
o C Hamano
GIT 1
.
5
.
0
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
Junio C H
a
m
a
no
D
o
c
umentation: describe "-f/-t/-m
"
options
t
o
"git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
Juni
o
C Hamano
diff -
-
cc: fix dis
p
lay
o
f
syml
i
nk co
n
flicts during
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
J
unio C Hamano
Mer
g
e branch 'main
t
'
commit
|
commitdiff
|
tree
2007-02-26
Junio C Hamano
Merge branch 'jc/merge-symlink' into maint
commit
|
commitdiff
|
tree
2007-02-26
Ju
n
io C Hamano
m
e
rge-rec
u
rsive: fix longstanding bug i
n
m
ergi
n
g
sym
l
inks
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
Jun
i
o C Hamano
merge-ind
e
x: fix lo
n
gs
t
a
n
ding bug in
merging
symlinks
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
Ju
n
io C Hamano
d
i
ff --cached:
g
ive m
o
re sens
i
b
le error
message when
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
J
unio C
Hamano
M
er
g
e branch 'm
a
int'
commit
|
commitdiff
|
tree
2007-02-25
Junio C Hama
n
o
Add
R
elease Note
s
t
o
prepare for 1
.
5
.
0
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
J
u
nio C Ham
a
no
rerere: do not deal with
s
ymlink
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
J
u
nio C
Ham
a
no
rerere: do
n
ot skip
t
wo conflicted pa
t
h
s
n
e
xt to each
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
Junio C
Ham
a
no
Merge git://re
p
o
.
or
.
cz/git
-
gui i
n
to maint
commit
|
commitdiff
|
tree
2007-02-25
Ju
n
io
C
Haman
o
Don't modify CREDIT
S
-FILE if it
h
asn't changed
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-24
Junio C Hamano
git-fetch--too
l
takes flags
before the subcom
m
and
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-24
J
u
nio C H
a
m
a
n
o
Evil Mer
g
e bran
c
h 'j
c
/status' (ear
l
y
part) into
j
s
.
.
.
commit
|
commitdiff
|
tree
2007-02-24
Junio C
H
am
a
no
M
er
g
e
branch 'js
/
appl
y
'
commit
|
commitdiff
|
tree
2007-02-24
Junio C Haman
o
Merge bran
c
h 'js/no-lim
i
t-boundary'
commit
|
commitdiff
|
tree
2007-02-24
J
uni
o
C Hamano
M
erge branch 'j
s
/et
c
-config'
commit
|
commitdiff
|
tree
2007-02-24
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-02-24
Jun
i
o C H
a
mano
diff-patch:
Avoid emitting double-sla
s
hes in t
e
xtual
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-24
Junio C Hamano
bundle: reword
missi
n
g p
r
erequi
s
ite err
o
r mes
s
age
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-24
Juni
o
C
Ha
m
ano
Rewo
r
d git
-
am 3-way
fallb
a
c
k
failure message
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-23
Ju
n
i
o
C Hamano
.
ma
i
lmap mai
n
tenance after
pul
l
ing from git-svn
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-23
J
unio C Hamano
Merge branches 'l
t
/
crlf' and
'jc/apply-conf
i
g'
commit
|
commitdiff
|
tree
2007-02-23
J
u
ni
o
C Hamano
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2007-02-22
Junio C Hamano
run
_
di
f
f_{files,index}():
update calling
convention
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-22
J
unio C Hamano
updat
e
-index: do n
o
t die too
e
a
rly in
a
rea
d
-on
l
y repositor
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-22
J
u
nio C Hamano
git-status: do not be totally useles
s
i
n
a rea
d
-only
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-22
Jun
i
o C Hamano
t
4119: t
e
st autocomputing -p<n> for traditiona
l
diff
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-22
J
unio C H
a
m
a
no
git-ap
p
ly: guess c
o
rrect -p<
n
>
v
alue for n
o
n-git patches
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
Junio C Haman
o
git-
a
p
p
ly: n
o
tice "d
i
ff --git" pa
t
ch
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 Haman
o
Mer
g
e branch 'ma
s
ter' of git://repo
.
or
.
cz/git-gui into
.
.
.
commit
|
commitdiff
|
tree
2007-02-21
Jun
i
o
C Hamano
Fix
b
otched "leak fix
"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
Junio C H
a
mano
t4119: ad
d
t
e
s
t for traditional patch and different
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
Junio C Hamano
Merge
b
ranch
'fk/autocon
f
'
commit
|
commitdiff
|
tree
2007-02-21
Junio
C Ha
m
a
no
Merg
e
br
a
nch 'js/na
m
e
-r
e
v-fix'
commit
|
commitdiff
|
tree
2007-02-21
J
u
nio
C Hamano
prefixcmp()
:
fix-up
lefto
v
er strnc
m
p
(
)
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
Junio C Haman
o
prefixcmp()
:
fix-up mech
a
nical conversion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
Junio C Hamano
Mechanical
c
o
n
v
ersion to u
s
e prefixcmp()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
Junio C Hamano
A
d
d
pr
e
f
i
x
cmp()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
Jun
i
o C Hamano
Merge branch
'maint'
commit
|
commitdiff
|
tree
2007-02-20
Ju
n
io C Hamano
Link 1
.
5
.
0
.
1 documentation
from t
h
e ma
i
n
page
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-20
Juni
o
C
Hamano
git-apply: require
-p<n> when work
i
ng
in a subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-20
Junio C Hama
n
o
gi
t
-apply
:
do
n
ot lose c
w
d
w
hen run
f
ro
m
a subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-20
Junio C Hamano
Merge branch 'js/di
f
f
-co
l
o
r
-check'
commit
|
commitdiff
|
tree
2007-02-20
Junio C Hama
n
o
Merge branch 'jc
/
fet
c
h-notags'
commit
|
commitdiff
|
tree
2007-02-20
Ju
n
io C Hamano
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2007-02-19
Junio C Ha
m
ano
Merge br
a
nch 'ap
/
cvsserver'
commit
|
commitdiff
|
tree
2007-02-19
Junio C
H
a
man
o
Merge
branch
'maint'
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
amano
T
e
ach '
g
it app
l
y'
t
o look at $HO
M
E/
.
g
i
tc
o
nfi
g
even
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-18
Junio C
Hamano
Updat
e
dr
a
ft rele
a
s
e
n
otes for 1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-18
Ju
n
io
C
Ham
a
no
Merge bra
n
ch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-02-18
Jun
i
o C Hamano
Update draft release notes fo
r
1
.
5
.
0
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-18
Ju
n
io C Hamano
Merg
e
git
:
//git
.
kernel
.
org/pu
b
/scm/gitk/gitk
i
n
t
o maint
commit
|
commitdiff
|
tree
2007-02-17
Junio C Hamano
Te
a
ch core
.
aut
o
crl
f
to 'git apply'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-17
Junio C Hamano
Teach 'g
i
t apply' to l
o
ok at $GIT_DIR/config
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-17
Junio
C H
a
mano
Do not take mode bits from in
d
ex
a
fter
typ
e
change
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-16
Jun
i
o C H
a
mano
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2007-02-16
Junio C Hamano
g
it-merge:
m
inor
f
ix for no_tr
i
vial_me
r
ge_strategies
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-16
Junio
C Hamano
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-02-16
Junio C Ham
a
no
pret
e
nd-sha1: grave bugfix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-15
Junio C Haman
o
rem
o
tes
.
not-
o
ri
g
in
.
tagopt
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Haman
o
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-02-14
Junio C
H
amano
GIT-
V
ERSION-FILE: che
c
k
.
/ve
r
sion
f
i
r
st
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Jun
i
o C Hamano
t00
2
0: add tes
t
for a
u
t
o
-
crlf
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Hamano
[PATCH] gi
t
k: Use show-ref instead of ls-remote
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Hamano
[PATCH] Make gitk work
r
easonably well on Cygwin
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
J
u
nio C Ha
m
ano
Make sure packedgitwindowsize is mult
i
ple
of (pagesize
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next