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 Ri
e
sen
Keep r
e
name
/
rename confl
i
c
ts of int
e
r
mediat
e
m
erg
e
s
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-31
J
u
lian Phillips
contri
b
/workdir:
a
d
d a s
i
mple script to create a
w
orkin
g
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-31
Andy
Parkins
Reimplement
ema
i
lin
g
part of hoo
k
s--update
i
n co
n
tri
b
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-31
Eric
W
ong
git
-
svn:
a
void respewing simi
l
ar error messa
g
es for
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-31
Th
e
o
dore Ts'o
Re
n
ame warn() to wa
r
n
ing() to fi
x
sy
m
bol confl
i
cts
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-31
Don Zick
u
s
g
i
t
-
mailinfo
f
ixes for patch munging
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-31
Ja
k
u
b Nar
e
bski
g
i
tweb: Suppo
r
t
comp
a
ring blo
b
s
(
files) with di
f
ferent
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
J
u
n
i
o C Ha
m
ano
Do not bother docum
e
nting
f
etch--tool
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
Junio C
Ha
m
ano
Up
d
ate draft release not
e
s for 1
.
5
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
Junio
C
Hamano
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2007-03-30
Franc
i
s Daly
g
it-quil
t
im
p
or
t
/bin/sh-ism fix
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
C
h
risti
a
n
Coud
e
r
Bisect: Impr
o
ve erro
r
mess
a
ge
in "bise
c
t_n
e
xt_ch
e
c
k"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
Junio C Hamano
Mer
g
e
b
r
a
nch '
m
aste
r
' of git://repo
.
or
.
cz/git/mergetool
.
git
commit
|
commitdiff
|
tree
2007-03-29
H
.
Peter Anvin
git-upload-pack: mak
e
sure we close unused pipe ends
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-29
Gerrit
P
ape
Document
a
tion
/
git-rev-parse
.
txt: fix exa
m
pl
e
in
SPECIFYING
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-29
Ger
r
it Pape
Docu
m
ent
a
ti
o
n/g
i
t-svnimport
.
txt
:
fix typo
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Junio C Ha
m
ano
GIT 1
.
5
.
1-rc3
commit
|
commitdiff
|
tree
2007-03-28
Junio C
H
a
m
a
n
o
Update
main git
.
html
p
age to point at 1
.
5
.
0
.
6 documentation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Jun
i
o C Hama
n
o
Me
r
ge
branch 'maint' to synchr
o
nize with 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
GIT 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Jeff King
co
m
mit: fi
x
pretty
-
printing of mes
s
ages wit
h
"\nencodi
n
g "
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Johannes Schindelin
t
4
118:
b
e nice to non-
G
NU sed
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Jeff Kin
g
t/t6006
:
add
tes
t
s for a
s
ligh
t
ly
more compl
e
x co
m
mit
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Jeff King
F
i
x
"-
-
p
retty=format:" encoding item
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
J
un
i
o
C
Hamano
Fix
"--pretty=
f
ormat:" for parent related items
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Ger
r
it Pape
http-fe
t
c
h
: remove pat
h
_
len from s
t
ruct a
l
t_base
,
it
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
G
er
r
it Pape
http-fetch: don't
use do
u
ble-sl
a
sh as dir
e
c
to
r
y separator
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
git
-
comm
i
t: "r
e
ad-tree -m HEAD"
is
n
o
t
the right way
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Je
f
f King
Add
s
ome
basic tests of rev-list -
-
p
retty=
f
ormat
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
H
.
Pet
e
r
A
nvin
git-upload-p
a
ck:
make s
u
re
we close unused pipe ends
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Jeff King
-
-pr
e
tty=
f
o
r
mat: f
i
x
broke
n
%
c
t and %at interpolati
o
n
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
James Bowes
use xrea
l
l
oc in help
.
c
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
James Bowes
read
-
tree: use xcalloc
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
Linu
s
Torv
a
lds
Fix "getaddrinf
o
(
)
" buglet
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
Gerrit Pap
e
Makefile: remove
t
est-c
h
mtime progr
a
m i
n
target clean
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
Jakub Narebski
gitweb: Clea
n
up and uniqu
i
fy die_error ca
l
ls
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
Junio C Haman
o
sh
a
1_f
i
le
.
c (w
r
i
t
e_sha1_file): Detect close fai
l
ure
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
Alexand
r
e Julliar
d
g
i
t
.
e
l:
D
isplay some
i
n
fo
r
m
a
tion about t
h
e HEAD
commit
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
Junio C
H
a
ma
n
o
Document git-lo
g
-
-
fi
r
st-p
a
re
n
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
Christian Couder
Bi
s
ect: add
c
hecks at the
beginning of "git bisect
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
Jim Mey
e
r
i
ng
sha1_file
.
c (w
r
ite_sha1_from
_
fd):
D
etect close
fa
i
lur
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
J
ef
f
King
git-rm: don't re
m
ove n
e
wly added file w
i
thout -f
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-26
Christia
n
Couder
Bisect: Use "git-sh
o
w
-ref --verif
y
" when rese
t
ing
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-26
Jakub Narebs
k
i
g
i
t
w
e
b
: Add
exampl
e
o
f
co
n
fig file
a
n
d
how to generate
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-26
J
unio C H
a
mano
GIT
1
.
5
.
1-rc2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-26
Eric Won
g
git-s
v
n:
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
Bowe
s
use
x
malloc in git
.
c and he
l
p
.
c
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-26
Ju
n
io C Hamano
M
e
r
ge bran
c
h 'jc/fpl'
commit
|
commitdiff
|
tree
2007-03-26
Junio C H
a
m
ano
Update RE
A
D
M
E to
p
oint at a
f
ew key period
i
c
al
m
e
ssage
s
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-25
Junio
C
Hama
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-03-25
Junio C H
a
m
an
o
Mer
g
e branch
'
ma
i
nt' of git:/
/
linux-nfs
.
o
rg/~bfields
.
.
.
commit
|
commitdiff
|
tree
2007-03-25
Junio C Hamano
Merge branch
'js/remote-show-push'
commit
|
commitdiff
|
tree
2007-03-25
Jun
i
o C Hama
n
o
Merge branch
'maint'
commit
|
commitdiff
|
tree
2007-03-25
Alex
Ri
e
sen
Use diff
*
with
--exit-code in git-am, git-rebase and
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-25
A
lex Riesen
Document --quiet o
p
tion
to git-dif
f
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-25
Nicolas Pitre
write
_
sha1
_
from_f
d
() should make
new
o
bjects read-only
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-25
Nicola
s
Pitre
m
a
ke it more obvious that
temporary f
i
les
are temporary
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-25
Andy P
a
rkins
upd
a
te-h
o
ok
:
re
m
o
ve e-mail sending hook
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-25
Jakub Narebski
git
w
e
b: Add som
e
installation notes
i
n
g
i
tweb/
I
NSTAL
L
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-25
Jak
u
b Narebsk
i
g
i
tweb: Fix not
m
arking sig
n
off
lines in
"log" view
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-25
Jak
u
b Nare
b
ski
gitweb: D
o
n't es
c
ape attri
b
utes
i
n CGI
.
pm HTML meth
o
ds
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-25
L
i Yang
git
w
eb: C
h
ange to use e
x
plicitly function call cgi
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-24
Junio
C
Haman
o
git-am document
a
ti
o
n: describe
what is tak
e
n
from w
h
ere
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-24
Johan
n
es Schindelin
git-revert: R
e
vert revert message to
o
ld behavio
u
r
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
Christia
n
Couder
Docum
e
ntation:
b
i
sect: make a commen
t
fit better in
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-24
Christian Couder
Docum
e
nt
a
tion: bisect: add some titles to some paragraphs
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-24
C
h
ristian Couder
Documentation: bis
e
ct: refo
r
mat
m
o
re para
g
raphs
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-24
Christian Coude
r
Doc
u
mentation:
b
isec
t
: rewo
r
d
o
ne parag
r
aph
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-24
Christian Couder
D
ocu
m
entation: bi
s
ect: reforma
t
some parag
r
aphs
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-24
Ju
n
io
C Hama
n
o
Fix path-li
m
ited
"rev-list --bisect
"
termination
co
n
diti
o
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-23
Ja
k
u
b
Narebs
k
i
gitw
e
b: Fix
"
n
e
xt" link in commit
v
iew
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-23
J
u
nio C
H
a
mano
git-bise
c
t
.
sh: properly
d
q $GIT_DIR
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-23
Junio C Hamano
g
i
t-bi
s
ect: typofix
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-23
Junio C Haman
o
c
h
eckout: repor
t
wher
e
the n
e
w HEAD is
u
p
o
n detaching
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-23
Christian Coude
r
Bisect: implement "git bisect run <c
m
d>
.
.
.
" to aut
o
matically
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-23
Uwe Kleine-König
Bisect: convert
r
evs given
to good and bad to co
m
mit
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-23
J
o
han
n
es Schindelin
t4118: be nice
to non-GN
U
se
d
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-23
Junio
C
Hamano
git-
a
pply: Do not
free t
h
e wrong buffer when we
c
onvert
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-22
Ju
n
io
C H
a
m
a
no
Merge
git://git
2
.
ker
n
el
.
or
g
/pub
/
sc
m
/
g
itk/gitk
commit
|
commitdiff
|
tree
2007-03-22
Junio C Hamano
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-03-22
Pe
t
er Eri
k
se
n
Docum
e
nt
a
tion/p
a
ck
-
f
orm
a
t
.
txt: C
l
ear up de
s
cript
i
on
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-22
Nicolas Pitre
update HE
A
D
r
e
flog whe
n
branch pointed to by HEAD is
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-22
An
d
y Parkins
update-hook
:
abort
e
arly if the project description
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-22
Michael S
.
Tsi
r
k
i
n
git
-
merge: Put FE
T
CH_HEAD data
i
n merge commit messa
g
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-22
Juni
o
C Hamano
git-reba
s
e: m
a
ke 'rebase HEAD
b
ran
c
h' work as expected
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-22
Junio C Hamano
t
r
ee_entry_interesting(): allow it to say "ev
e
ryt
h
ing
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-22
Juni
o
C H
a
mano
tree-diff: a
v
oid s
t
rncmp()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-22
Jun
i
o C Ha
m
ano
Te
a
ch tree_
e
ntry
_
interesting(
)
that
t
h
e tree entries
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-21
Linus
T
orva
l
ds
Switch
over tr
e
e
d
e
s
c
r
iptors
to contai
n
a
p
re-parsed
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-21
Li
n
u
s Torvald
s
Initia
l
iz
e
tree desc
r
iptors with a helper f
u
nction
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-21
Lin
u
s Torva
l
d
s
Remove
"
pathle
n
" from "struc
t
name_
e
ntry"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-21
M
ichael S
.
Tsirkin
f
i
x typo in gi
t
-
a
m
manpa
g
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-21
Junio C Hamano
b
lame: cmp_
s
uspect is no
t
"cmp" anym
o
re
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-21
N
icolas
P
it
r
e
minor g
i
t
-pru
n
e
o
ptimization
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-21
Nic
o
las Pitre
improve ch
e
c
kout mes
s
age wh
e
n asking for
s
ame branch
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-21
Lin
u
s Torvalds
Be more caref
u
l about zli
b
return values
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-21
Linus To
r
valds
Don't
e
v
er
return
c
o
r
rupt o
b
jects from "
p
arse
_
obj
e
ct()"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-21
Nicolas Pitre
index-pack
:
more validation
c
hecks
a
n
d
c
lean
u
ps
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-21
Nicolas Pitre
inde
x
-pack: use ha
s
h_sha1_
f
ile()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next