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-11
Junio C Hama
n
o
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2007-03-11
Junio C Haman
o
Me
r
ge branch
'
m
ai
n
t' of git
:
//l
i
nux-nfs
.
org/~
b
f
i
e
lds
.
.
.
commit
|
commitdiff
|
tree
2007-03-08
Juni
o
C Haman
o
Merge b
r
anch '
j
s/conf
i
g-rename'
commit
|
commitdiff
|
tree
2007-03-08
Junio C Hamano
Merge branch
'
master' of git://repo
.
or
.
c
z
/git/fastimpo
r
t
commit
|
commitdiff
|
tree
2007-03-07
Junio C
Hamano
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-03-06
J
u
nio
C
Hamano
Merge branch
'
ma
i
nt'
commit
|
commitdiff
|
tree
2007-03-06
J
unio C Hamano
Merge
b
ranch 'mas
t
er' of git
:
//repo
.
or
.
cz/git-gui into
.
.
.
commit
|
commitdiff
|
tree
2007-03-06
Junio C Hamano
g
i
t-bundle: fix pack g
e
neration
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-06
Junio C Hamano
Merge b
r
anch 'main
t
'
commit
|
commitdiff
|
tree
2007-03-06
Junio
C
Hamano
git-commit: cd to top before sh
o
wing the final stat
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-06
J
unio C Hama
n
o
Merge br
a
nc
h
'master-for-jun
i
o' of git://
r
epo
.
or
.
cz
.
.
.
commit
|
commitdiff
|
tree
2007-03-06
Junio C Ham
a
no
Mer
g
e
bran
c
h 'maint-fo
r
-junio' of git://repo
.
or
.
cz
.
.
.
commit
|
commitdiff
|
tree
2007-03-05
Junio C
Hama
n
o
Post 1
.
5
.
0
.
3 clean
u
p
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-05
Junio
C
H
ama
n
o
M
e
rge bran
c
h 'js/fetch-progress
'
(early pa
r
t)
commit
|
commitdiff
|
tree
2007-03-05
Junio
C
Ham
a
no
Merge bra
n
ch 'js/s
y
mlink'
commit
|
commitdiff
|
tree
2007-03-05
Junio
C H
a
mano
Merge branch 'mai
n
t
'
commit
|
commitdiff
|
tree
2007-03-05
J
u
nio C Hamano
GIT 1
.
5
.
0
.
3
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-04
Junio
C
Ha
m
ano
diff-ni: allow running from a subdirect
o
ry
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-04
J
u
nio C Haman
o
Merge bra
n
ch 'js/diff
-
ni'
(ea
r
ly part)
commit
|
commitdiff
|
tree
2007-03-04
J
u
nio C Hamano
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-03-03
Jun
i
o C Hamano
git-merge:
f
a
il correct
l
y when w
e
cannot fa
s
t forward
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-03
Ju
n
i
o
C
Hamano
M
erge branch 'm
a
int'
commit
|
commitdiff
|
tree
2007-03-02
J
un
i
o C Hamano
Merge
b
ranch 'js/commi
t
-format'
commit
|
commitdiff
|
tree
2007-03-02
Junio C Hamano
Merge branch
'
ma
i
n
t'
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hamano
Add recent changes
to draft
1
.
5
.
1
re
l
ease notes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-28
Junio C H
a
mano
M
erge bran
c
h
'
js/commit-by-
n
ame'
commit
|
commitdiff
|
tree
2007-02-28
J
u
nio
C
Hamano
Me
r
ge branch
'
j
s
/bundle'
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hamano
M
e
rge bran
c
h
'
m
a
int'
commit
|
commitdiff
|
tree
2007-02-28
Juni
o
C Hamano
Start prepar
i
n
g Release
No
t
e
s f
o
r 1
.
5
.
0
.
3
commit
|
commitdiff
|
tree
2007-02-28
Ju
n
io C H
a
ma
n
o
Docu
m
entation: git
-
r
emo
t
e add [-t <branch>] [-m <
b
r
a
nch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-28
Junio C Ha
m
ano
i
ndex_fd(): conve
r
t blob only if it is a regul
a
r file
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-28
Jun
i
o
C Hamano
index_fd()
:
pass o
p
tional
p
ath param
e
te
r
as hint
f
o
r
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hamano
index_f
d
():
use enum ob
j
e
ct_type
i
ns
t
ead of type name
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-28
J
unio
C
Hamano
Merge branch 'np/types
'
commit
|
commitdiff
|
tree
2007-02-28
J
unio C Ha
m
a
no
M
e
rge b
r
anch '
m
c/sendmail'
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hamano
Merge bra
n
ch 'j
s
/diff-ni' (early part)
commit
|
commitdiff
|
tree
2007-02-28
J
unio C Hamano
Merge bra
n
ch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-02-27
Junio C Ha
m
ano
Make 'cvs ci' lo
c
kless in
git-cvsserver by us
i
ng git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-27
Jun
i
o C H
a
mano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-02-27
Junio C H
a
mano
g
it-apply: do
n
ot fix w
h
itespace
s
on context lines
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
Jun
i
o C Hamano
Merge bra
n
ch 'master'
i
nto js/diff-ni
commit
|
commitdiff
|
tree
2007-02-26
Junio C Hamano
Documentation: link i
n
1
.
5
.
0
.
2
material
to
t
h
e
top
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
Juni
o
C Hamano
Mer
g
e
branch
'maint'
commit
|
commitdiff
|
tree
2007-02-26
Junio C Haman
o
G
IT 1
.
5
.
0
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
Junio C H
a
m
ano
Documentatio
n
: d
e
scri
b
e
"
-f/-t/-m" optio
n
s
to "git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
Junio
C
Haman
o
diff
-
-
cc: fix dis
p
lay
of symlink conflic
t
s
d
u
ring
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
J
unio C Hamano
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2007-02-26
J
u
nio C Hamano
Merge
b
ran
c
h 'jc/mer
g
e-
s
y
m
l
ink' into
maint
commit
|
commitdiff
|
tree
2007-02-26
Junio C Hamano
merge-recursive: fix
l
ongstanding bug i
n
merg
i
ng sy
m
l
i
nks
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
J
u
nio C
Hamano
merge-
i
nde
x
: fi
x
l
o
n
g
s
t
anding bug in
m
e
r
g
i
ng syml
i
nk
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
Junio
C
H
ama
n
o
diff --c
a
c
hed: give
mor
e
sensible erro
r
messag
e
when
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
Junio
C
Hamano
M
e
rg
e
branch 'm
a
int'
commit
|
commitdiff
|
tree
2007-02-25
Junio C Ha
m
ano
Add
R
e
leas
e
Notes to prep
a
re
for 1
.
5
.
0
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
Junio C Ha
m
ano
rerer
e
: do
not deal with symlinks
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
J
unio C Ham
a
no
rerere:
do not
skip
t
wo c
o
nflic
t
ed paths n
e
x
t to each
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
J
u
nio
C Hamano
M
e
rge git://re
p
o
.
o
r
.
c
z/git-gui into
maint
commit
|
commitdiff
|
tree
2007-02-25
Junio C Hamano
Don't modify
C
R
E
DI
T
S
-
FILE if it hasn't change
d
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-24
Junio C
H
a
mano
Evil M
e
rge b
r
anch
'
jc/s
t
a
tus
'
(early part)
i
nto js
.
.
.
commit
|
commitdiff
|
tree
2007-02-24
Junio C Hamano
M
er
g
e bra
n
ch 'j
s
/
a
pply'
commit
|
commitdiff
|
tree
2007-02-24
Juni
o
C
Ha
m
ano
Merge
br
a
nch 'js/no
-
limi
t
-boundar
y
'
commit
|
commitdiff
|
tree
2007-02-24
Junio C
H
a
m
ano
Merge branch 'js
/
etc-config'
commit
|
commitdiff
|
tree
2007-02-24
Junio C
H
aman
o
M
erg
e
branch '
m
aint'
commit
|
commitdiff
|
tree
2007-02-24
Juni
o
C Haman
o
diff-
p
atch: Avoid emi
t
ting d
o
uble-s
l
ash
e
s in tex
t
ual
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-24
Junio
C
Hama
n
o
bundle: reword
missing
p
rerequisi
t
e error mess
a
g
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-24
J
un
i
o
C
Hamano
Rewor
d
git
-
am 3-way fa
l
l
b
a
c
k fail
u
r
e
mes
s
age
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-23
Junio C Hamano
.
mailmap mainten
a
nce after pulling from
git-sv
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-23
Junio C
H
ama
n
o
Merge branches '
l
t
/crlf' and '
j
c/apply-conf
i
g'
commit
|
commitdiff
|
tree
2007-02-23
J
u
n
io C Hama
n
o
Merge branch
'maint'
commit
|
commitdiff
|
tree
2007-02-22
Junio C Hama
n
o
run_diff
_
{fil
e
s,i
n
dex}()
:
update callin
g
c
o
nven
t
ion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-22
Junio C
H
am
a
no
updat
e
-index: do not d
i
e too early
in a read-only repository
.
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 total
l
y useless i
n
a re
a
d-
o
n
ly
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-22
J
u
ni
o
C Hamano
t
4
1
1
9: test autocomputi
n
g -p<
n
>
for traditional diff
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-22
J
u
n
io
C Hama
n
o
g
it
-
apply: guess co
r
r
ect
-
p<n
>
value for non-git
patches
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
J
unio C Hamano
git-apply: notice "diff --git" patch again
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
Jun
i
o
C
Hamano
Merge b
r
an
c
h
'maint'
commit
|
commitdiff
|
tree
2007-02-21
Junio C Hamano
Merge branc
h
'ma
s
ter' of git://
r
e
p
o
.
or
.
cz/git-gui
i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2007-02-21
Junio C Hamano
Fix bot
c
hed "leak fix"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
Junio
C
Hamano
t4119:
add
te
s
t for tr
a
ditional patch and dif
f
erent
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
J
u
ni
o
C Hamano
Mer
g
e
b
ranch
'
fk/autoconf'
commit
|
commitdiff
|
tree
2007-02-21
J
uni
o
C Ham
a
no
Merge branch 'js/name-r
e
v-fix'
commit
|
commitdiff
|
tree
2007-02-21
Junio
C
H
aman
o
pre
f
ix
c
mp(): fix-up
leftover strncmp()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
Jun
i
o C Hamano
p
refix
c
mp(): fix-u
p
mechanical conve
r
sion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
Ju
n
io C Hamano
Mechanical conversion to use prefixcmp()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
Juni
o
C H
a
mano
Add
p
refixcmp()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
Juni
o
C
H
a
mano
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2007-02-20
Junio C Ham
a
n
o
Lin
k
1
.
5
.
0
.
1 documentation from
t
h
e main
p
age
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-20
Junio C Ham
a
no
git
-
apply: require -p<n>
w
hen work
i
ng in a subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-20
J
u
n
i
o C
H
amano
git
-
apply:
do not
lose
c
w
d whe
n
run fro
m
a subdi
r
e
c
tor
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-20
J
un
i
o C
H
amano
Merge branch 'js/d
i
ff-color
-
c
h
eck'
commit
|
commitdiff
|
tree
2007-02-20
Junio
C
H
amano
Merge branch
'
jc
/
fetch-notags'
commit
|
commitdiff
|
tree
2007-02-20
Ju
n
io C H
a
m
ano
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-02-19
Junio C Hamano
Merge branch 'a
p
/
c
v
sserver'
commit
|
commitdiff
|
tree
2007-02-19
Junio C Hamano
Merge
bran
c
h 'maint'
commit
|
commitdiff
|
tree
2007-02-19
J
unio C
Hama
n
o
GIT 1
.
5
.
0
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-18
Junio C Hama
n
o
Teac
h
'git apply' to look at $HOME/
.
gitcon
f
ig even
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-18
Ju
n
i
o C Hamano
Upd
a
te draft release notes for
1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-18
Junio C
H
amano
Merge
branch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-02-18
Ju
n
io
C Hamano
Update draft re
l
ease 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 git://g
i
t
.
ke
r
nel
.
org/pub
/
s
c
m/gitk/git
k
i
n
t
o
m
a
int
commit
|
commitdiff
|
tree
2007-02-17
J
uni
o
C
H
amano
Te
a
ch cor
e
.
autocrlf
to 'git apply'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next