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
Haman
o
Merge branch 'cb/ma
i
n
t
-
no-double-merge
'
int
o
maint
commit
|
commitdiff
|
tree
2009-06-22
Junio C Hamano
Merge branch 'mn/
m
a
in
t
-iconv-autoconf' int
o
maint
commit
|
commitdiff
|
tree
2009-06-22
Junio C
H
a
m
a
no
Merge
branch
'
lt/maint-unsigned-le
f
t-shift
'
i
nto main
t
commit
|
commitdiff
|
tree
2009-06-22
Junio C Ham
a
no
Merge branch 'p
b
/maint-1
.
6
.
2-userdiff-fix' into maint
commit
|
commitdiff
|
tree
2009-06-21
Junio C Hamano
attribute:
w
hitespace set to true d
e
te
c
ts
a
ll errors
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-21
Nanako Shiraishi
.
g
it
a
ttribu
t
es
:
CR a
t
t
he end of the
l
ine is an
er
r
or
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-21
Junio C Hamano
t
3505
:
fix
abuse of test_e
x
pect_co
d
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-21
Junio C
Hama
n
o
Mer
g
e branc
h
'maint-1
.
6
.
2
' into maint
commit
|
commitdiff
|
tree
2009-06-21
Junio C H
a
mano
Merge branc
h
'maint-1
.
6
.
1' in
t
o ma
i
nt-
1
.
6
.
2
commit
|
commitdiff
|
tree
2009-06-21
Junio C Hama
n
o
Merg
e
branch
'
maint-1
.
6
.
0
'
in
t
o maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-06-21
Stephen Boyd
git-s
h
ow-r
e
f
.
txt: remove w
o
rd and make
consistent
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-21
Miklos
Vajna
g
i
t-svn documentation: fix
t
ypo in
're
b
ase vs
.
pull
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-18
Mark Loda
t
o
htt
p
.
c: fix compili
n
g with libcurl 7
.
9
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-18
Joh
a
n
nes Schin
d
elin
import-t
a
rs:
supp
o
rt symlinks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-18
René Sch
a
rfe
upl
o
ad-archive:
fix in
f
inite l
o
op on Cygwin
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-18
Paolo
Bonz
i
ni
avoid exponen
t
ial regex match
f
o
r java and o
b
jc function
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-18
L
inus Torva
l
d
s
F
i
x big left-shifts of u
n
signed
c
har
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-15
St
e
p
h
en B
o
yd
pull, reb
a
se: si
m
p
l
ify to use die()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-14
Jim
Meye
r
ing
use xstrdup, not
strdup
i
n ll
-
m
erge
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-14
Junio
C Hamano
Merge branc
h
'ma
i
n
t
-
1
.
6
.
2
'
into m
a
int
commit
|
commitdiff
|
tree
2009-06-14
Ju
n
io
C Hama
n
o
Merge br
a
nch 'maint-1
.
6
.
1
'
into maint-1
.
6
.
2
commit
|
commitdiff
|
tree
2009-06-14
J
unio C Hama
n
o
Merge branch '
m
aint-1
.
6
.
0'
i
n
to maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-06-13
Stephen Boyd
git-re
r
e
re
.
txt:
grammat
i
cal f
i
xups and cl
e
anups
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-12
Paolo Bo
n
z
i
n
i
Documen
t
ation: git-send-mail ca
n
take rev-lis
t
arg
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-11
Ju
n
io C Ha
m
ano
M
erge
branch 'uk/maint-1
.
5
.
3-
r
ebase-i-reflog' into
.
.
.
commit
|
commitdiff
|
tree
2009-06-11
Uwe
Kleine-K
ö
nig
rebas
e
--in
t
eracti
v
e:
r
emote s
t
r
ay
closin
g
p
ar
e
nthesis
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-09
Johann
e
s Sixt
di
f
f
.
c: plug a
m
emory
leak
i
n
a
n error
path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-09
Johannes Sixt
fetch-pack:
c
lose output cha
n
nel after sideba
n
d de
m
ultipl
e
xe
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-09
Marco N
e
lis
s
en
fix handl
i
n
g
of ic
o
nv co
n
figurat
i
on option
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-08
Michael J Gruber
builtin-remote: Make
"
remote show"
d
i
s
pla
y
all urls
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-06
Th
o
m
a
s Rast
Documentation:
r
efer to gitw
o
rkflo
w
s
(
7) f
r
om tutorial
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-06
Shawn O
.
Pe
a
rce
d
a
e
mon: S
t
rictly parse the
"extra arg" part of the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-04
Junio C Ha
m
a
no
GIT 1
.
6
.
3
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-03
René
Scharfe
gre
p
:
fix em
p
ty word
-
reg
e
xp matches
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-03
Junio C Ha
m
ano
blame: corr
e
ctly handle a path that used
t
o be
a dire
c
tory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-03
Thom
a
s R
a
st
add -
i
: do not dump patch duri
n
g applica
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-02
J
u
nio C Hamano
Upda
t
e
draft release notes for 1
.
6
.
3
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-02
Ju
n
io C Ham
a
no
Merge branch 'c
b
/
m
aint-1
.
6
.
0-xd
l
-merge-fix' into mai
n
t
commit
|
commitdiff
|
tree
2009-06-02
Junio C Hamano
Merge branch
'
rs/maint
-
grep-word-regexp-fix'
i
nto maint
commit
|
commitdiff
|
tree
2009-06-02
Junio C Hamano
Merge
b
r
an
c
h 'sb/maint-1
.
6
.
2-opt-filename-
f
ix' into
.
.
.
commit
|
commitdiff
|
tree
2009-06-02
Junio C Ham
a
no
Mer
g
e
b
r
anch 'jc/maint-add-p-coale
s
c
e
-fix
'
into
m
a
int
commit
|
commitdiff
|
tree
2009-06-02
Junio C Hamano
Merge branch 'tr/main
t
-do
c
-stash-p
o
p'
in
t
o ma
i
n
t
commit
|
commitdiff
|
tree
2009-06-02
R
e
né Scharfe
grep: fix colouring o
f
matches with zero length
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-06-02
C
l
e
m
ens Buchache
r
refuse to
m
e
r
g
e
during a merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-29
Th
o
mas R
a
st
Documentation: teach stash/po
p
wo
r
kflow
instead of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-28
Clemens Bu
c
hacher
fix seg
f
ault
s
howi
n
g an
e
mpty remote
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-26
J
u
nio C Hama
n
o
Prepar
e
for 1
.
6
.
3
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-26
Junio C Hamano
Mer
g
e bra
n
ch
'
js/maint-
n
o-ln-across-li
b
exec-and-bin
.
.
.
commit
|
commitdiff
|
tree
2009-05-26
Ju
n
io C
Hamano
Merge branch 'lt/
m
aint
-
dif
f
-
reduce-
l
stat' into mai
n
t
commit
|
commitdiff
|
tree
2009-05-26
Jun
i
o C Hamano
Merge branch 'j
m
/f
o
rmat-patch
-
n
o
-auto-n-when-
k
-is-given
.
.
.
commit
|
commitdiff
|
tree
2009-05-26
Junio C
Haman
o
Merge b
r
anch 'do/maint-merge-r
e
cursiv
e
-fi
x
'
into
m
aint
commit
|
commitdiff
|
tree
2009-05-26
Junio C Hamano
Merge branch 'jk/maint-1
.
6
.
0-tra
c
e-argv' into ma
i
n
t
commit
|
commitdiff
|
tree
2009-05-26
Junio C Hamano
M
erge branch 'np/
p
ush
-
delt
a
'
int
o
maint
commit
|
commitdiff
|
tree
2009-05-26
Junio C Ha
m
an
o
Merge br
a
nc
h
'ar/merge-on
e
-
fil
e
-diag'
into main
t
commit
|
commitdiff
|
tree
2009-05-26
Ju
n
io C Hamano
M
erge br
a
nch 'ar/unlink-err' into m
a
int
commit
|
commitdiff
|
tree
2009-05-26
J
u
nio C
Hamano
Me
r
g
e
branch 'jk/maint-add
-
empty'
into maint
commit
|
commitdiff
|
tree
2009-05-25
J
e
ff King
fix
ca
t
-
fil
e
usage messag
e
and documentatio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-25
Jeff King
fetch: report r
e
f storage DF errors more a
c
curate
l
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-25
Jeff King
lock_ref: inform callers of unavailab
l
e
r
e
f
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-25
Johannes Sixt
t3701: ens
u
re co
r
re
c
tly set
u
p repository after ski
p
ped
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-25
M
icha
e
l
J
Gru
b
er
merge-options
.
txt
:
Clarify me
r
g
e
-
-squash
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-25
Charl
e
s
B
a
iley
Change xd
l
_merge to
g
enerate
output
e
ven
for
null merge
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-25
Char
l
es
Bailey
t6023
:
merge-file fails to
o
utput anything f
o
r
a
degenerate
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-24
Junio C Ham
a
no
Merge branch 'ma
i
nt-1
.
6
.
2
'
i
n
to ma
i
n
t
commit
|
commitdiff
|
tree
2009-05-24
Jun
i
o
C
H
amano
Merge branch 'maint-1
.
6
.
1' into maint
-
1
.
6
.
2
commit
|
commitdiff
|
tree
2009-05-24
Jun
i
o C
H
a
m
a
no
M
e
rge branc
h
'maint-1
.
6
.
0' into
m
aint-
1
.
6
.
1
commit
|
commitdiff
|
tree
2009-05-24
Alex Riesen
http-push
.
c::
r
em
o
ve_
l
ocks(): fix use after
f
ree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-23
René
S
charfe
gr
e
p:
f
ix word-reg
e
xp at the beg
i
nning of lines
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-23
Stephen Boyd
apply, fmt-merge-ms
g
: use r
e
l
a
t
i
ve filenames
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-23
Stephen B
o
yd
commit: -F ov
e
rrides -
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-21
R
e
né Scharfe
gr
e
p:
fi
x
word-rege
x
p c
o
louring
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-21
Giuseppe Bi
l
o
t
ta
completi
o
n: use gi
t
rev-parse to detect
b
are repos
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-21
Johanne
s
S
chindelin
Cope better with a _lot_ of
p
acks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-20
Jeff Ki
n
g
for-each-re
f
: fix seg
f
ault in c
o
p
y
_em
a
il
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-17
Stephen B
o
yd
show
-
branch: F
i
x
die message i
n
parse_reflog_
p
ar
a
m(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-17
Stephen Boyd
completion: add missi
n
g
options to show-bra
n
ch and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-17
Linus
T
or
v
alds
dir
.
c:
c
l
e
an
up
handl
i
ng of 'path' param
e
ter in read_dire
c
to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-17
Dan McGee
Fix type-punning
i
ssues
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-17
Nan
a
k
o
Shiraishi
t
est: chec
k
out shouldn't say
t
hat HE
A
D has moved if
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-17
J
u
n
io C H
a
mano
c
o
mpletion
:
enh
a
nce "curren
t
branch" d
i
s
pla
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-17
Junio C Haman
o
completio
n
: simplify
"
current branch"
i
n __git_ps1()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-17
Junio C Hama
n
o
completio
n
: fix PS
1
display durin
g
a merge
on de
t
a
ched
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-17
J
u
n
io C Ham
a
no
Revert "
g
it-add--interactive: remove hunk coalescing"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-17
M
a
tt Gr
a
h
a
m
Splitting
a hun
k
t
h
at
ad
d
s a l
i
n
e at the top fail
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-16
Daniel
C
or
d
er
o
builtin-c
h
eckout:
D
o
n
't tell user that HEAD ha
s
m
o
ved
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-16
Jim Me
y
e
r
i
ng
pre-
c
ommit
.
sample: don't
print
i
ncide
n
tal SHA1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-16
Stephen Boyd
tests
:
Add
t
es
t
s for missing format
-
pat
c
h
l
ong o
p
t
i
ons
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-16
Ste
p
h
en Boyd
api-parse-option
s
.
txt: use 'func' instead of '
f
unct'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-16
Tony
K
em
p
T
urn on US
E
_ST_TIMESPEC for OpenBSD
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-16
Jun
i
o
C
H
amano
Merge branc
h
'maint
-
1
.
6
.
2' into
m
a
int
commit
|
commitdiff
|
tree
2009-05-14
Junio C Hamano
Merge branch 'main
t
-
1
.
6
.
1' in
t
o m
a
int-1
.
6
.
2
commit
|
commitdiff
|
tree
2009-05-14
J
unio C Hamano
M
e
rge
b
ranch 'maint
-
1
.
6
.
0' into m
a
int-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-05-14
J
o
ha
n
n
es Schindel
i
n
Add NO
_
CROSS_DIRE
C
TORY_HA
R
DLINKS support to the Makefi
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-13
Junio
C
Ha
m
ano
GIT 1
.
6
.
3
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-12
Jun
i
o C Hama
n
o
M
e
rge branc
h
'maint-1
.
6
.
2
' into maint
commit
|
commitdiff
|
tree
2009-05-12
Junio C H
a
mano
Me
r
g
e bra
n
ch 'jc/m
a
i
nt-r
e
ad-t
r
e
e-multi' in
t
o
m
aint
.
.
.
commit
|
commitdiff
|
tree
2009-05-12
Junio C Hamano
Rev
e
rt "c
h
eckout branch:
pri
m
e cache-
t
r
e
e fully"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-10
A
l
e
x R
i
esen
ls-tree m
a
n
page: output of ls-tre
e
is compa
t
i
b
l
e with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-10
Alex Ri
e
s
en
ls-tr
e
e manpage: use "unless" i
n
st
e
ad
of "when
.
.
.
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-10
Dave
O
lszewski
merge
-
recursive: never leave index unmerged while rec
u
rs
i
ng
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next