repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Fix twoway_merge that passed d/f conflict marker to merged_entry().
2007-03-11
Junio C H
a
mano
Mer
g
e
b
ranch
'jc/fsck'
commit
|
commitdiff
|
tree
2007-03-11
J
u
n
i
o C
H
a
mano
Merge branch 'pb/commit-i'
commit
|
commitdiff
|
tree
2007-03-11
Junio C
H
amano
Merge branch 'j
s
/revert-cherry'
commit
|
commitdiff
|
tree
2007-03-11
Junio C
H
a
mano
Me
r
ge branc
h
'sp/m
a
ke'
commit
|
commitdiff
|
tree
2007-03-11
Junio C Hamano
Merge
b
ranch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-03-11
Junio C Hamano
Merge bra
n
ch 'main
t
' of git://linux-nfs
.
o
r
g/
~
b
f
ields
.
.
.
commit
|
commitdiff
|
tree
2007-03-08
Junio C Hamano
Merge branch 'js/config-renam
e
'
commit
|
commitdiff
|
tree
2007-03-08
Junio C Ham
a
no
Merge branch 'master' of
g
it:
/
/repo
.
or
.
cz/
g
it
/
fastimport
commit
|
commitdiff
|
tree
2007-03-07
Junio C Ha
m
an
o
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2007-03-06
Junio C Ha
m
ano
re
v
ision
-
-
b
oundary:
fix unco
u
nt
e
d
case
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-06
Junio C H
a
man
o
revision --
b
ou
n
dary:
f
ix s
t
u
pid typo
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-06
Ju
n
io C Hamano
git-bundle: mak
e
verify a bit more chat
t
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-06
Junio C
Hamano
rev
i
s
i
on tr
a
versa
l
: SHOWN means sh
o
wn
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-06
Junio C Hamano
git-bundle: variou
s
f
ixups
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-06
Junio C Hamano
re
v
i
s
ion traversal: r
e
tire
B
OUNDAR
Y
_
SHOW
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-06
J
u
nio C Hamano
revision w
a
lker:
F
i
x --boundary whe
n
limited
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-06
Junio C Ha
m
ano
Merge
branch '
m
aint'
commit
|
commitdiff
|
tree
2007-03-06
Junio C Hamano
Merge
branch
'mas
t
er' of git://repo
.
or
.
cz/git-gui into
.
.
.
commit
|
commitdiff
|
tree
2007-03-06
J
u
ni
o
C Hamano
gi
t
-bundle: fix pack gen
e
rat
i
o
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-06
Junio C Ha
m
ano
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-03-06
J
unio C Hamano
git-commi
t
:
c
d
t
o top before showing
th
e
fin
a
l
s
t
a
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-06
Juni
o
C
H
aman
o
Mer
g
e branch '
m
aster-for-
j
u
n
io' of git://repo
.
or
.
cz
.
.
.
commit
|
commitdiff
|
tree
2007-03-06
J
u
nio C Ham
a
no
Mer
g
e branch 'm
a
i
n
t-for
-
junio' o
f
git
:
//repo
.
or
.
c
z
.
.
.
commit
|
commitdiff
|
tree
2007-03-05
Ju
n
io C Hamano
fsck: exit with no
n
-zero stat
u
s upon err
o
rs
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-05
J
uni
o
C
H
amano
unpack_sha1_file(): detect corrupt loose object files
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-05
Jun
i
o
C Ha
m
ano
fsck: fix br
o
ken loose obj
e
ct ch
e
ck
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-05
Junio C Hamano
Post 1
.
5
.
0
.
3 cleanup
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-05
Juni
o
C Hamano
format-
p
atch --at
t
ac
h
: n
o
t
folding
s
ome long hea
d
ers
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-05
Ju
n
io C Hamano
Mer
g
e branch 'js/fetch-progress'
(early part)
commit
|
commitdiff
|
tree
2007-03-05
Junio C Hamano
M
er
g
e branch 'js/symlin
k
'
commit
|
commitdiff
|
tree
2007-03-05
Juni
o
C Hamano
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2007-03-05
J
u
nio
C
Hamano
G
IT 1
.
5
.
0
.
3
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-04
Junio C Hamano
.
gitignore: add
g
it-fetch--tool
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-04
Junio
C
Hamano
diff-ni: fix the diff with standard input
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-04
Junio C H
a
mano
diff-ni: allow running from a
s
ubdirector
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-04
Junio C Hamano
Merge
bran
c
h 'j
s
/diff-n
i
' (early part)
commit
|
commitdiff
|
tree
2007-03-04
J
unio C Hamano
Merge branch '
m
a
int'
commit
|
commitdiff
|
tree
2007-03-03
Junio C Ha
m
a
n
o
git-
m
erge:
f
ail
c
orr
e
ctly when we cannot fast forward
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-03
Junio C
H
amano
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-03-02
Junio C Ham
a
no
M
e
rge branch 'js/commi
t
-for
m
at'
commit
|
commitdiff
|
tree
2007-03-02
Junio C Hamano
Merge b
r
anch
'ma
i
n
t
'
commit
|
commitdiff
|
tree
2007-03-01
Junio
C
Hamano
builtin-fetch--tool: fix reflog note
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-01
Junio C Ham
a
no
git-fetch: retir
e
u
p
da
t
e
-local-ref which
is not used
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-28
Ju
n
io C Hamano
Add recent chang
e
s to draft 1
.
5
.
1 release
not
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-28
J
unio C Hamano
Mer
g
e br
a
nch 'js/commit-by
-
name'
commit
|
commitdiff
|
tree
2007-02-28
Junio C H
a
mano
Merge b
r
anch 'js/bundle
'
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hamano
M
e
rge
b
ran
c
h 'maint'
commit
|
commitdiff
|
tree
2007-02-28
Junio C H
a
m
ano
Start preparing Re
l
ea
s
e No
t
es for
1
.
5
.
0
.
3
commit
|
commitdiff
|
tree
2007-02-28
J
unio C H
a
mano
D
o
c
u
m
entation: g
i
t
-
remote add [-t <branch>] [
-
m <branch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hamano
index
_
fd(): convert blob only if it is a
r
e
gu
l
a
r
file
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-28
Juni
o
C
H
amano
index_fd
(
): pass optional path parameter a
s
hint for
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hamano
index_fd(): use enum
o
bje
c
t_type instead of type na
m
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-28
Ju
n
io C H
a
mano
Merge branch 'n
p
/type
s
'
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hama
n
o
bui
l
tin-fetch--tool: make
sure not to ov
e
r
s
te
p
ls-remote
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-28
Junio C Ha
m
an
o
Merge
branch 'mc/sendmail'
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hamano
Me
r
ge br
a
nch '
j
s
/
di
f
f-ni'
(
early p
a
rt)
commit
|
commitdiff
|
tree
2007-02-28
Junio
C
H
a
mano
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2007-02-28
J
u
nio C Hamano
fe
t
ch--tool:
f
ix uninitialize
d
buffer
w
hen rea
d
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-27
Juni
o
C Haman
o
Mak
e
'cvs ci'
l
ock
l
es
s
in gi
t
-cvsserver by u
s
i
ng git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-27
Junio
C Hamano
b
u
iltin-fetch--
t
ool: adjust to upda
t
ed s
h
a1_object_info()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-27
Junio
C Hamano
Merg
e
branch 'np/typ
e
s' into jc
/
f
e
t
ch
commit
|
commitdiff
|
tree
2007-02-27
Junio C
Ha
m
a
n
o
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2007-02-27
Junio C Ha
m
an
o
git-ap
p
ly:
do not f
i
x whit
e
s
p
aces
on context lines
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
Junio C
H
a
m
ano
Merge bran
c
h 'maste
r
' into js/diff
-
ni
commit
|
commitdiff
|
tree
2007-02-26
Junio
C
Hamano
D
ocu
m
ent
a
tion: li
n
k
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
Ju
n
io C Ham
a
no
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-02-26
Junio 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 Ha
m
ano
Documentation: des
c
ribe "-f/-t/-m"
options
to
"
g
i
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
Junio C Hamano
diff --cc: fix
d
ispl
a
y of
s
y
mlink conflicts during
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
J
u
nio C Haman
o
Merge branch
'
m
ain
t
'
commit
|
commitdiff
|
tree
2007-02-26
Jun
i
o C Ham
a
no
Merge branch
'j
c
/
merge-symlink' into maint
commit
|
commitdiff
|
tree
2007-02-26
J
u
n
io C Hamano
merge-rec
u
rsive: fix longstan
d
ing bug in
m
erging sy
m
links
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
Junio C H
a
mano
merge-index: fix longsta
n
di
n
g bug in mergin
g
symlinks
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
Ju
n
io C Hama
n
o
diff --ca
c
h
e
d: give more se
n
s
i
ble error
m
essage when
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
J
unio C Hamano
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2007-02-25
Junio
C
H
ama
n
o
Add Release Notes t
o
prepare for 1
.
5
.
0
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
Junio C
H
amano
rerere:
d
o not
d
eal with symlinks
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
Junio C Hamano
r
erere:
do not skip
two conflicted pa
t
hs next to each
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
Junio C H
a
mano
M
e
rge
git://repo
.
or
.
cz/git-gui into maint
commit
|
commitdiff
|
tree
2007-02-25
J
u
nio C Haman
o
D
on't modi
f
y CREDI
T
S-FILE if it hasn
'
t changed
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-24
Junio C H
a
mano
git-
f
e
t
c
h
--tool takes flag
s
b
efore the
s
ubcommand
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-24
Junio C
Hamano
E
vil Me
r
ge branch 'jc/st
a
tus' (ear
l
y
part) in
t
o
j
s
.
.
.
commit
|
commitdiff
|
tree
2007-02-24
Junio
C H
a
m
ano
Mer
g
e
b
r
a
n
ch 'js/apply
'
commit
|
commitdiff
|
tree
2007-02-24
Jun
i
o C H
a
m
ano
M
e
rge branch
'
j
s/
n
o-l
i
mit-boundar
y
'
commit
|
commitdiff
|
tree
2007-02-24
Junio C Hama
n
o
M
e
rge branch '
j
s/etc-conf
i
g'
commit
|
commitdiff
|
tree
2007-02-24
Junio
C
H
amano
M
e
r
ge
br
a
nch 'main
t
'
commit
|
commitdiff
|
tree
2007-02-24
Jun
i
o C Hamano
diff-p
a
t
c
h:
A
void emitti
n
g d
o
uble-slashes in
text
u
al
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-24
Junio
C Hamano
bu
n
dle: reword missi
n
g prer
e
quisite error message
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-24
Junio
C
Haman
o
Rew
o
rd gi
t
-am 3-
w
ay fallback failure
m
e
ssage
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-23
Junio C
H
a
mano
.
mailmap
maintenance after pul
l
ing f
r
om git-svn
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-23
Junio
C
Hamano
Merge branches '
l
t
/
crlf' a
n
d 'jc/app
l
y-config'
commit
|
commitdiff
|
tree
2007-02-23
Junio C
Hamano
Merge bra
n
ch '
m
aint'
commit
|
commitdiff
|
tree
2007-02-22
Junio C Hamano
run_diff_{fi
l
es
,
index}
(
): updat
e
calling convention
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-22
Ju
n
io C Hamano
update-index: do no
t
die too early in a read-only repository
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-22
J
unio C Hamano
git-status: do not be totally
u
s
eless in
a r
e
ad-only
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-22
Junio C Hamano
t
4119: test autocomputing -p<n
>
for traditiona
l
diff
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-22
J
u
nio C Hama
n
o
g
it-
a
p
pl
y
: guess co
r
rect -p<n> v
a
lue
f
or n
o
n-g
i
t pat
c
hes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
J
unio C
Hamano
git-apply: notice "diff --git"
p
atc
h
a
g
ain
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
J
u
nio C
H
a
man
o
Merge branch 'ma
i
n
t'
commit
|
commitdiff
|
tree
2007-02-21
J
u
n
io C Ham
a
no
M
erge b
r
anch 'master' of git:/
/
r
epo
.
or
.
cz/git-gui into
.
.
.
commit
|
commitdiff
|
tree
next