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
refuse to merge during a merge
2009-06-02
Clemens Buchacher
r
e
fuse to
merge du
r
in
g
a m
e
rge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-28
Clemens Buch
a
cher
fi
x
seg
f
ault showing an empty re
m
ote
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-26
Jun
i
o C Hamano
Prepare for
1
.
6
.
3
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-26
Junio C Hamano
Merge b
r
anch 'js/main
t
-no-ln-across-libexec
-
and
-
b
i
n
.
.
.
commit
|
commitdiff
|
tree
2009-05-26
Junio C H
a
m
a
no
Me
r
ge
bran
c
h 'lt/maint-di
f
f-reduce-lstat'
i
n
to
m
aint
commit
|
commitdiff
|
tree
2009-05-26
Juni
o
C Hamano
Me
r
ge bran
c
h 'jm/format-patch-no-auto-n-
w
hen-k-is-given
.
.
.
commit
|
commitdiff
|
tree
2009-05-26
J
u
nio
C Ha
m
an
o
M
erge
b
r
an
c
h 'd
o
/maint-merge-re
c
ursive-f
i
x
' into maint
commit
|
commitdiff
|
tree
2009-05-26
Junio C Hamano
M
erge
branch 'j
k
/maint-1
.
6
.
0-trace-
a
rgv
'
in
t
o m
a
int
commit
|
commitdiff
|
tree
2009-05-26
Junio C
H
ama
n
o
Merge branch
'np/push
-
delta' into
m
a
i
nt
commit
|
commitdiff
|
tree
2009-05-26
Junio C H
a
m
ano
Merge
b
ranch
'
a
r/merge
-
one-fil
e
-
diag' into
m
aint
commit
|
commitdiff
|
tree
2009-05-26
Junio C Ha
m
an
o
Merge branch 'ar/unlink-err' into
m
aint
commit
|
commitdiff
|
tree
2009-05-26
Juni
o
C Hamano
Merg
e
branch 'jk/ma
i
n
t-add
-
e
m
p
t
y' into maint
commit
|
commitdiff
|
tree
2009-05-25
Jeff King
fix cat-file usage me
s
sag
e
an
d
doc
u
m
enta
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-25
Jeff
King
fetch: re
p
ort ref storage DF
e
rrors
m
ore acc
u
rately
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-25
Je
f
f
K
i
ng
l
o
ck_ref: info
r
m cal
l
e
rs o
f
unavailable ref
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-25
Michael J Gruber
merge-o
p
tions
.
t
x
t
: Cl
a
rify
m
e
rge --squas
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-24
Junio C Hamano
Merge
branch
'maint-
1
.
6
.
2' i
n
to mai
n
t
commit
|
commitdiff
|
tree
2009-05-24
Junio C Hamano
Merge branch 'maint-1
.
6
.
1' into maint-1
.
6
.
2
commit
|
commitdiff
|
tree
2009-05-24
Ju
n
io C Ham
a
n
o
Merge bran
c
h
'maint-1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-05-24
Alex
R
iesen
http-push
.
c::remove_lock
s
(
)
: fix us
e
after
f
r
ee
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-21
René Scharf
e
grep:
fi
x
w
ord-rege
x
p
colour
i
ng
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-21
Giuseppe Bilotta
completion: use git r
e
v-parse to d
e
tec
t
bar
e
r
epos
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-21
Joh
a
nnes S
c
h
i
nd
e
l
i
n
Cope be
t
ter with
a
_
l
ot_
o
f packs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-20
Jeff King
for-ea
c
h-ref: f
i
x se
g
fault in cop
y
_email
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-17
S
t
ephen Boyd
sho
w
-branch: Fix di
e
me
s
sag
e
in parse_re
f
log_param()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-17
S
t
e
phe
n
Bo
y
d
co
m
pletion:
ad
d
mis
s
ing o
p
tions to s
h
o
w-bra
n
ch a
n
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-17
L
inus
Torv
a
lds
dir
.
c: clean up h
a
n
d
l
ing of 'p
a
th' parameter in read_
d
ire
c
to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-17
Dan McGee
Fix type-
p
unning issues
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-17
Nanako Sh
i
raishi
t
est: checkout shoul
d
n't say that HEAD
h
as moved if
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-17
Jun
i
o
C Hamano
complet
i
on: enhance "current bra
n
ch" display
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-17
Junio C Hamano
completi
o
n: simplify "curr
e
n
t
br
a
nch" in __git_ps1()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-17
J
u
nio C Hamano
complet
i
o
n: fix PS1
d
i
splay during a mer
g
e on deta
c
hed
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-16
D
a
niel Cor
d
ero
bu
i
l
t
in-checkout: Don
'
t tell user tha
t
HEAD has moved
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-16
J
im Meyering
pr
e
-commit
.
sampl
e
: don't print
i
nc
i
dental SH
A
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-16
S
t
ephen B
o
yd
tests: Add tests for m
i
s
si
n
g
format-patch long option
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-16
Ste
p
hen Boyd
api-parse-options
.
txt
:
u
s
e 'func' instead of 'funct
'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-16
Tony Kemp
Tu
r
n on USE_ST_T
I
MESPEC
for OpenB
S
D
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-16
Junio C Ha
m
ano
Merg
e
branch 'maint-1
.
6
.
2' into mai
n
t
commit
|
commitdiff
|
tree
2009-05-14
Junio C Hamano
Merge
b
ranch 'maint-1
.
6
.
1'
into maint-1
.
6
.
2
commit
|
commitdiff
|
tree
2009-05-14
Junio C Hamano
Mer
g
e
b
ranch 'maint-1
.
6
.
0' in
t
o maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-05-14
Johanne
s
Schind
e
li
n
Add NO
_
CROSS_DI
R
EC
T
ORY_H
A
R
DLINKS su
p
port to the Makefile
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-13
Junio C
Hamano
GIT 1
.
6
.
3
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-12
Junio C Ha
m
ano
Merge branch 'maint
-
1
.
6
.
2' int
o
ma
i
nt
commit
|
commitdiff
|
tree
2009-05-12
Junio C
Hamano
M
erge branch 'jc/
m
aint
-
rea
d
-tree-mul
t
i' int
o
mai
n
t
.
.
.
commit
|
commitdiff
|
tree
2009-05-12
Junio C Hamano
Rever
t
"check
o
ut branch: prime cache-tree full
y
"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-10
Al
e
x Riesen
ls-tree manpage: output of ls-tree is compatible wi
t
h
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-10
Alex Riesen
ls
-
tree manpage:
use "un
l
e
ss" inst
e
ad of "when
.
.
.
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-10
D
a
v
e Olszewsk
i
merge-re
c
u
rsive: never leave
i
ndex unmerged while recursing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-10
L
inus Torval
d
s
Te
a
ch
'git check
o
ut' to preload the index contents
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-10
L
i
nus T
o
rv
a
lds
Avoid unne
c
essary 'lstat()
'
calls in 'get_stat_data()'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-09
Jef
f
King
add:
d
on't
complain
w
hen a
d
di
n
g empty proje
c
t root
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-09
Jim Meyer
i
ng
fo
r
mat-pa
t
ch l
e
t -k override a conf
i
g-specified
f
o
rmat
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-09
Jeff Ki
n
g
fix GIT_TRACE segfault with sh
e
ll-
q
u
o
ted aliases
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-09
Ale
x
ande
r
Potashe
v
D
o
cu
m
entation
:
cloning to
e
mpty director
y
is allowed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-09
Alex Rie
s
e
n
Clar
i
fy ki
n
d
o
f
conflict
in merge-one-fi
l
e h
e
lper
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-09
Felipe Contreras
git config: clarif
y
-
-add
a
n
d
-
-get-colo
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-09
Junio C Hamano
archive-tar
.
c: sque
l
ch
a type misma
t
ch warn
i
ng
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-09
Junio
C
Hama
n
o
Start 1
.
6
.
3
.
1 maintenance series
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-09
Jun
i
o
C
Hamano
Merge branch
'
maint-1
.
6
.
1
' into
maint-1
.
6
.
2
commit
|
commitdiff
|
tree
2009-05-09
J
u
n
io
C Hamano
M
e
rge br
a
nch 'maint-1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-05-07
Junio
C H
a
mano
G
I
T 1
.
6
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-07
Ng
u
yễn
T
hái N
g
ọc Duy
t4
0
2
9
:
use
sh instead
o
f
b
a
s
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
Br
a
ndon
Casey
t4
2
00: convert se
d
e
x
pression whi
c
h
o
perates on non
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
B
r
and
o
n
C
asey
t4200:
r
emove
tw
o
unnecessar
y
li
n
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
Brand
o
n Casey
t/annotate-t
e
sts
.
sh:
avoid pass
i
ng a non-new
l
ine terminated
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
Brandon C
a
sey
t4118: avoid sed
invoca
t
io
n
on file withou
t
ter
m
inati
n
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
Brandon Casey
t
4
118: add
mis
s
ing '&&'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
Brandon Casey
t8005:
use egrep when extended regular ex
p
ressions
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
J
u
nio C Hamano
g
it-c
l
ean doc: the command only affects paths u
n
der
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
Junio C
H
a
mano
Merge bra
n
c
h
'
maint'
commit
|
commitdiff
|
tree
2009-05-06
Jun
i
o
C
Hamano
M
erge
branch 'rj/ma
i
nt-1
.
6
.
0-
s
vn-parse-fix' into maint
commit
|
commitdiff
|
tree
2009-05-06
Junio C Hamano
Merge b
r
anch 'maint-1
.
6
.
0' in
t
o mai
n
t
commit
|
commitdiff
|
tree
2009-05-06
Alex Riesen
i
m
prove error message in config
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
Brandon
Casey
t
4018-diff-fun
c
name
:
add cpp xfuncname pat
t
e
rn to s
y
ntax
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
Bernd
Ahlers
Work
a
r
o
un
d
BSD
w
hose typeof(tv
.
tv_s
e
c
) !
=
t
i
m
e_t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
Stephen Boyd
git-am
.
txt: reword extra
h
eaders in mes
s
age body
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
Stephen
B
o
yd
git-
a
m
.
t
x
t: Use date
o
r va
l
ue instead
o
f t
i
me or ti
m
es
t
a
m
p
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
S
t
ephen Boyd
git-a
m
.
t
x
t
: add a
n
'a', say what
'it' is, si
m
plify
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
St
e
phen Bo
y
d
completi
o
n: complete va
l
u
e
s
for
s
end-email
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
Step
h
e
n Boy
d
completion:
co
m
plete values fo
r
log
.
date
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
S
t
ephen Boyd
complet
i
o
n: complete
value
s
for help
.
f
o
r
m
at
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
S
tephen Boyd
comp
l
etion:
a
dd {gu
i
,
d
iff,
m
er
g
e}tool, man,
and
pager
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
Stephen Boyd
comple
t
ion: add missing configuration
variables to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
A
l
lan Caffee
d
ir
.
c: Fix two
m
inor gra
m
matical erro
r
s
in
c
om
m
en
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
Robin H
.
J
o
hnson
g
it-svn
:
fix
a
s
l
oppy Getopt::Long usa
g
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-03
Juni
o
C Hamano
S
y
nc with GIT 1
.
6
.
2
.
5
commit
|
commitdiff
|
tree
2009-05-03
Junio C Hamano
GIT
1
.
6
.
2
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-03
Junio C Hamano
Merge branc
h
'np/maint
-
no-ofs-delta'
i
nto m
a
int
commit
|
commitdiff
|
tree
2009-05-03
J
u
nio C Ham
a
no
Merg
e
bran
c
h 'm
a
int-1
.
6
.
1' i
n
to maint
commit
|
commitdiff
|
tree
2009-05-03
Junio C
H
ama
n
o
GIT 1
.
6
.
1
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-03
Junio C
Hamano
Merge branch 'jc
/
ma
i
n
t
-read-tree
-
multi' into mai
n
t
commit
|
commitdiff
|
tree
2009-05-03
Jun
i
o C Hamano
Merge branch 'mk/maint-
a
pply-swap'
into ma
i
nt
commit
|
commitdiff
|
tree
2009-05-03
Junio
C Hamano
M
e
rge
b
r
anch 'mm/maint-add-p
-
quit' into maint
commit
|
commitdiff
|
tree
2009-05-03
Junio C Hamano
Merge branch 'lt
/
pack-o
b
jec
t
-memuse' i
n
to maint
commit
|
commitdiff
|
tree
2009-05-03
Juni
o
C
H
aman
o
Merge
b
ranch 'jc/m
a
int
-
1
.
6
.
0-keep-
p
ack' into mai
n
t
.
.
.
commit
|
commitdiff
|
tree
2009-05-03
Junio C
H
amano
Merge branc
h
'jc/m
a
int-1
.
6
.
0-di
f
f-borrow-carefull
y
.
.
.
commit
|
commitdiff
|
tree
2009-05-03
Ju
n
io C Hamano
Merge
b
ranch 'b
s
/m
a
int-1
.
6
.
0-tree-walk-prefix' into
.
.
.
commit
|
commitdiff
|
tree
2009-05-02
Ju
n
i
o C Hamano
GI
T
1
.
6
.
3-rc4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-02
Nico
l
as
P
it
r
e
honor repack
.
used
e
ltabaseoffset when fetching pac
k
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-02
Junio
C
Hama
n
o
Merge git://repo
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
next