repo.or.cz
/
git
/
fastimport.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
Al
e
x Riesen
Keep rename
/
rena
m
e c
o
nfl
i
c
t
s of intermedia
t
e
merges
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-31
J
ulian Phill
i
ps
c
o
n
tr
i
b/
w
orkdir: add a simple
script t
o
create a working
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-31
Andy Park
i
ns
Reimplement emai
l
i
n
g
par
t
of hook
s
-
-update in
c
ont
r
ib
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-31
Eric Wong
gi
t
-svn: avoid
respewi
n
g
similar error messages
for
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-31
Theod
o
re
Ts'o
R
enam
e
wa
r
n() to warning() to
fix symbo
l
conf
l
ict
s
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-31
Don Zickus
g
it-mailinfo
fixe
s
fo
r
pat
c
h munging
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-31
Jakub Nareb
s
ki
g
i
t
w
e
b
: Support comparing blob
s
(files) with
d
ifferent
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
Junio C
H
a
man
o
Do not
b
other do
c
u
menting fetch--tool
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
Junio C Hamano
Upda
t
e draft rel
e
ase
not
e
s f
o
r 1
.
5
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
Junio C Hamano
M
e
r
ge bra
n
c
h 'maint'
commit
|
commitdiff
|
tree
2007-03-30
Francis Daly
git-
q
uilt
i
mport
/
bin
/
sh-ism
f
ix
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
Chris
t
ian Co
u
d
er
Bi
s
ect: I
m
prove error message in "bi
s
ect_ne
x
t
_
check"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
Junio C
H
a
m
ano
Me
r
ge branch 'ma
s
ter' of g
i
t://repo
.
or
.
cz/git/m
e
rg
e
tool
.
git
commit
|
commitdiff
|
tree
2007-03-29
H
.
Peter Anvin
g
it-upload-pack:
m
ake sure we clos
e
u
n
u
sed 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: fix
e
xamp
l
e
i
n SPECIFYING
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-29
Gerr
i
t
Pape
D
ocumen
t
ation/git-svnimport
.
txt: fix typo
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Juni
o
C Ham
a
n
o
GIT
1
.
5
.
1-
r
c3
commit
|
commitdiff
|
tree
2007-03-28
Junio
C
Hamano
Update mai
n
g
i
t
.
html page to po
i
nt at
1
.
5
.
0
.
6 documentati
o
n
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
J
u
n
io C Hamano
Merge branch 'maint' to s
y
nchronize with 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Jun
i
o C Hamano
G
I
T 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Jeff King
commi
t
: fix pretty-pr
i
nting of messages with "\
n
e
n
coding "
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Jo
h
annes Schinde
l
in
t
4118:
be ni
c
e
t
o n
o
n-GNU
s
ed
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Jeff Kin
g
t/t60
0
6
: a
d
d tests for a slightly
m
o
re
c
omplex commit
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Jeff
King
Fix
"
-
-pretty=format:" e
n
co
d
ing ite
m
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Jun
i
o C Hamano
Fix "--pretty=format:" for parent related items
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Gerrit Pape
ht
t
p-fet
c
h: remove pa
t
h_len f
r
om struct a
l
t_bas
e
, it
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Gerrit Pape
http
-
fetc
h
: don't use doub
l
e-sl
a
sh
as
d
i
rectory
s
epar
a
t
o
r
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Junio C Ha
m
ano
git-commit: "read-tree
-m HEAD" is not the rig
h
t wa
y
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Jeff
King
Ad
d
some basic tests of rev-list --pret
t
y=for
m
a
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
H
.
Peter Anv
i
n
git-upload-pack: ma
k
e
sure we clos
e
unused pipe end
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Jef
f
K
i
ng
--
p
retty=format:
fix broken %ct and
%at inter
p
ol
a
t
i
on
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
J
a
m
e
s Bowes
u
s
e xrealloc in
help
.
c
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
James Bowes
read-tre
e
:
use xcalloc
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
Li
n
u
s Torvalds
Fix "getaddrinfo()"
b
uglet
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
Ger
r
it Pape
Ma
k
efile: remove test-chmtime program
in targ
e
t clean
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
J
a
kub N
a
reb
s
ki
gitweb: Cleanu
p
and
u
niquify d
i
e_error calls
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
Junio C H
a
mano
sha1_
f
ile
.
c (writ
e
_sha1_
f
ile
)
: Detect close failure
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
Ale
x
andre Julliard
git
.
el: Display
some i
n
formation
a
bout the
HEAD com
m
it
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
J
u
n
i
o C H
a
mano
Document gi
t
-l
o
g --f
i
rst-parent
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
Christian
C
ou
d
e
r
B
i
sect: a
d
d checks at th
e
b
eg
i
nning of
"
git bisect
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
J
i
m Meyering
sha1_file
.
c
(wri
t
e
_
sha1_from_fd): Detect
c
lose failure
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
Jeff
King
git-rm: don'
t
remo
v
e newly added file
w
i
t
h
o
ut -f
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-26
Christian
Co
u
d
er
Bi
s
e
c
t: Use "g
i
t-show-ref --
v
erify"
w
hen reseti
n
g
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-26
J
a
kub Nar
e
bski
gitweb: Add example
o
f config f
i
le and ho
w
to
g
enera
t
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-26
J
unio C Hamano
GIT 1
.
5
.
1-rc2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-26
E
ric Wong
git-svn: fix rel_
p
ath() wh
e
n not connect
e
d to the rep
o
sitory
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-26
Jam
e
s Bowe
s
us
e
x
malloc in git
.
c and
h
elp
.
c
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-26
Junio C Haman
o
Merge b
r
a
nch 'jc/f
p
l'
commit
|
commitdiff
|
tree
2007-03-26
Junio
C
Ha
m
ano
U
pdate
R
EADME to poi
n
t at
a
few key periodical m
e
ss
a
ges
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-25
Junio C Hamano
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2007-03-25
Junio C Hamano
Merge br
a
nch 'm
a
int'
of git
:
//linux-nfs
.
org/
~
b
f
ields
.
.
.
commit
|
commitdiff
|
tree
2007-03-25
J
u
ni
o
C Hamano
Merge
branch
'js/remo
t
e
-
show-
p
ush'
commit
|
commitdiff
|
tree
2007-03-25
Junio C Ha
m
ano
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2007-03-25
A
l
e
x
Riesen
Use diff* wi
t
h --exit-code in git-a
m
,
git-re
b
ase and
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-25
Ale
x
Riesen
Document --quiet option to git-diff
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-25
N
i
cola
s
P
i
tre
write_sha1_from_fd()
should mak
e
new o
b
jects read
-
onl
y
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-25
Nicolas Pitre
make it more obvious t
h
at temporary
fi
l
es are tem
p
orary
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-25
And
y
Parkins
update-h
o
ok: rem
o
ve e-m
a
il sendi
n
g
hook
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-25
Ja
k
ub Narebski
gitweb:
A
dd some ins
t
allation no
t
es in
gitweb/INSTALL
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-25
Jak
u
b Na
r
ebski
gitweb: Fix not mar
k
i
n
g sign
o
ff
l
ines
in "log" view
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-25
Jakub Narebski
gitweb: D
o
n't
e
scap
e
attribu
t
es in C
G
I
.
pm HTML
m
ethod
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-25
L
i Yang
gitweb: Change t
o
use e
x
plicitly function
c
all cgi
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-24
Ju
n
io C Hamano
git-am
docume
n
tation:
describe what is taken from wh
e
re
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-24
Joh
a
nnes Schindel
i
n
git-revert: Revert
r
evert
message t
o
old behaviour
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-24
Jun
i
o C Hamano
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2007-03-24
Chris
t
i
a
n Coud
e
r
Docu
m
entation: bisect:
make a com
m
ent fit better i
n
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-24
C
h
risti
a
n Couder
Documentation: bis
e
c
t
: add s
o
me tit
l
es
to some paragrap
h
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-24
Christi
a
n Coud
e
r
Documentat
i
on: bisect: reformat more p
a
ragr
a
phs
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-24
Chris
t
ian Couder
Documentation: b
i
s
e
ct
:
reword one paragraph
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-24
Christ
i
an Couder
Documentation: bisect: r
e
format some
paragraphs
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-24
Junio
C
H
a
m
ano
Fix path-lim
i
ted "rev-
l
i
s
t
--bisect" termin
a
ti
o
n
co
n
di
t
ion
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-23
Jakub
N
arebs
k
i
g
i
tweb: Fix
"next" link
i
n commit view
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-23
J
unio
C
Hamano
git-bisect
.
s
h
: properly dq $
G
IT_DIR
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-23
Ju
n
io C Hamano
g
i
t-bisect: typofix
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-23
J
unio
C Hamano
c
h
ec
k
out: report where th
e
n
e
w HEAD is
upon deta
c
hing
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-23
Christia
n
Couder
Bisect
:
imp
l
ement "gi
t
bi
s
e
ct
r
un <cmd>
.
.
.
"
to automati
c
ally
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-23
U
w
e Kleine-König
Bi
s
ect: co
n
vert revs gi
v
en to good
and
bad to
c
omm
i
ts
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-23
Johannes
Schindelin
t4
1
18:
b
e nice to non-GNU sed
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-23
Junio C Hamano
g
i
t
-
apply: Do not free the wrong
bu
f
fer
w
hen w
e
c
o
nvert
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-22
J
unio C Hamano
Merge
g
it://git2
.
k
e
r
nel
.
org
/
p
u
b/s
c
m/gitk/gi
t
k
commit
|
commitdiff
|
tree
2007-03-22
Junio C
Ham
a
no
M
e
r
g
e branch '
m
a
int'
commit
|
commitdiff
|
tree
2007-03-22
P
e
ter Er
i
ksen
Do
c
umentation/pack-format
.
t
xt: Clear up descrip
t
ion
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-22
Nicolas Pitr
e
update HEAD reflog when bran
c
h poin
t
ed to by HEAD
is
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-22
Andy Parki
n
s
update-ho
o
k:
a
bor
t
early if the project description
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-22
Michael
S
.
T
sir
k
i
n
git-merge: Put FETCH_HEAD data
in merge co
m
mit m
e
ss
a
ge
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-22
Ju
n
i
o
C Hamano
git-reb
a
se:
m
ake 'rebase HEAD
b
ranch'
work as expected
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-22
Junio C
H
amano
tree_e
n
t
ry
_
i
nter
e
st
i
n
g
(): a
l
low i
t
to
s
a
y "everything
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-22
Junio C
Hamano
tr
e
e-diff: avoid
s
tr
n
cmp()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-22
Junio C Ha
m
ano
T
e
a
ch tr
e
e
_entry_interesting() that the tree
e
ntries
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-21
Linus Torvalds
Switch
o
ver tr
e
e des
c
r
iptors
to
contain a pre-pars
e
d
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-21
Linus
T
orvald
s
Initial
i
z
e
tree
d
escriptors wit
h
a helper f
u
ncti
o
n
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-21
Linus Torvalds
Re
m
ove
"
p
a
thle
n
" fr
o
m
"struct
name_
e
ntry"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-21
M
i
chael S
.
Tsi
r
kin
fix typo in
g
it-am manpage
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-21
Junio C
H
amano
blame: cmp_suspect
is not "cmp" any
m
o
re
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-21
N
i
c
olas
P
itre
m
i
n
o
r
g
i
t-pr
u
ne op
t
imization
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-21
N
i
c
o
las Pitre
impro
v
e check
o
ut
m
essage when asking fo
r
same branch
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-21
Linus Torvalds
Be
m
ore caref
u
l about zlib
r
eturn values
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-21
Linus Torv
a
lds
D
o
n't ever return c
o
rrupt o
b
jects from "parse_object()"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-21
N
i
colas Pitre
i
n
d
ex-pack: more validation ch
e
cks and
c
le
a
n
u
ps
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-21
Nicolas Pitre
index-pack: use
has
h
_sh
a
1_f
i
le()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next