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
refuse to merge d
u
ring a merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-28
Cl
e
mens
Buchach
e
r
fix se
g
fault showing
an e
m
p
t
y
r
emote
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-26
Jun
i
o C Ham
a
n
o
Prepare fo
r
1
.
6
.
3
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-26
Jun
i
o C
Hamano
Merge branch 'js/maint-no-ln-ac
r
oss-l
i
b
ex
e
c-and-bin
.
.
.
commit
|
commitdiff
|
tree
2009-05-26
Junio C Hama
n
o
Me
r
ge branch 'lt/maint-d
i
ff-reduce-lstat' into
m
a
int
commit
|
commitdiff
|
tree
2009-05-26
Junio C Hamano
Merge branch 'jm/format-
p
a
tch-no-auto-n-
w
h
en-
k
-i
s
-given
.
.
.
commit
|
commitdiff
|
tree
2009-05-26
Juni
o
C Hama
n
o
Merge branch 'do/maint-merge-recursive-fix' into maint
commit
|
commitdiff
|
tree
2009-05-26
J
unio C Hamano
Mer
g
e
branch 'jk/main
t
-1
.
6
.
0-tra
c
e-a
r
gv'
i
n
to maint
commit
|
commitdiff
|
tree
2009-05-26
Junio C Hamano
Merge
branch 'np/push-delta' into main
t
commit
|
commitdiff
|
tree
2009-05-26
Junio C Hamano
Merge branch 'ar/merge-on
e
-
file-diag'
i
nto main
t
commit
|
commitdiff
|
tree
2009-05-26
Junio C
Hamano
Merge branch
'ar/unl
i
nk-err' into
mai
n
t
commit
|
commitdiff
|
tree
2009-05-26
Junio C
H
amano
Mer
g
e b
r
a
nch 'jk/maint-add-empty' into mai
n
t
commit
|
commitdiff
|
tree
2009-05-25
Jeff King
f
i
x cat-file usage messa
g
e
a
n
d documentation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-25
Jeff King
f
e
t
c
h
:
repor
t
ref storage DF errors more
a
ccurate
l
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-25
Jeff King
loc
k
_ref: inform c
a
l
l
ers of unav
a
ilable ref
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-25
Mich
a
el J Gruber
merge-options
.
txt:
C
larify merge --sq
u
ash
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-24
Junio C Hamano
Merg
e
branch
'maint-1
.
6
.
2' into maint
commit
|
commitdiff
|
tree
2009-05-24
Junio C
Ham
a
no
Merge branch 'maint-
1
.
6
.
1
'
i
nto
m
aint-1
.
6
.
2
commit
|
commitdiff
|
tree
2009-05-24
Ju
n
io C Hamano
Merge branch
'
m
aint
-
1
.
6
.
0'
i
n
t
o
m
aint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-05-24
A
l
ex
R
iesen
h
t
tp-push
.
c::remove_locks():
fix use after free
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-21
R
e
né
S
c
h
a
rf
e
grep: fix wo
r
d-regexp colouring
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-21
Gius
e
ppe Bilotta
co
m
p
l
e
t
ion: u
s
e git r
e
v-parse t
o
detect b
a
r
e rep
o
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-21
Johann
e
s Sch
i
ndelin
Cop
e
better with
a
_lot_ of packs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-20
Jeff King
for-
e
ach-ref: fix
segfault in
c
o
py_email
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-17
St
e
phen Boyd
sho
w
-branch: Fix
die me
s
sage
in parse_r
e
flog_param()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-17
Stephen Bo
y
d
comple
t
ion: add missin
g
options to sh
o
w-branch
a
nd
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-17
Linus Torv
a
lds
dir
.
c: clean up
h
a
ndling
o
f 'path' parameter in read_directo
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-17
D
an McGee
F
i
x type-punnin
g
is
s
u
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-17
Na
n
ako S
h
iraishi
test: checko
u
t shouldn't say
tha
t
H
E
A
D h
a
s
m
oved i
f
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-17
Junio C
H
am
a
no
com
p
le
t
ion: enhanc
e
"
cu
r
rent
branch" display
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-17
Junio C Hamano
comple
t
i
o
n
: si
m
plify
"
c
u
rrent branch" in
__g
i
t
_
p
s1()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-17
J
unio C Hamano
completion: fix PS1 d
i
spla
y
during
a
merg
e
on detached
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-16
Danie
l
Cordero
bu
i
l
t
i
n-check
o
ut: Don'
t
tell user
t
h
at HEA
D
has
m
ov
e
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-16
Jim
M
e
y
ering
p
re-commit
.
sample: don't print i
n
cidental SHA1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-16
Steph
e
n Boyd
test
s
: Ad
d
tests for mis
s
ing format
-
pa
t
ch long options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-16
Ste
p
hen Boyd
api-parse-options
.
t
x
t: use 'f
u
nc' inste
a
d o
f
'funct
'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-16
Tony Kemp
Turn on USE_
S
T
_
TIME
S
PEC for OpenBSD
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-16
Junio C Hamano
Me
r
ge branch '
m
aint-1
.
6
.
2'
into maint
commit
|
commitdiff
|
tree
2009-05-14
Junio C H
a
mano
Merg
e
branch
'maint-1
.
6
.
1' into m
a
int-1
.
6
.
2
commit
|
commitdiff
|
tree
2009-05-14
Junio
C
Hamano
Merge branch '
m
aint-1
.
6
.
0' into ma
i
nt-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-05-14
J
ohannes Schin
d
elin
Add NO_
C
ROSS_DIREC
T
ORY_HARDL
I
NKS support to the Makefile
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-13
Jun
i
o C Ham
a
no
G
IT 1
.
6
.
3
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-12
Junio C Hamano
Merge br
a
nch 'maint-1
.
6
.
2'
into maint
commit
|
commitdiff
|
tree
2009-05-12
Junio
C Hamano
Mer
g
e branch 'jc/
m
aint-r
e
ad-tre
e
-multi' into maint
.
.
.
commit
|
commitdiff
|
tree
2009-05-12
Junio C
H
aman
o
Rev
e
rt "c
h
ec
k
out br
a
nch: prime cache
-
tree fully"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-10
Alex
R
i
esen
ls-tree
m
anpage: output of ls-tree is com
p
atible with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-10
A
l
ex
R
iesen
ls-tree
m
a
npage: u
s
e "unless"
i
nstead of "when
.
.
.
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-10
Da
v
e Olsze
w
ski
merge-recursive:
n
ever lea
v
e index unmerged w
h
ile recursing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-10
Linus T
o
rvalds
Teach 'git
checko
u
t' to
p
reloa
d
the i
n
dex cont
e
nts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-10
Linus Torvalds
Avoid un
n
ecessary 'lstat()' call
s
in '
g
et_stat_data
(
)'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-09
Jeff King
add: don't compl
a
in when adding empty project root
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-09
Ji
m
Meyering
f
o
r
mat-patch let -k override
a config-specifie
d
f
orm
a
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-09
J
e
ff King
fix GI
T
_TRACE seg
f
ault wi
t
h shell-quoted
al
i
ases
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-09
Alex
a
nder
Po
t
ashev
Documentation:
c
loning to empty directory is allowed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-09
Alex
R
iese
n
Clar
i
fy kind of conflict in me
r
ge-one-
f
ile helpe
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-09
Felipe Contrera
s
g
i
t
c
onfig: cl
a
ri
f
y --add and --g
e
t-color
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-09
Junio
C
Hamano
archive-t
a
r
.
c:
s
quelch
a
type mismat
c
h warning
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-09
Junio C Hamano
Sta
r
t 1
.
6
.
3
.
1 maintenance serie
s
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-09
J
u
n
i
o
C Hamano
M
e
rge branch 'maint-
1
.
6
.
1' into maint-1
.
6
.
2
commit
|
commitdiff
|
tree
2009-05-09
J
u
nio C Hamano
Merge branch 'maint-1
.
6
.
0' in
t
o maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-05-07
Ju
n
io C Hamano
GIT 1
.
6
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-07
Nguyễn
T
hái Ngọ
c
Duy
t
4
02
9
: use s
h
instead of bas
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
B
r
an
d
o
n
Ca
s
ey
t4
2
0
0: convert sed expression which operates
o
n non
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
Brandon
Casey
t420
0
: remov
e
t
wo unn
e
c
e
s
s
ary
l
ine
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
Brando
n
C
a
sey
t
/
annotat
e
-tests
.
sh: avoid pa
s
sing a non-newli
n
e terminated
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
Brandon
C
asey
t4118:
a
v
o
id s
e
d i
n
v
ocation on file without te
r
minatin
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
Brandon Casey
t
4
1
18: add mi
s
s
i
ng '&&'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
Bra
n
d
o
n
C
asey
t8005:
u
se
e
grep whe
n
e
x
tended re
g
ular ex
p
ressi
o
ns
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
Junio C Hamano
g
i
t-clea
n
doc:
the command only affects paths under
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
Juni
o
C Hama
n
o
Merge b
r
anch
'
m
a
i
nt'
commit
|
commitdiff
|
tree
2009-05-06
Junio C Hamano
Mer
g
e branch
'r
j
/maint-1
.
6
.
0-svn-parse-
f
ix' into ma
i
n
t
commit
|
commitdiff
|
tree
2009-05-06
J
u
nio C Ham
a
no
M
erge branch
'
maint-1
.
6
.
0' into maint
commit
|
commitdiff
|
tree
2009-05-06
Alex R
i
esen
improve er
r
or message in config
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
Bra
n
don
Casey
t401
8
-
d
iff-funcname: add cpp xfuncname
pa
t
tern to syntax
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
Bernd Ahlers
W
o
rk
a
round
BSD whose
t
ype
o
f(tv
.
tv_s
e
c) != ti
m
e_t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
Stephen
Boyd
git-am
.
txt: re
w
ord extra
h
eaders in message
body
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
Stephen Boy
d
g
it-am
.
t
xt: Use
date
o
r va
l
ue instead of tim
e
or timestamp
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
St
e
phen Boy
d
git-am
.
txt: ad
d
an 'a', say what 'it' is, simplify
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
Stephen Boyd
co
m
pletion: complete values for send-ema
i
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
Stephen Boyd
comp
l
e
t
ion
:
co
m
plete v
a
l
ues for
log
.
d
a
te
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
Stephen Boyd
completion: co
m
plete value
s
for
h
elp
.
format
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
Stephen Boy
d
com
p
leti
o
n:
add {gui,diff,merge}
t
ool, man, and
pager
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
Stephen Boyd
c
o
m
p
letio
n
: a
d
d missin
g
configuration variables to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
A
llan Caffee
dir
.
c
:
F
ix two minor grammatical errors in comme
n
ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
Robin H
.
Johnson
git-svn: fix a slop
p
y Get
o
pt::Long usage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-03
Jun
i
o C Hamano
Sync with GIT 1
.
6
.
2
.
5
commit
|
commitdiff
|
tree
2009-05-03
J
unio
C
Ha
m
a
no
GIT 1
.
6
.
2
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-03
Junio C Hamano
Mer
g
e
b
r
a
n
c
h 'np/ma
i
nt-no-ofs-delta'
into maint
commit
|
commitdiff
|
tree
2009-05-03
Junio C Hamano
Mer
g
e branch '
m
aint-1
.
6
.
1
'
into ma
i
nt
commit
|
commitdiff
|
tree
2009-05-03
Junio
C
Hamano
GIT
1
.
6
.
1
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-03
J
u
nio C
Hamano
Merge branch
'
jc/m
a
i
n
t-read-tr
e
e-multi' in
t
o ma
i
n
t
commit
|
commitdiff
|
tree
2009-05-03
Junio C Hamano
Merge bra
n
ch 'mk/main
t
-apply-swap
'
into
m
ai
n
t
commit
|
commitdiff
|
tree
2009-05-03
Junio
C
Hamano
Merge branc
h
'mm/maint-add-p-quit' i
n
to
m
aint
commit
|
commitdiff
|
tree
2009-05-03
Junio C Hamano
Merg
e
branch 'lt/pack-object-memuse' into m
a
int
commit
|
commitdiff
|
tree
2009-05-03
J
u
nio C Hamano
Mer
g
e branch 'jc/m
a
int-1
.
6
.
0-keep-pack' into maint
.
.
.
commit
|
commitdiff
|
tree
2009-05-03
J
unio C Ha
m
ano
M
e
r
g
e branch 'jc/maint-1
.
6
.
0-diff-bo
r
row-carefull
y
.
.
.
commit
|
commitdiff
|
tree
2009-05-03
Ju
n
i
o C
H
amano
Me
r
ge branch 'b
s
/m
a
int-1
.
6
.
0-tree-walk-prefix' into
.
.
.
commit
|
commitdiff
|
tree
2009-05-02
Junio C Ha
m
ano
GIT 1
.
6
.
3
-
r
c4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-02
Nicolas
P
itre
honor repack
.
use
d
e
l
tabaseof
f
set
w
hen fetc
h
ing packs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-02
Junio C Hamano
M
er
g
e git://repo
.
or
.
cz/git-
g
ui
commit
|
commitdiff
|
tree
next