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-03-06
Ju
n
io C Hamano
Merge
b
r
anch 'm
a
int'
commit
|
commitdiff
|
tree
2007-03-06
Junio C Hamano
Merge br
a
nch 'master' of
g
i
t://
r
epo
.
or
.
cz/gi
t
-
gui into
.
.
.
commit
|
commitdiff
|
tree
2007-03-06
Junio
C Haman
o
g
i
t-bu
n
dle: fix pack generation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-06
Ju
n
io C
Hama
n
o
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2007-03-06
J
u
n
io
C
Hamano
git-co
m
mit:
c
d to top before showi
n
g
the
f
ina
l
s
t
a
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-06
Ju
n
i
o C Hama
n
o
M
e
r
ge b
r
anch '
m
aster
-
fo
r
-junio'
o
f
git://repo
.
or
.
cz
.
.
.
commit
|
commitdiff
|
tree
2007-03-06
Junio C Hamano
Merge branch 'ma
i
nt-for-
j
unio' of g
i
t://repo
.
or
.
cz
.
.
.
commit
|
commitdiff
|
tree
2007-03-05
Junio C Hamano
Post 1
.
5
.
0
.
3 cle
a
n
up
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-05
Junio C Hama
n
o
Merge branch 'js/f
e
t
c
h
-progress' (early part)
commit
|
commitdiff
|
tree
2007-03-05
Jun
i
o C Hamano
Merge br
a
n
c
h 'js/symli
n
k
'
commit
|
commitdiff
|
tree
2007-03-05
Junio C
Hamano
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2007-03-05
J
u
n
i
o C Haman
o
GIT 1
.
5
.
0
.
3
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-04
Junio C Hamano
d
iff-ni: allow
r
unning from
a subd
i
rectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-04
Junio C Hamano
Merge branch 'js
/
diff-n
i
'
(
ea
r
ly pa
r
t)
commit
|
commitdiff
|
tree
2007-03-04
Jun
i
o
C
H
a
mano
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2007-03-03
Junio C Haman
o
git-m
e
rge: fail co
r
rectly wh
e
n we can
n
o
t fast forward
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-03
J
unio C Hamano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2007-03-02
Jun
i
o
C Hamano
Merge
br
a
nch 'js/comm
i
t-form
a
t
'
commit
|
commitdiff
|
tree
2007-03-02
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-02-28
Junio C
H
a
m
ano
Add recent changes to dr
a
ft 1
.
5
.
1 release notes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-28
Junio C Ha
m
ano
Merge branch 'js/commit-by-name'
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hama
n
o
Mer
g
e
bra
n
c
h 'js/bundle'
commit
|
commitdiff
|
tree
2007-02-28
Junio C Ham
a
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hamano
Start preparing
Release
Notes for 1
.
5
.
0
.
3
commit
|
commitdiff
|
tree
2007-02-28
J
u
nio C
H
a
mano
Documen
t
a
t
i
on: git-remote
a
d
d
[-t <branch>]
[-m <branch
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-28
J
u
nio
C
Ha
m
ano
index_fd(): co
n
ver
t
b
l
ob on
l
y if it is a regular file
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-28
Junio C H
a
m
a
n
o
i
n
de
x
_fd(): pass optional path parameter as
hint
f
or
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-28
J
u
nio
C
Hama
n
o
index_fd(): use e
n
um object_type inste
a
d of ty
p
e
n
ame
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hamano
M
e
r
g
e
branch 'np/
t
y
pes'
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hamano
Merge branch 'mc/sendmail'
commit
|
commitdiff
|
tree
2007-02-28
Junio C
H
amano
Merge branc
h
'js/diff-ni'
(
earl
y
part)
commit
|
commitdiff
|
tree
2007-02-28
Junio C
H
amano
Merge branch 'm
a
i
n
t'
commit
|
commitdiff
|
tree
2007-02-27
Junio C Hamano
Mak
e
'cvs ci' lockless in gi
t
-cvsserver by
u
si
n
g git
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-27
J
unio
C Hamano
M
e
rge branch
'
maint'
commit
|
commitdiff
|
tree
2007-02-27
Junio C Hamano
g
it-apply:
do not fix
wh
i
tespaces on
c
ontext li
n
es
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-26
Jun
i
o
C
Hama
n
o
M
er
g
e bra
n
ch 'master'
into js/diff
-
ni
commit
|
commitdiff
|
tree
2007-02-26
Jun
i
o C Hamano
Docume
n
tat
i
on: link i
n
1
.
5
.
0
.
2 material to the top
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-26
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-02-26
J
u
n
i
o 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
Hamano
Docum
e
ntation: desc
r
ib
e
"
-f/-t
/
-m" op
t
ion
s
t
o "gi
t
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-26
Ju
n
io C Hamano
di
f
f
--cc: fix display of symlink
c
o
nflicts
d
uring
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-26
Junio C Hamano
Merg
e
b
r
a
n
ch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-02-26
Junio C Hamano
Merge
b
ranch
'jc/merge-sym
l
ink
'
in
t
o
m
aint
commit
|
commitdiff
|
tree
2007-02-26
Junio C Hamano
merge-recursive
:
fix
l
ongs
t
andin
g
b
ug
i
n
m
er
g
ing sym
l
inks
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-26
Ju
n
io
C Hamano
me
r
ge-index: fix
longstanding
bug in m
e
rging symlinks
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-25
Junio C Hamano
diff --cach
e
d: give more sensible erro
r
me
s
sage
when
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-25
J
u
n
io
C
Hamano
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2007-02-25
Juni
o
C Hamano
Ad
d
Release Not
e
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 Hamano
re
r
e
re: do not d
e
al with symlinks
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-25
Junio C Hamano
rerere:
do
not s
k
ip two
conflicted path
s
next
t
o
e
ach
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-25
Junio C Hama
n
o
Merge git://repo
.
or
.
cz/git-gui into
m
aint
commit
|
commitdiff
|
tree
2007-02-25
Junio C Hamano
Don
'
t modif
y
CRE
D
ITS-
F
I
L
E if it
h
as
n
'
t
chan
g
ed
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-24
Ju
n
io C Haman
o
Ev
i
l Merge branch 'jc/status' (early
p
a
r
t) i
n
t
o js
.
.
.
commit
|
commitdiff
|
tree
2007-02-24
Junio C Haman
o
Merg
e
branch 'js
/
apply'
commit
|
commitdiff
|
tree
2007-02-24
Junio C Hamano
Merge
b
ran
c
h 'j
s
/no
-
limit-
b
ounda
r
y'
commit
|
commitdiff
|
tree
2007-02-24
Junio
C
Haman
o
Merge
b
r
anch '
j
s/etc
-
config'
commit
|
commitdiff
|
tree
2007-02-24
Juni
o
C Hama
n
o
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2007-02-24
Ju
n
i
o C Hamano
d
i
f
f-
p
atch: A
v
o
id e
m
it
t
i
ng doub
l
e-s
l
a
s
hes in t
e
xtual
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-24
Junio C
H
a
mano
bund
l
e
:
reword
missing prerequisi
t
e error
message
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-24
Junio
C Hamano
Rewo
r
d git-am 3-way fallback failur
e
me
s
sage
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-23
Junio C Hamano
.
m
a
ilmap maintenance after
p
ulling from git
-
svn
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-23
Junio C
Hamano
Merge branches 'lt/
c
rl
f
'
a
nd 'j
c
/apply-
c
onf
i
g'
commit
|
commitdiff
|
tree
2007-02-23
J
u
nio C
Hamano
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-02-22
J
u
nio C Hama
n
o
r
un
_
diff
_
{fi
l
e
s
,index}(
)
:
upda
t
e cal
l
ing convention
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-22
Junio
C Haman
o
update
-
index:
do no
t
d
i
e too
e
a
r
l
y in
a
read-only reposi
t
ory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-22
Juni
o
C Hamano
git-status: do
n
ot be to
t
ally
us
e
less in a read-onl
y
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-22
Junio C Hamano
t
4119: t
e
st autocom
p
utin
g
-p<n>
for traditi
o
nal diff
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-22
Ju
n
io C
H
a
man
o
g
i
t
-a
p
ply:
g
u
e
s
s
cor
r
e
c
t -p
<
n> v
a
lue for n
o
n-git patches
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-21
Junio C Hamano
git-apply: notice "di
f
f -
-
git" patch
ag
a
in
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-21
Junio C Hamano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2007-02-21
J
u
nio C
Ham
a
n
o
Merg
e
bra
n
ch
'
m
a
ster' of git://r
e
po
.
or
.
cz/gi
t
-
gu
i
into
.
.
.
commit
|
commitdiff
|
tree
2007-02-21
Junio C Hamano
Fix
b
otched "l
e
ak fix"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-21
Ju
n
io C Hamano
t4119: add test for
t
rad
i
tional patch and diff
e
ren
t
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-21
Junio C Ham
a
no
Merge b
r
anc
h
'fk
/
autoco
n
f'
commit
|
commitdiff
|
tree
2007-02-21
Junio C Ham
a
no
Merg
e
b
r
anch 'js/
n
ame-rev-f
i
x'
commit
|
commitdiff
|
tree
2007-02-21
Junio C Hamano
prefixc
m
p(): fi
x
-up
left
o
ver s
t
rncmp()
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-21
Junio C Hamano
pr
e
fixcmp(): f
i
x
-
up mechanical
conversion
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-21
Jun
i
o
C
H
a
mano
Mechanical conversion to use p
r
e
fixcmp()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-21
J
unio
C
H
a
mano
Add pr
e
fixcmp()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-21
Junio C Ha
m
ano
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2007-02-20
Junio C Hamano
Link 1
.
5
.
0
.
1 documentation fro
m
the main page
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-20
Ju
n
io C
Hamano
git-apply: re
q
uire
-p<n
>
when wor
k
ing in a subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-20
Junio
C Hamano
git-apply: do
not lose cwd
w
hen run fro
m
a subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-20
Junio C Hamano
M
erge branch 'js/diff-color
-
check'
commit
|
commitdiff
|
tree
2007-02-20
Junio C Hamano
Merge branch 'jc/
f
etch-nota
g
s'
commit
|
commitdiff
|
tree
2007-02-20
Junio C Hamano
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2007-02-19
Junio C Hamano
Merg
e
b
r
anch 'ap/cvsserver'
commit
|
commitdiff
|
tree
2007-02-19
Juni
o
C
H
a
m
ano
Merg
e
b
r
a
n
c
h
'maint'
commit
|
commitdiff
|
tree
2007-02-19
Junio
C H
a
ma
n
o
GIT 1
.
5
.
0
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-18
J
u
ni
o
C Hama
n
o
Teach 'git a
p
p
l
y' to
look at $
H
OME/
.
g
i
t
config
e
v
en
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-18
Junio C
H
ama
n
o
Update d
r
aft 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
b
ranch 'm
a
int'
commit
|
commitdiff
|
tree
2007-02-18
Ju
n
i
o C H
a
m
a
no
Update d
r
aft releas
e
notes for 1
.
5
.
0
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-18
Junio
C
Hamano
Merge
g
it://git
.
kernel
.
org/pub/
s
cm/gitk/gitk into main
t
commit
|
commitdiff
|
tree
2007-02-17
Junio
C
Hama
n
o
T
each core
.
auto
c
rlf to 'git
a
p
p
ly
'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-17
Junio C Ha
m
ano
Teach '
g
it apply' to look
a
t
$GIT_DIR/config
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-17
Juni
o
C Hamano
D
o not take mode bits from index after type c
h
a
n
ge
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-16
Jun
i
o C Hamano
Mer
g
e
bran
c
h 'maint'
commit
|
commitdiff
|
tree
2007-02-16
Junio C Haman
o
g
i
t-merge:
m
i
n
o
r
fix for no
_
t
r
ivial_merge_strategies
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-16
Junio
C
Hamano
Merg
e
branch 'm
a
i
n
t
'
commit
|
commitdiff
|
tree
next