repo.or.cz
/
git
/
mingw
/
j6t.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 Riesen
Keep renam
e
/rename conflicts of intermediate m
e
rges
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-31
Julia
n
Phillips
cont
r
ib/
w
o
rkdir:
a
dd
a simple scri
p
t
t
o crea
t
e
a
w
orkin
g
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-31
Andy Parkins
Re
i
mplement emailing p
a
rt of hooks-
-
update in c
o
ntrib
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-31
Er
i
c Wong
git-svn: a
v
oid respewing sim
i
l
a
r e
r
ror messages for
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-31
Theodor
e
Ts'o
Renam
e
warn() to war
n
ing() to fix sy
m
bol con
f
l
icts
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-31
Don Zickus
git-mailinfo
fix
e
s
for patch munging
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-31
Jakub Nare
b
sk
i
gitwe
b
: Support comparing blobs (files
)
w
ith
differ
e
nt
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
J
un
i
o C Hamano
Do n
o
t bother
documenting
f
et
c
h--tool
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Junio
C
Hamano
Update draft rele
a
se notes for 1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
J
un
i
o C Ha
m
an
o
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2007-03-30
Francis Daly
gi
t
-quilti
m
port
/
b
i
n/sh-ism fix
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Chri
s
t
i
an Co
u
de
r
Bisect:
Im
p
rove error message in
"
b
isect_next
_
c
h
eck"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Ju
n
io
C Hamano
Merge br
a
nch
'mast
e
r' of
gi
t
:/
/
repo
.
or
.
cz/git/mergetool
.
git
commit
|
commitdiff
|
tree
2007-03-29
H
.
Peter Anvi
n
gi
t
-
up
l
oad-pack: make
s
ure we close unused pipe ends
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-29
Gerrit P
a
p
e
D
o
c
ument
a
tion
/
g
it-rev-parse
.
txt: fix example in SPECIFYING
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-29
Gerri
t
P
ape
Documentation/git-svni
m
port
.
tx
t
: fi
x
t
y
po
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Junio C Haman
o
GIT 1
.
5
.
1
-rc3
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
U
pdate mai
n
git
.
html p
a
ge to poi
n
t at 1
.
5
.
0
.
6 docu
m
entation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
J
unio C Hama
n
o
Merge branch '
m
a
int' to synchronize
w
i
th 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Ju
n
io C Hamano
GI
T
1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Jeff King
commit: fix p
r
etty-prin
t
in
g
of messages
with
"\nencoding "
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Johannes Schin
d
elin
t4118: be nice
t
o non-GN
U
sed
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Jeff Ki
n
g
t/t60
0
6: add tests for a slightly more comp
l
ex
c
ommit
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Jef
f
K
ing
Fix "--pret
t
y=format:" encod
i
ng item
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
Fix "--pret
t
y
=
f
ormat:"
f
or
parent related items
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Gerr
i
t Pape
http-fetc
h
: remov
e
p
a
th_len from
struct alt_base, it
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Gerrit Pape
h
t
tp-fetch: don't use dou
b
l
e-slash as di
r
ect
o
r
y
s
e
p
a
rator
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Ju
n
io
C
Hamano
git-co
m
mit: "
r
ead-tree -m
H
EAD" is
n
o
t the ri
g
ht way
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
J
eff Kin
g
Add some
b
asic
t
e
s
ts of rev-list --pretty=
f
o
r
m
at
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
H
.
Pe
t
er
A
nvin
g
i
t-
u
pload-pack: make
sure
w
e
c
lose un
u
sed p
i
pe
ends
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
J
eff
King
--pret
t
y
=format: fix b
r
oken %ct and
%at interpolation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
J
ames
Bowes
use
x
realloc
in help
.
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
James
B
ow
e
s
read-tree: use
x
c
a
lloc
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
Linus Torvalds
Fix "getaddrinfo()
"
buglet
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
G
err
i
t Pape
Makefile: remove tes
t
-chmtime program in target cl
e
an
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
Jakub Na
r
ebski
gitweb: Cleanu
p
a
nd
uniquify die_error calls
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
Junio
C Hamano
s
h
a
1_file
.
c (write_sha1
_
file): De
t
ect c
l
ose
f
ai
l
ur
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
Alexandr
e
Julliar
d
g
it
.
el:
D
i
s
play so
m
e information ab
o
ut the HEAD commit
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
Junio C Hamano
Do
c
umen
t
git
-
log --fi
r
st-par
e
n
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
Chris
t
ian Cou
d
e
r
Bisect: add
c
hecks at t
h
e beginning of "gi
t
bisec
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
Jim
Meyering
sha1_file
.
c
(write
_
sha1_from_
f
d): Detect clo
s
e f
a
ilure
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
J
ef
f
Ki
n
g
git-r
m
: don't remove newly added f
i
l
e without -f
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-26
Christian Couder
Bisect
:
U
s
e "git-
s
how-re
f
--ve
r
ify" wh
e
n
r
ese
t
in
g
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-26
Jakub N
a
rebski
gitweb: Ad
d
exa
m
ple of config fi
l
e and
how to genera
t
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-26
Junio
C
H
amano
GIT 1
.
5
.
1-rc2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-26
Eric Wong
git
-
s
vn
:
fix rel_path() when
not connected
t
o the repository
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-26
James Bowes
use xmallo
c
in git
.
c
and h
e
lp
.
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-26
Junio C Ha
m
ano
Me
r
ge bran
c
h 'j
c
/fpl'
commit
|
commitdiff
|
tree
2007-03-26
Juni
o
C Ha
m
ano
U
pdat
e
README to point at a
few key periodi
c
al messages
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-25
J
unio
C
H
amano
M
e
rge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2007-03-25
Junio C H
a
mano
Merg
e
branc
h
'maint' of gi
t
:
/
/linux-nfs
.
org
/
~bfields
.
.
.
commit
|
commitdiff
|
tree
2007-03-25
Ju
n
io C Ha
m
ano
Merge bra
n
ch '
j
s/remote-show
-
push'
commit
|
commitdiff
|
tree
2007-03-25
Juni
o
C Ha
m
ano
M
erge branch '
m
aint'
commit
|
commitdiff
|
tree
2007-03-25
Alex R
i
esen
Use
d
iff* with --
e
x
it-code i
n
git-am, gi
t
-rebase and
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-25
Alex R
i
esen
Doc
u
ment --quiet
o
ption to git-
d
i
f
f
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-25
N
i
colas Pitre
write_sha1_from_fd(
)
should
m
ake new objects
read-o
n
ly
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-25
N
icolas Pit
r
e
m
a
k
e
i
t more obvious that tempo
r
ary files are te
m
p
o
r
a
r
y
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-25
A
n
dy Parkins
u
pdate-h
o
ok: remove e-mail s
e
nding
h
ook
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-25
J
a
kub Narebski
gi
t
web: Add
s
ome insta
l
l
a
tion n
o
tes
i
n
gi
t
web/INS
T
ALL
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-25
Jakub Narebski
gitweb: Fix no
t
marking
s
ignoff lines
in
"
log" view
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-25
J
a
ku
b
Na
r
ebski
gitwe
b
: Don
'
t
e
scap
e
attributes
in CGI
.
pm H
T
ML
m
ethods
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-25
Li Yan
g
gitweb:
Change to use explicitly fun
c
t
ion call cgi
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-24
Ju
n
i
o
C
Hamano
git-am docum
e
ntatio
n
: describe what is taken from where
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-24
J
ohannes S
c
hindel
i
n
git-revert: Revert re
v
e
rt m
e
ss
a
ge to old b
e
h
a
viour
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-24
Junio C
H
a
m
a
no
Merg
e
b
r
a
nch 'maint'
commit
|
commitdiff
|
tree
2007-03-24
Ch
r
istian Cou
d
e
r
Documentation: bi
s
ect:
m
ake a comment
f
it better in
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-24
Ch
r
istian Couder
Do
c
umentat
i
on:
b
isect: ad
d
some titles to some pa
r
agr
a
p
h
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-24
C
hristian
Coude
r
Do
c
umentation:
bisect: refor
m
at more parag
r
aph
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-24
Christi
a
n Couder
Docume
n
t
a
t
io
n
: bisec
t
: reword one
p
aragraph
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-24
Christ
i
a
n
Couder
Documen
t
ati
o
n: bisect:
r
e
format some paragra
p
hs
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-24
Junio C
H
amano
Fix pa
t
h-
l
imited "rev-list --bise
c
t" t
e
rminati
o
n condition
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Jaku
b
Narebski
g
i
t
w
eb: Fix "next
"
l
i
nk in commit vie
w
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Junio
C
Ha
m
ano
git-bisect
.
sh: properl
y
d
q
$GIT_DI
R
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Ju
n
io C Hamano
g
i
t-bisec
t
: typofi
x
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Ju
n
io
C
Hama
n
o
checkout
:
rep
o
rt whe
r
e the new
HEAD is
u
pon detaching
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Ch
r
istian
Couder
Bisec
t
: impleme
n
t "git bise
c
t
run <cmd>
.
.
.
" to automatically
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Uwe Kleine
-
K
önig
Bis
e
ct: convert revs given to goo
d
and
b
ad to commits
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Johanne
s
S
ch
i
ndelin
t4118:
b
e nice to non
-
GNU
s
ed
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Junio C Hamano
git-
a
pply: Do no
t
free the w
r
o
n
g
bu
f
fer wh
e
n we conve
r
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Junio C Ha
m
a
n
o
Merge
git:
/
/git2
.
k
ernel
.
or
g
/
p
ub
/
scm/gitk/gitk
commit
|
commitdiff
|
tree
2007-03-22
Junio
C Hamano
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2007-03-22
Peter Eriksen
Documenta
t
io
n
/pa
c
k
-
for
m
at
.
t
x
t: Cle
a
r u
p
d
e
scr
i
pt
i
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Nic
o
las Pitre
update HEAD reflog when branc
h
p
o
inted to by
HEAD is
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Andy Par
k
ins
upda
t
e-hoo
k
: abort ea
r
ly if
th
e
p
roject description
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Mic
h
a
e
l
S
.
Tsirkin
git-
m
erge:
Pu
t
F
ETCH_HEAD
d
ata in mer
g
e
commit message
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Junio C Hamano
git-r
e
b
ase:
m
ake '
r
ebase
H
EAD bran
c
h' w
o
rk as ex
p
ect
e
d
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Junio C Hamano
tre
e
_
e
ntry_interesting():
a
llow it to sa
y
"ever
y
thing
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Junio C Hama
n
o
tree-di
f
f: avoi
d
s
t
rncmp()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Junio C
Hamano
Teac
h
tree_entry_intere
s
t
i
ng(
)
t
hat the tree entries
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-21
Linus To
r
v
a
lds
Switch over tree descr
i
pto
r
s
t
o contain a pre-pa
r
sed
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-21
Linus Torvalds
I
ni
t
ialize tree descriptors
w
i
t
h a helpe
r
fun
c
t
i
on
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-21
Linus Tor
v
al
d
s
Remove "pat
h
len" from "struct name_e
n
try"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-21
Mich
a
el
S
.
Tsirkin
fix typ
o
in git-am manp
a
ge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-21
Junio
C
Hamano
bl
a
me:
cmp_suspec
t
is not "cm
p
" any
m
ore
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-21
Nicolas Pitre
m
i
nor git-prun
e
o
p
timiza
t
ion
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-21
N
i
cola
s
Pitre
improve c
h
eckout mes
s
age when asking for same bran
c
h
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-21
L
inus Torval
d
s
Be more caref
u
l
about zlib r
e
tur
n
values
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-21
Lin
u
s Torv
a
l
ds
Don't ev
e
r
r
e
t
u
r
n corrupt objects from "parse_object()"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-21
Nicola
s
Pitre
index-pack: more validation check
s
and cle
a
nups
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-21
Nicolas Pi
t
r
e
i
n
dex-p
a
ck: use
h
ash_s
h
a1
_
file()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next