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
Merge branch 'cb/maint-no-double-merge' into maint
2009-06-22
J
u
nio C Ham
a
no
Merge
b
ranch 'cb/maint-no-double-merge'
into m
a
int
commit
|
commitdiff
|
tree
2009-06-22
Junio C Hamano
Mer
g
e branch 'mn/
m
a
i
nt-iconv-autocon
f
'
into
m
aint
commit
|
commitdiff
|
tree
2009-06-22
Junio C Hamano
Merge branc
h
'lt/maint-unsigne
d
-left-s
h
ift' in
t
o ma
i
nt
commit
|
commitdiff
|
tree
2009-06-22
Junio C
Hamano
M
erge bran
c
h 'pb/maint-1
.
6
.
2
-userdiff-fix' into maint
commit
|
commitdiff
|
tree
2009-06-21
Jun
i
o C Hamano
attribute: whitespace set to tru
e
detects al
l
e
rrors
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-21
Nanako
Shiraishi
.
gitattribu
t
e
s: CR at the end of the line is an e
r
ror
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-21
Junio C Ha
m
ano
t3505: fix abu
s
e of test_expect_code
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-21
J
unio C Hamano
Me
r
g
e
br
a
nch 'mai
n
t-1
.
6
.
2
'
i
nto
m
aint
commit
|
commitdiff
|
tree
2009-06-21
Juni
o
C H
a
mano
Merge branch 'mai
n
t-1
.
6
.
1
'
i
nto maint-1
.
6
.
2
commit
|
commitdiff
|
tree
2009-06-21
Juni
o
C Ha
m
ano
Merge bra
n
ch 'maint-1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-06-21
St
e
p
h
en B
o
y
d
git-sh
o
w-ref
.
txt
:
remove word and ma
k
e consistent
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-21
Miklos Vajna
g
it-svn documentation: fix typo in '
r
ebase vs
.
pull
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-18
Mark Lodato
http
.
c
:
fix compiling with libcurl
7
.
9
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-18
Johannes Sc
h
indeli
n
import-tars: support syml
i
n
k
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-18
R
e
né Sc
h
ar
f
e
upload-arc
h
ive: fix i
n
f
ini
t
e
l
oo
p
on Cygwin
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-18
Paolo Bo
n
zini
avoid exp
o
nentia
l
regex m
a
tch for
java and objc f
u
ncti
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-18
Linus To
r
valds
Fi
x
bi
g
l
eft-shifts of uns
i
g
ned char
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-15
Stephen Boyd
pull, rebas
e
: simpl
i
fy t
o
use die
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-14
Jim Mey
e
ring
u
s
e xstrdup,
n
o
t
s
t
rdup in
l
l-merg
e
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-14
Ju
n
io C Haman
o
Merge branch 'm
a
int
-
1
.
6
.
2' int
o
m
aint
commit
|
commitdiff
|
tree
2009-06-14
Juni
o
C Hama
n
o
M
e
rg
e
bra
n
ch 'main
t
-
1
.
6
.
1' into
m
aint-
1
.
6
.
2
commit
|
commitdiff
|
tree
2009-06-14
J
un
i
o
C Hamano
Mer
g
e br
a
nch 'm
a
int-1
.
6
.
0' into ma
i
nt-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-06-13
Stephen Boyd
g
i
t-re
r
ere
.
txt: grammat
i
cal
f
i
xup
s
an
d
cleanups
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-12
Paol
o
Bonzini
Documentation: git-send-mail can take rev-list arg
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-11
Juni
o
C Hamano
Me
r
g
e branch
'
uk/m
a
int-1
.
5
.
3-rebas
e
-i-reflog' into
.
.
.
commit
|
commitdiff
|
tree
2009-06-11
Uwe
Kle
i
ne
-
Köni
g
rebase
-
-interactive: remo
t
e s
t
ray closing par
e
nthes
i
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-09
J
ohannes Sixt
diff
.
c
: p
l
u
g a memory leak in an error p
a
th
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-09
Joh
a
nne
s
Sixt
fetch
-
pack: close outp
u
t
chann
e
l afte
r
sideband demul
t
iplexe
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-09
Marco N
e
lissen
fix handl
i
ng of iconv
configuration
options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-08
Michae
l
J Gruber
builtin-remote: Make "remote show" displ
a
y all
ur
l
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-06
T
h
omas
Rast
Documenta
t
ion: refer to gitworkflo
w
s
(7)
f
rom tutoria
l
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-06
Shaw
n
O
.
P
e
arce
daemon
:
St
r
i
ctly
p
arse
the "ext
r
a arg
"
pa
r
t of the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-04
Jun
i
o C H
a
mano
GI
T
1
.
6
.
3
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-03
René S
c
harfe
gre
p
:
fix empty word
-
regexp m
a
tches
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-03
Junio C Hamano
blame: correctly
handle a p
a
th
that used to be
a
directo
r
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-03
Thomas Rast
add -i:
do not dump
patch during app
l
icati
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-02
Jun
i
o C Hamano
Upd
a
te draft release
notes for 1
.
6
.
3
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-02
Junio
C Ha
m
an
o
M
erge branch 'cb/main
t
-1
.
6
.
0-xd
l
-
merge-fix'
i
n
to maint
commit
|
commitdiff
|
tree
2009-06-02
Jun
i
o C Ham
a
no
M
e
rge branch 'r
s
/maint-grep-word
-
re
g
exp-fix'
into maint
commit
|
commitdiff
|
tree
2009-06-02
J
u
n
io C H
a
man
o
Merge br
a
n
ch 'sb/maint-1
.
6
.
2-opt-f
i
lename-fix
'
into
.
.
.
commit
|
commitdiff
|
tree
2009-06-02
Junio C
H
amano
Merg
e
br
a
nch
'j
c
/main
t
-
add-p-coalesce-f
i
x'
i
nto
m
aint
commit
|
commitdiff
|
tree
2009-06-02
Junio C Hamano
Merge branch 'tr/maint-doc-stash-
p
o
p'
in
t
o
maint
commit
|
commitdiff
|
tree
2009-06-02
René Scharfe
grep: fi
x
colou
r
ing of matches with zero length
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-02
Cle
m
en
s
Buchac
h
e
r
ref
u
se to merge
dur
i
ng
a mer
g
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-29
T
h
omas Rast
D
o
cumentation: teac
h
st
a
sh
/
pop workflow
i
n
s
tead of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-28
Cle
m
ens Buch
a
cher
fix segfau
l
t
s
howin
g
an e
m
p
t
y remote
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-26
Ju
n
io C
Hamano
Prepare f
o
r
1
.
6
.
3
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-26
Junio C Hamano
Merge
branch 'js/maint-no-ln-across-libexec-and-bin
.
.
.
commit
|
commitdiff
|
tree
2009-05-26
Junio C Haman
o
Merge bra
n
ch 'lt/maint-d
i
ff-reduce-lstat' int
o
m
aint
commit
|
commitdiff
|
tree
2009-05-26
Juni
o
C Hamano
M
e
rge branch
'
jm
/
format-patch-no-auto-n-wh
e
n-k-is-gi
v
en
.
.
.
commit
|
commitdiff
|
tree
2009-05-26
Junio C
H
amano
M
er
g
e
b
r
an
c
h 'd
o
/
m
aint-merge-r
e
cursi
v
e-fix' into maint
commit
|
commitdiff
|
tree
2009-05-26
J
unio
C
H
amano
Merge branch 'jk/main
t
-1
.
6
.
0
-trace-argv' i
n
to maint
commit
|
commitdiff
|
tree
2009-05-26
Jun
i
o C Hamano
Merge branch 'np/push-del
t
a'
into maint
commit
|
commitdiff
|
tree
2009-05-26
J
unio C Hamano
Merge branch 'ar/merge-
o
ne-file-diag' into maint
commit
|
commitdiff
|
tree
2009-05-26
J
unio
C
Hama
n
o
M
e
r
ge
branch 'ar/un
l
ink-err' into
maint
commit
|
commitdiff
|
tree
2009-05-26
Jun
i
o C Hamano
Merge branch '
j
k/maint-add-empt
y
'
into
m
aint
commit
|
commitdiff
|
tree
2009-05-25
Jeff King
f
i
x cat-f
i
le
us
a
ge message and documentation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-25
Je
f
f Kin
g
fetch:
rep
o
rt ref stor
a
g
e
DF error
s
more accurately
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-25
Jef
f
K
i
ng
lock_ref: infor
m
caller
s
of
unavailab
l
e ref
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-25
Johannes
Sixt
t3701: ensure co
r
re
c
tly
s
e
t
up repository after skipped
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-25
Michael J G
r
uber
merge-options
.
txt:
C
l
arify mer
g
e --squash
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-25
C
harle
s
Bailey
Ch
a
nge xdl_mer
g
e t
o
gene
r
ate outpu
t
even
f
or null merges
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-25
Charles B
a
i
ley
t6023: merge
-
file
f
a
i
ls to output a
n
ything
for a
d
ege
n
era
t
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-24
Junio C Hamano
M
erge branc
h
'main
t
-
1
.
6
.
2'
into main
t
commit
|
commitdiff
|
tree
2009-05-24
Junio C Hamano
Merge branch 'm
a
int-1
.
6
.
1'
in
t
o maint-1
.
6
.
2
commit
|
commitdiff
|
tree
2009-05-24
Junio C Haman
o
Merge bran
c
h 'ma
i
nt-1
.
6
.
0
' into maint
-
1
.
6
.
1
commit
|
commitdiff
|
tree
2009-05-24
A
l
ex
R
ie
s
en
http-
p
ush
.
c
:
:r
e
move_locks(): fix
u
se after free
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-23
René Sc
h
a
rfe
gr
e
p: fix word-regexp
at the
b
eginning of l
i
n
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-23
Stephen Boyd
ap
p
ly, fmt-mer
g
e-m
s
g: use relative
filenames
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-23
Stephen
B
oy
d
co
m
m
it: -F o
v
errides -t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-21
René Scharf
e
grep: fix word-regexp colouring
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-21
Giuseppe Bil
o
t
ta
completi
o
n:
u
se g
i
t rev-parse to de
t
e
c
t b
a
re re
p
os
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-21
J
ohannes
S
c
hi
n
delin
Cope bet
t
er with
a _lot_ of packs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-20
J
eff King
for-
e
ach-
r
ef:
fix
segfault
in copy_emai
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-17
Step
h
en Boyd
show-
b
ranch:
F
i
x
die messa
g
e in parse_reflog
_
param()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-17
Stephen
B
oyd
completi
o
n:
add
missing o
p
tions to show-
b
ranch and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-17
Linus Torval
d
s
dir
.
c: clean up handl
i
ng of
'path' parameter in
r
e
ad_directo
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-17
Da
n
McGee
Fi
x
type-punning
i
s
s
ue
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-17
Nan
a
ko
S
hiraishi
test: che
c
kout shoul
d
n't s
a
y that HEAD has move
d
if
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-17
Junio C
Ham
a
no
c
o
m
p
letion:
e
nhance
"
curr
e
n
t
branch" d
i
sp
l
a
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-17
Junio C Ha
m
a
n
o
c
ompletion:
simpl
i
f
y
"
c
urrent
b
r
anch"
i
n __g
i
t_ps1()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-17
J
unio C Ham
a
no
completion: fix PS1 di
s
play
during a
m
er
g
e
o
n
detache
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-17
Jun
i
o C Hamano
Revert
"git-
a
dd--in
t
eractive: r
e
move hunk
coalescing"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-17
Ma
t
t Graham
Splitting a hunk that
a
dds a line at the top
fails
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-16
Daniel Corde
r
o
builtin-checkout: Don't te
l
l user th
a
t HEAD has move
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-16
J
i
m
Mey
e
ring
pre-commit
.
sample
:
don
'
t print
incidental SHA1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-16
Stephen Boy
d
tests
:
Add
tes
t
s fo
r
missing
f
ormat-patch long op
t
ions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-16
Stephen
Boyd
api-pa
r
se-
o
p
tions
.
txt
:
use 'func' instead
of 'funct'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-16
To
n
y Kemp
Tur
n
o
n USE_ST_TIMESPEC for
O
penBSD
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-16
Juni
o
C Ham
a
no
Merge branc
h
'maint
-
1
.
6
.
2' i
n
to maint
commit
|
commitdiff
|
tree
2009-05-14
J
unio C Hamano
Merge bra
n
ch 'maint-1
.
6
.
1
' into maint-1
.
6
.
2
commit
|
commitdiff
|
tree
2009-05-14
Junio C H
a
m
ano
M
e
rge branch
'maint-1
.
6
.
0'
i
nto
mai
n
t-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-05-14
Johannes Schinde
l
in
Add
NO
_
CROSS
_
D
I
RECTORY_HARDLINKS support to
the Make
f
ile
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-13
Junio C H
a
man
o
GIT
1
.
6
.
3
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-12
Junio
C
Hamano
Me
r
ge branch 'main
t
-
1
.
6
.
2' into maint
commit
|
commitdiff
|
tree
2009-05-12
Junio
C
Haman
o
Merge branch 'jc/
m
aint-read-tree-multi' into maint
.
.
.
commit
|
commitdiff
|
tree
2009-05-12
Ju
n
io C Hamano
R
evert "check
o
ut branc
h
: p
r
ime cache-tree fully"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-10
Alex Riesen
l
s
-tree m
a
n
pa
g
e
: ou
t
put of ls-tree is compatible with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-10
Alex
R
iesen
ls-tree manpage: use "unless" inste
a
d of
"
when
.
.
.
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-10
D
a
ve Ol
s
zewski
merge-recursive: ne
v
er leave index
unm
e
rged while recurs
i
ng
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next