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
Keep rename/rename conflicts of intermediate merges while doing recursive merge
2007-03-31
Alex Rie
s
en
K
eep rename/rename c
o
nflic
t
s
o
f intermediate
m
erges
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-31
Jul
i
an P
h
illip
s
contrib/work
d
ir: add a sim
p
le
script to crea
t
e a wor
k
i
n
g
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-31
Andy
Parkins
Reimplement ema
i
ling pa
r
t of hooks
-
-update in contrib
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-31
Eri
c
Wong
git-svn: avoi
d
respewi
n
g
sim
i
lar err
o
r messag
e
s for
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-31
T
h
eodore Ts'o
Renam
e
wa
r
n() to warning() to fix
s
ymbol con
f
li
c
ts
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-31
D
o
n Zic
k
u
s
git-m
a
i
l
info fixes for
p
atch
m
unging
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-31
Jakub Narebski
gitwe
b
: Support
c
o
mpar
i
ng blo
b
s (files) with different
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
Junio C H
a
mano
Do n
o
t bother d
o
cumen
t
ing
fetch-
-
t
o
o
l
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
Junio C Hamano
Up
d
ate draf
t
release notes fo
r
1
.
5
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
J
unio C Ham
a
no
Mer
g
e branch '
m
ain
t
'
commit
|
commitdiff
|
tree
2007-03-30
Francis
D
aly
gi
t
-quilt
i
mpo
r
t /bin/sh-ism f
i
x
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
Chri
s
tian Couder
Bisect: Improve e
r
r
o
r
mes
s
age in "b
i
s
e
ct_next
_
c
h
e
c
k"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
Junio
C Hamano
Merge br
a
nch 'master' of git
:
/
/
re
p
o
.
or
.
cz/git/m
e
rgetool
.
g
i
t
commit
|
commitdiff
|
tree
2007-03-29
H
.
Pet
e
r Anvin
git-up
l
oad-pack: make sure
we clo
s
e unused pipe ends
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-29
Gerrit Pape
Docu
m
entation/gi
t
-rev-parse
.
txt: f
i
x
e
x
ample in SPECIFY
I
N
G
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-29
G
e
rrit Pape
D
o
cumentation/git-svni
m
p
o
rt
.
txt: fix ty
p
o
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
J
u
n
io
C
H
a
mano
GI
T
1
.
5
.
1-rc3
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
Upda
t
e main git
.
html
page to poin
t
at 1
.
5
.
0
.
6
docu
m
enta
t
ion
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Junio
C
Ha
m
ano
Mer
g
e branch 'maint' to synchronize
w
ith
1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
GIT
1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Je
f
f
King
commi
t
: fix
pretty-print
i
ng o
f
me
s
sages w
i
th
"\
n
encoding "
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Joh
a
nne
s
S
c
h
indelin
t4118: be ni
c
e to non-GNU sed
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Jeff Ki
n
g
t/t6006:
a
dd tests fo
r
a slightl
y
mor
e
complex comm
i
t
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Jeff Kin
g
F
i
x
"--pret
t
y
=form
a
t:" enc
o
d
ing it
e
m
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
Fix "
-
-pretty=format
:
" for parent related item
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
G
errit Pap
e
http-
f
etch: remove
p
ath_le
n
from
struct
al
t
_b
a
se, it
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Gerrit P
a
pe
http
-
fetch:
don't use double-slash as direct
o
ry separ
a
tor
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
git-commit:
"read-tree -m HEAD" is not the
r
ight way
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
J
e
ff Kin
g
Add som
e
basic tests of
r
ev-list --pretty=format
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
H
.
Peter Anvin
git-upload-pack: make sure we close un
u
sed
p
i
p
e ends
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
J
e
ff King
--pretty=format: fix
broken %ct
a
nd
%
a
t int
e
rpolation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
James
Bowes
use x
r
eallo
c
i
n
help
.
c
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
Jame
s
Bowes
rea
d
-tree: use xcalloc
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
Linus Torvalds
Fix "ge
t
addrinfo()" buglet
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
Gerrit
P
a
pe
Makef
i
l
e: remove
tes
t
-chmt
i
me program in target clean
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
Jakub Nare
b
ski
g
itweb:
Cleanup
and
u
niquify die_error calls
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
Junio C
H
amano
sha1_f
i
le
.
c (write_sha1_
f
ile)
:
Det
e
ct close failure
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
Alexandre Jul
l
iard
g
i
t
.
el: Display some inf
o
rmation
a
b
out
t
h
e
H
EAD c
o
mm
i
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
Junio
C
Hamano
D
ocume
n
t git-log --first-par
e
n
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
Christi
a
n Co
u
der
Bisect: add checks
a
t the b
e
gin
n
ing of "
g
it bis
e
ct
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
J
i
m Meyering
sha1_
f
ile
.
c (wr
i
te_sha1_from_fd): Dete
c
t close fa
i
lur
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
Jeff King
git-rm: don
'
t remove
n
e
wly added f
i
le
w
i
t
hout -f
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-26
C
hristian Couder
Bisect: Use "git-show-ref --
v
e
rify"
whe
n
res
e
ting
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-26
Jakub Narebski
gitweb: Add example
o
f conf
i
g
fil
e
and how to generate
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-26
J
u
nio C Haman
o
GIT 1
.
5
.
1
-
rc2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-26
Eric
W
ong
git-svn:
fix rel_path() whe
n
no
t
connected to
t
he repository
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-26
Jam
e
s Bowes
use xmalloc in git
.
c and help
.
c
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-26
Junio C Hamano
Merge
b
ranch
'
jc/fpl'
commit
|
commitdiff
|
tree
2007-03-26
Junio C Hamano
Update R
E
ADME to point a
t
a few ke
y
periodical mess
a
ges
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-25
Juni
o
C Haman
o
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2007-03-25
Junio C Hamano
Merge bran
c
h
'maint' of git://l
i
nux-nfs
.
org
/
~bfields
.
.
.
commit
|
commitdiff
|
tree
2007-03-25
J
unio C
Hamano
Merg
e
branch 'js/remot
e
-
show-p
u
s
h
'
commit
|
commitdiff
|
tree
2007-03-25
Junio C Ham
a
no
Merge bran
c
h
'mai
n
t'
commit
|
commitdiff
|
tree
2007-03-25
Alex
R
iesen
Use
d
iff* with --exit-code in git-am, git-rebase
a
n
d
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-25
Alex Riesen
Document --q
u
iet opti
o
n to git-diff
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-25
N
i
colas P
i
tre
write_sha1_f
r
om_fd
(
) should make n
e
w
o
bj
e
cts
r
ead-only
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-25
Nicolas Pit
r
e
make
it more
o
bviou
s
that tempo
r
ary
f
i
les are temp
o
rary
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-25
Andy Parkins
u
pda
t
e-hook: remove e-mail sending
h
ook
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-25
Jak
u
b Narebski
g
i
tweb: A
d
d some install
a
tion notes in gi
t
web/INSTALL
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-25
J
a
kub Narebski
gitweb: Fix not marking signoff lines in "log" view
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-25
Jakub Nar
e
bsk
i
g
itweb: Don't e
s
cape
a
ttri
b
u
t
es
in
C
GI
.
pm HT
M
L
m
ethods
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-25
L
i
Yang
git
w
eb: Change
t
o use explici
t
ly functio
n
cal
l
cg
i
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-24
Junio C Hamano
git-a
m
documentat
i
on: de
s
cr
i
be what
is ta
k
en from where
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-24
Johannes Schindelin
git-r
e
vert: Revert
r
ev
e
rt me
s
sage to
old b
e
h
av
i
our
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-24
Junio C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-03-24
C
hristian
C
ouder
Documenta
t
i
on: bisect: make a comment fit better in
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-24
C
h
ristian Couder
Documentation: bisect: add some tit
l
es to som
e
par
a
graphs
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-24
C
h
risti
a
n Couder
Doc
u
mentation: bise
c
t: refo
r
m
a
t more paragraph
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-24
Ch
r
is
t
ian C
o
uder
Documentati
o
n: bisect: reword
o
ne paragraph
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-24
C
hris
t
i
a
n C
o
uder
D
o
c
u
menta
t
io
n
: bi
s
ect: reforma
t
some paragraphs
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-24
Jun
i
o C Hamano
F
ix path
-
limited "re
v
-
list --b
i
sect
"
termination
c
onditi
o
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-23
Jakub N
a
rebs
k
i
gitweb: Fix
"
n
ext" link in commit view
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-23
Juni
o
C Hamano
git-bis
e
c
t
.
s
h
: properly dq $GIT_DIR
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-23
Junio C Hamano
g
i
t-bisect: typo
f
ix
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-23
Junio C Hamano
c
h
eckout: re
p
ort where the
n
ew HEAD
is upon detach
i
ng
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-23
Christian Coud
e
r
Bis
e
c
t: impl
e
me
n
t "git
bise
c
t
r
u
n
<cmd>
.
.
.
" to automati
c
ally
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-23
Uwe Kleine-Köni
g
B
i
sect:
conver
t
revs given to
go
o
d and
b
ad
t
o
c
o
m
m
i
ts
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-23
Joha
n
nes Schi
n
deli
n
t4118: be nice to non-GNU sed
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-23
J
u
nio C Ha
m
a
no
git
-
apply: Do not free the
w
rong buf
f
e
r whe
n
we
c
onvert
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-22
Jun
i
o
C Haman
o
Merge git://git2
.
k
e
rnel
.
org/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2007-03-22
Junio C Hamano
Merge b
r
anch '
m
aint'
commit
|
commitdiff
|
tree
2007-03-22
Peter Eriksen
Documenta
t
ion/pack-format
.
txt: Cl
e
ar up des
c
ription
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-22
Nico
l
as Pitre
update HEAD ref
l
og when branch
pointed to by HEAD
is
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-22
And
y
P
arkins
u
pdate-ho
o
k
: abort
e
arly if the pro
j
ect descri
p
ti
o
n
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-22
Michael S
.
Tsirkin
git-merge: Put FETC
H
_HEAD data in merge commit messa
g
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-22
Jun
i
o
C
Hamano
git-rebase: make
'
rebas
e
HEAD b
r
anch' work as
e
x
pecte
d
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-22
Juni
o
C Haman
o
t
r
e
e_entry_interesting(): allow it to say "
e
veryt
h
ing
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-22
J
u
nio C Hamano
tree-diff
:
avoid str
n
c
mp()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-22
Junio
C
Ham
a
no
Teach tree_entry_inte
r
esting
(
) that t
h
e tre
e
entries
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-21
Linu
s
Torvalds
S
w
itc
h
over t
r
ee
d
escriptors to cont
a
in a pre-parsed
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-21
L
i
nus
T
o
r
v
alds
Init
i
ali
z
e tree descriptors
wi
t
h a helper function
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-21
Linus Torval
d
s
Remove "pathlen" fro
m
"struct
n
ame_entry"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-21
Michael S
.
Tsi
r
kin
fix typo in git-am man
p
a
ge
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-21
Juni
o
C H
a
ma
n
o
blame: cmp_sus
p
ect i
s
not "cmp"
a
n
y
more
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-21
Nicolas
P
itre
mino
r
g
i
t
-
prune optimization
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-21
Nicolas Pitre
improve checkout message when
a
sking for same branch
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-21
Linus
T
orvalds
Be more careful about zlib ret
u
rn v
a
lues
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-21
Linus To
r
valds
Don't ever return
c
orrupt objects fro
m
"pa
r
se_object
(
)
"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-21
N
i
colas
P
i
tre
index-pack: more valida
t
i
on
c
hec
k
s a
n
d cleanups
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-21
N
i
col
a
s Pitr
e
ind
e
x-pack: use hash_sha1_fil
e
()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next