repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jc/fetch'
2007-03-14
Jun
i
o C Hamano
M
erge bran
c
h 'jc/fetch'
commit
|
commitdiff
|
tree
2007-03-14
Juni
o
C Ha
m
an
o
Merge branch
'dz/mailin
f
o
'
commit
|
commitdiff
|
tree
2007-03-14
Junio C
H
amano
Mer
g
e branch 'jb/per-
u
ser-exc
l
ude'
commit
|
commitdiff
|
tree
2007-03-14
Jun
i
o C
H
a
m
ano
Merge br
a
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-03-14
Junio C Hamano
Merge branch 'p
b
/br
a
nch-trac
k
'
commit
|
commitdiff
|
tree
2007-03-14
Junio C Ham
a
n
o
shortlog: promp
t
when reading from terminal by mistake
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-14
J
u
nio
C
H
a
mano
Documenta
t
ion: add git-mergeto
o
l to
th
e
c
o
mmand list
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-14
Junio C Hamano
M
erge
b
ranch 'master' of g
i
t://repo
.
or
.
cz/git/mer
g
et
o
ol
commit
|
commitdiff
|
tree
2007-03-13
J
unio C Hamano
Merge branch 'master' of git://repo
.
o
r
.
cz/git-gui
commit
|
commitdiff
|
tree
2007-03-13
Junio C Hamano
Me
r
g
e branch 'main
t
'
commit
|
commitdiff
|
tree
2007-03-13
Junio C Hamano
M
erge
branch 'master
'
of git://repo
.
or
.
c
z
/
g
it/fastimp
o
rt
commit
|
commitdiff
|
tree
2007-03-13
Junio C Hamano
M
e
rge branch 'maint' of
git://repo
.
or
.
cz/git/fastimport
.
.
.
commit
|
commitdiff
|
tree
2007-03-12
Jun
i
o C Hamano
M
e
rge branch 'maint' of git://
r
e
p
o
.
or
.
cz/
g
it-
g
ui
i
nto
.
.
.
commit
|
commitdiff
|
tree
2007-03-12
Junio C Hamano
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2007-03-12
Junio C Hamano
Merge bran
c
h
'jc/boundary'
commit
|
commitdiff
|
tree
2007-03-11
Jun
i
o
C Ham
a
no
Fix b
r
oken create_bran
c
h() in builtin-bran
c
h
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-11
Junio C H
a
mano
Merge br
a
nch 'js/attach'
commit
|
commitdiff
|
tree
2007-03-11
Jun
i
o C Hamano
Me
r
ge branch 'js/diff-ni'
commit
|
commitdiff
|
tree
2007-03-11
J
u
nio C Hamano
Merge bra
n
ch
'
jc
/
f
s
ck'
commit
|
commitdiff
|
tree
2007-03-11
Junio C Hamano
Merge branch 'pb/c
o
mmit-i'
commit
|
commitdiff
|
tree
2007-03-11
Juni
o
C Hamano
Mer
g
e bra
n
ch 'js/
r
evert-cherry
'
commit
|
commitdiff
|
tree
2007-03-11
Junio
C
H
a
m
a
no
Merge branch 'sp/make'
commit
|
commitdiff
|
tree
2007-03-11
J
uni
o
C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-03-11
Junio C
H
amano
M
e
rge branch 'maint' of git://linux-nfs
.
org
/
~bfields
.
.
.
commit
|
commitdiff
|
tree
2007-03-08
Junio C
Hamano
M
erge branch
'j
s
/con
f
ig-rename'
commit
|
commitdiff
|
tree
2007-03-08
Junio C
Hama
n
o
Merge
b
ranch 'ma
s
ter' of git://
r
e
p
o
.
o
r
.
cz/git/fastimpor
t
commit
|
commitdiff
|
tree
2007-03-07
Ju
n
io C Hamano
M
erge branch
'
mai
n
t
'
commit
|
commitdiff
|
tree
2007-03-06
Junio C Haman
o
rev
i
s
ion --b
o
undary:
fi
x
unco
u
nte
d
case
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-06
Junio C Hamano
revision -
-
bou
n
dary: fix stupid
typo
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-06
Junio C Ha
m
ano
git-bundle: make ver
i
fy a b
i
t mor
e
chatty
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-06
Junio
C
H
a
mano
revisi
o
n
t
r
a
v
e
r
sal:
SHOWN me
a
ns show
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-06
Junio C Hamano
gi
t
-bu
n
dle: various fixups
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-06
Junio C Ham
a
no
revision traversal:
r
e
t
ire BOUND
A
RY_SHOW
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-06
Jun
i
o C Hamano
r
e
vision walker:
F
ix
--boun
d
a
r
y when limi
t
ed
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-06
Junio C
Hamano
Mer
g
e branch '
m
aint'
commit
|
commitdiff
|
tree
2007-03-06
Junio C Hamano
Merge branch 'mas
t
er' of gi
t
://repo
.
or
.
cz/git
-
g
ui
into
.
.
.
commit
|
commitdiff
|
tree
2007-03-06
J
unio C Ha
m
a
n
o
git-bundle: fix pack generation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-06
Ju
n
i
o C
Ham
a
n
o
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2007-03-06
J
u
n
i
o C Hamano
git
-
commit: cd to to
p
before sh
o
wing the final stat
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-06
Ju
n
io C
H
amano
Merge branch 'master-for-junio' of git:/
/
r
e
p
o
.
or
.
cz
.
.
.
commit
|
commitdiff
|
tree
2007-03-06
Junio C Hamano
Merge
b
ranch 'maint-for-junio' of
g
it://repo
.
or
.
cz
.
.
.
commit
|
commitdiff
|
tree
2007-03-05
Junio
C
Hamano
fsck: e
x
it with non-zero
s
t
a
tus upon errors
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-05
J
u
nio C Ham
a
no
u
n
pack_sha1_file():
d
e
t
ect corru
p
t
l
oos
e
o
b
je
c
t fil
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-05
Junio C Hamano
fsck: fix broken loose ob
j
ect check
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-05
Junio C Hamano
P
o
st 1
.
5
.
0
.
3 cleanup
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-05
Junio C Ham
a
no
f
o
rma
t
-pa
t
ch --attach: not folding som
e
l
o
ng heade
r
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-05
Junio C Hamano
M
erge branch 'js/fetch-progress' (e
a
rly part)
commit
|
commitdiff
|
tree
2007-03-05
Junio C Hamano
M
erge b
r
anch
'j
s
/sy
m
l
i
n
k'
commit
|
commitdiff
|
tree
2007-03-05
Junio C Ham
a
no
Mer
g
e bran
c
h
'
mai
n
t'
commit
|
commitdiff
|
tree
2007-03-05
Junio C Hamano
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
amano
.
gitign
o
re: add git-
f
et
c
h--tool
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-04
Junio C H
a
ma
n
o
diff-ni: fix the diff with s
t
anda
r
d input
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-04
Junio
C
Hamano
diff
-
n
i
: allow running
f
ro
m
a
subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-04
Junio C Ha
m
ano
Me
r
ge
bra
n
ch 'js
/
d
i
ff-ni' (earl
y
p
art)
commit
|
commitdiff
|
tree
2007-03-04
Junio C Haman
o
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2007-03-03
Junio C
H
amano
git-merge: fail correc
t
ly when we cannot fast forwar
d
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-03
J
u
nio C Ha
m
a
n
o
Merge
b
ranc
h
'ma
i
nt'
commit
|
commitdiff
|
tree
2007-03-02
Junio C Hamano
Merge
b
ranch 'js/
c
ommit-format'
commit
|
commitdiff
|
tree
2007-03-02
Juni
o
C
Hama
n
o
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-03-01
Junio C
H
amano
builtin-fetch--tool: fix reflog n
o
tes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-01
Ju
n
io C H
a
mano
git-fetch: re
t
ire u
p
d
a
te-lo
c
al-ref wh
i
c
h is not
use
d
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-28
Junio C
H
aman
o
Add r
e
c
e
nt chan
g
es to d
r
a
f
t 1
.
5
.
1 release notes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-28
Junio C
H
amano
Merge branch
'
js/commit-b
y
-name'
commit
|
commitdiff
|
tree
2007-02-28
Junio C H
a
mano
M
erge branc
h
'js
/
bundle'
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hamano
Me
r
ge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2007-02-28
J
unio C Hamano
Start prepa
r
ing Release No
t
e
s for 1
.
5
.
0
.
3
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hamano
Doc
u
mentation: git-
r
emo
t
e
add [-t <branch>] [
-
m <br
a
n
ch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-28
Jun
i
o C
H
amano
index_fd()
:
convert blob o
n
ly
i
f
it is
a regular fil
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hamano
index_fd(): p
a
ss optional
path paramete
r
as hint f
o
r
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-28
J
u
n
io C
H
amano
in
d
ex_fd(): use enum
o
b
ject_
t
y
p
e
ins
t
ead of typ
e
nam
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hama
n
o
M
e
r
ge branch 'n
p
/
types'
commit
|
commitdiff
|
tree
2007-02-28
Junio C
H
aman
o
bu
i
ltin-fetch
-
-tool: make sure not to o
v
erstep ls-
r
emote
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hamano
Merge branch 'mc/sendmail'
commit
|
commitdiff
|
tree
2007-02-28
Jun
i
o C
H
ama
n
o
Mer
g
e bra
n
ch 'js
/
diff-ni' (ear
l
y part)
commit
|
commitdiff
|
tree
2007-02-28
Junio C H
a
m
an
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-02-28
Jun
i
o C Hamano
fetch--tool: fix uninitialize
d
b
u
ffer wh
e
n
r
eading
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-27
Junio
C
Hamano
Make 'cvs c
i
'
l
o
ckless in git
-
cvsserver
b
y using gi
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-27
Jun
i
o C Haman
o
built
i
n-fetch
-
-tool: adjust to
u
p
d
ated
sha1_object_in
f
o
()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-27
Junio C Hamano
M
erge b
r
anch 'np/t
y
pes' into
j
c/fetch
commit
|
commitdiff
|
tree
2007-02-27
Junio C Hamano
Merge branch
'maint'
commit
|
commitdiff
|
tree
2007-02-27
Junio
C
Hamano
git
-
apply: do no
t
fix whitespace
s
on
c
ont
e
xt lines
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
Junio C
H
amano
Merge branch 'master'
i
n
to js
/
d
i
ff-ni
commit
|
commitdiff
|
tree
2007-02-26
Junio
C Hamano
D
ocume
n
tation: link in 1
.
5
.
0
.
2 m
a
terial to the top
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
Jun
i
o C Hamano
Merge branc
h
'
maint'
commit
|
commitdiff
|
tree
2007-02-26
J
unio C H
a
mano
GIT 1
.
5
.
0
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
Junio C Ham
a
no
Doc
u
m
entat
i
o
n: describe
"
-f/-t/-m" options to "git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
Junio C
Hamano
dif
f
-
-
cc: fix displa
y
of
s
ym
l
ink co
n
flict
s
d
u
ring
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
Junio C Ha
m
ano
M
erge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2007-02-26
Junio C Hamano
Merge bra
n
ch 'jc/merge-s
y
mlink' into maint
commit
|
commitdiff
|
tree
2007-02-26
Jun
i
o C Ha
m
ano
merge-recursive: fix
long
s
ta
n
ding bug in
m
erging sy
m
links
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
Jun
i
o C
Hamano
merge-index: fix longstanding bug in merg
i
ng
symlinks
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
Junio C Hama
n
o
d
i
ff --cached
:
giv
e
more sensible error messa
g
e
w
hen
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
Junio
C
Hamano
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2007-02-25
Junio C Haman
o
A
d
d
Release
N
otes
to prep
a
r
e
for 1
.
5
.
0
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
Junio C Hamano
rere
r
e: do not deal w
i
th
s
ymlinks
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
Junio C Ham
a
n
o
rere
r
e:
d
o not ski
p
two conflict
e
d paths
n
e
x
t to each
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
Junio
C Haman
o
Merge git://repo
.
or
.
cz/
g
it
-
g
ui
i
nto m
a
in
t
commit
|
commitdiff
|
tree
2007-02-25
Junio
C H
a
m
ano
Don't mo
d
if
y
CR
E
DITS-FILE if it hasn't c
h
anged
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-24
J
unio
C
Hamano
g
i
t
-fetch--t
o
o
l takes
flags before the subcom
m
a
n
d
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-24
Junio
C
Ha
m
ano
Evil Me
r
ge branch
'
jc/status' (early part) in
t
o js
.
.
.
commit
|
commitdiff
|
tree
next