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
Cleme
n
s Buchacher
refuse to merg
e
durin
g
a merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-28
Clemens Buchach
e
r
fi
x
segfault
s
ho
w
i
n
g
a
n
e
m
pty remote
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-26
Junio C H
a
mano
Prepare
fo
r
1
.
6
.
3
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-26
Junio C Haman
o
Mer
g
e branch 'js
/
ma
i
nt-no-ln-
a
cross-lib
e
xec-and-bin
.
.
.
commit
|
commitdiff
|
tree
2009-05-26
Jun
i
o C Hamano
Merge b
r
anch '
l
t/maint-d
i
ff-reduce-lstat' into maint
commit
|
commitdiff
|
tree
2009-05-26
Junio
C
Hamano
Merg
e
b
r
anc
h
'jm/f
o
rmat-patch-no-auto-
n
-
w
hen
-
k-is-given
.
.
.
commit
|
commitdiff
|
tree
2009-05-26
Junio C Hamano
Me
r
ge
b
ran
c
h 'do/m
a
int-merge-recursive-fix'
into m
a
i
n
t
commit
|
commitdiff
|
tree
2009-05-26
Junio
C
Hamano
Merge branch
'
j
k
/maint
-
1
.
6
.
0-trace-argv' into mai
n
t
commit
|
commitdiff
|
tree
2009-05-26
Ju
n
io C H
a
man
o
Merge branch 'np/push-delta' in
t
o
maint
commit
|
commitdiff
|
tree
2009-05-26
Junio C Hamano
Merge bran
c
h 'ar/mer
g
e-one-file-
d
i
a
g' into maint
commit
|
commitdiff
|
tree
2009-05-26
Junio C
Ham
a
no
Merge
b
ranch 'ar/
u
nlink-err' into maint
commit
|
commitdiff
|
tree
2009-05-26
Ju
n
io C Hamano
Merge
bran
c
h
'jk/maint-
a
dd-empty' into maint
commit
|
commitdiff
|
tree
2009-05-25
Jef
f
King
fix ca
t
-file usage m
e
ssage and d
o
cumentation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-25
J
eff Ki
n
g
fetch: report ref
s
t
or
a
ge DF errors
m
o
re accuratel
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-25
Jeff K
i
ng
l
ock_r
e
f: info
r
m c
a
llers of unavailable ref
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-25
Mic
h
ael J Gruber
merge-options
.
t
x
t
:
C
l
ari
f
y merge --sq
u
ash
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-24
Junio C Hama
n
o
M
e
r
ge branch
'maint
-
1
.
6
.
2' into maint
commit
|
commitdiff
|
tree
2009-05-24
Jun
i
o
C Hama
n
o
Merge branch 'maint-1
.
6
.
1' into maint-1
.
6
.
2
commit
|
commitdiff
|
tree
2009-05-24
Junio C Ha
m
a
n
o
Merge b
r
anch 'maint-1
.
6
.
0' into main
t
-
1
.
6
.
1
commit
|
commitdiff
|
tree
2009-05-24
Al
e
x Ries
e
n
ht
t
p
-
push
.
c
::remove_lo
c
ks(): f
i
x u
s
e af
t
e
r
free
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-21
René
Sc
h
arfe
grep: fi
x
w
o
r
d-re
g
e
xp
c
o
l
ouring
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-21
Giu
s
eppe Bilotta
c
ompletion
:
use
git
r
ev-
p
arse to det
e
ct b
a
re repos
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-21
J
o
hannes
Sc
h
inde
l
in
Cope better
w
i
th a _
l
ot_ of
pa
c
ks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-20
J
eff King
for
-
each-ref: fix
s
egfault
in copy_email
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-17
S
tephen Boyd
sho
w
-branch: Fix die m
e
ssage in par
s
e
_
reflog_pa
r
am()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-17
Stephen Boyd
compl
e
tion: add
m
i
ssin
g
opti
o
n
s
t
o
show-branch a
n
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-17
L
i
nus Torv
a
ld
s
dir
.
c: cle
a
n u
p
handling of 'path' parameter in read_dir
e
cto
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-17
Dan
M
cGee
Fix ty
p
e-pun
n
ing issues
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-17
N
a
n
ako Sh
i
ra
i
s
h
i
test:
c
heckout shouldn't say that
H
EAD has moved if
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-17
Junio C Hamano
completi
o
n: enhance "c
u
r
re
n
t branch"
display
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-17
J
u
nio C Ha
m
ano
compl
e
tion:
simp
l
ify "current bra
n
ch
"
in
_
_
git_ps1()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-17
Junio C
H
amano
c
o
mpletio
n
:
f
ix
P
S1 display du
r
ing
a
merge o
n
d
e
tached
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-16
Daniel Cordero
builtin-checkout: Don
'
t tell
u
ser
t
hat HEAD ha
s
moved
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-16
Ji
m
M
e
yering
pre-commit
.
s
ample: don't print i
n
ci
d
ent
a
l SHA1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-16
Stephen Bo
y
d
tests:
A
dd tests for missing format-patch long options
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-16
Stephen
Boyd
ap
i
-parse-option
s
.
t
x
t: use
'
func' i
n
stea
d
of 'funct'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-16
Tony Kemp
Turn on USE_ST_
T
IMESPEC for Open
B
S
D
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-16
Junio
C
Haman
o
M
erge branch 'main
t
-1
.
6
.
2' into maint
commit
|
commitdiff
|
tree
2009-05-14
Ju
n
i
o C Hamano
Me
r
g
e br
a
n
ch 'mai
n
t-1
.
6
.
1' into maint-1
.
6
.
2
commit
|
commitdiff
|
tree
2009-05-14
Juni
o
C
Hamano
Merge br
a
nc
h
'maint-1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-05-14
Johanne
s
Schindelin
Add
N
O_CROSS_DIRECTORY_HARDLINKS support 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
J
u
nio
C Ham
a
no
Merge b
r
anch 'm
a
i
n
t-1
.
6
.
2' into maint
commit
|
commitdiff
|
tree
2009-05-12
Junio C Hamano
Merge
branch 'jc/
m
aint-read
-
tree-multi' i
n
to m
a
int
.
.
.
commit
|
commitdiff
|
tree
2009-05-12
Junio
C
Hamano
Revert "chec
k
o
u
t branch: prime cach
e
-tree fully"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-10
A
l
ex
R
ie
s
en
ls-tree manpage: o
u
tput
o
f ls-tree
is compatible with
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-10
Alex Ri
e
sen
ls-tree manpage: u
s
e "unle
s
s" ins
t
ead o
f
"when
.
.
.
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-10
Dave Olszewski
m
e
rge
-
recursive: never leave index unmerged while recursing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-10
Linu
s
Torvalds
Tea
c
h 'git checkout'
t
o preload the index
c
ontents
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-10
Linu
s
Torv
a
lds
Av
o
id un
n
ecessary 'lstat()' calls in 'get_
s
tat_data()'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-09
Jeff King
add: d
o
n't
c
o
m
plai
n
when
a
d
d
ing empty
p
roject root
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-09
J
i
m Meyering
format-patch let -k
o
v
e
rride
a
config-speci
f
ied format
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-09
Jeff
K
ing
fix G
I
T_TRACE
s
egfault wit
h
s
hell-quote
d
aliases
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-09
A
lexander Potashev
Documentation:
c
loning to empt
y
direct
o
ry is allowed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-09
Alex Riesen
Clarify kind o
f
c
o
nfli
c
t
i
n merge-one
-
fil
e
helper
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-09
Felipe Contreras
git config: clarify
--add and --get
-
c
ol
o
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-09
Junio
C
Hama
n
o
ar
c
hi
v
e-
t
ar
.
c: squelch a type m
i
smatch
w
arning
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-09
Junio C Haman
o
Start 1
.
6
.
3
.
1 maintenan
c
e series
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-09
Ju
n
io C Haman
o
Merge branch
'
m
a
int-1
.
6
.
1' into mai
n
t-1
.
6
.
2
commit
|
commitdiff
|
tree
2009-05-09
Junio C H
a
mano
M
erge branch 'maint-1
.
6
.
0' i
n
to maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-05-07
Junio C H
a
mano
GIT 1
.
6
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-07
Nguyễn Thái
Ngọc Duy
t4029: use sh in
s
t
e
ad
o
f b
a
sh
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
B
r
an
d
on C
a
sey
t
4200: conv
e
rt sed expression
w
h
ic
h
opera
t
es on non
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
B
randon Casey
t4200: r
e
move two unne
c
essary lin
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
B
r
a
nd
o
n Casey
t/annotate-t
e
sts
.
sh: avoi
d
pas
s
i
n
g a non-newline terminated
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
Brand
o
n Casey
t4118
:
a
v
oid sed
i
nvocati
o
n
on file
without terminating
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
B
r
andon
Casey
t4
1
1
8
: ad
d
m
i
ssing
'
&&'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
Brand
o
n
C
asey
t
8005: use egrep when extend
e
d
r
egular
ex
p
ress
i
ons
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
Junio C Hamano
git
-
c
lean doc: the command on
l
y affects
p
aths under
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
Jun
i
o C
H
a
mano
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2009-05-06
Junio
C
Hamano
Merge branch 'rj
/
m
aint-1
.
6
.
0-sv
n
-pars
e
-fix' into ma
i
nt
commit
|
commitdiff
|
tree
2009-05-06
Junio
C
Hamano
Mer
g
e branch 'maint-1
.
6
.
0' i
n
to ma
i
nt
commit
|
commitdiff
|
tree
2009-05-06
Alex
R
iesen
im
p
rove error message in conf
i
g
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
B
randon C
a
sey
t4018-diff-funcname: ad
d
cpp xfunc
n
am
e
pattern
t
o
sy
n
t
ax
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
Bernd Ahlers
Wo
r
k around BSD whose typ
e
o
f(tv
.
t
v
_sec) != time_t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
Stephen Boy
d
git
-
am
.
txt
:
rewo
r
d
e
xtra heade
r
s in mess
a
ge body
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
Stephen Boyd
g
i
t-am
.
txt: Use date or
value instead of time or ti
m
e
s
tamp
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
S
t
ephen Bo
y
d
git-am
.
txt: ad
d
an
'
a', say what
'it' i
s
, s
i
m
pli
f
y
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
Stephen Boyd
c
o
mple
t
ion: c
o
mplete val
u
e
s
f
o
r send-email
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
Stephen Boyd
completion:
comp
l
e
te values fo
r
l
og
.
date
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
Stephen Boyd
co
m
pletion: co
m
plete value
s
for he
l
p
.
format
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
Stephe
n
Boyd
comp
l
e
tion: add {g
u
i,dif
f
,
m
e
rge}tool, ma
n
, and
pa
g
er
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
S
t
ep
h
en B
o
yd
co
m
plet
i
on:
a
dd missing configura
t
io
n
variables
to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
Alla
n
Caffee
d
ir
.
c: Fix two
m
i
n
or g
r
amm
a
tical
e
rrors in comments
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
Robin H
.
J
ohn
s
on
git-svn: fix a sloppy Getopt::Long usage
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-03
Ju
n
i
o C Hamano
Sy
n
c
w
i
th GIT
1
.
6
.
2
.
5
commit
|
commitdiff
|
tree
2009-05-03
Junio C H
a
mano
GIT 1
.
6
.
2
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-03
Junio C
H
a
man
o
Merg
e
branch 'np/maint-n
o
-
o
fs-delta' i
n
to
m
ai
n
t
commit
|
commitdiff
|
tree
2009-05-03
Juni
o
C
Hamano
M
erg
e
b
r
anch 'maint-1
.
6
.
1
'
into maint
commit
|
commitdiff
|
tree
2009-05-03
Juni
o
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 Ha
m
ano
Merge branch 'jc/m
a
int-re
a
d-
t
ree-
m
ulti' into maint
commit
|
commitdiff
|
tree
2009-05-03
Junio C Ham
a
no
Merge branch 'mk/maint-
a
pply-s
w
ap' into
main
t
commit
|
commitdiff
|
tree
2009-05-03
Ju
n
io C
Hamano
Merge branch 'mm/maint-add-p
-
quit'
into
main
t
commit
|
commitdiff
|
tree
2009-05-03
Ju
n
io C Hamano
Merge branch 'lt/pack-object-memuse'
i
nto maint
commit
|
commitdiff
|
tree
2009-05-03
Junio C Hamano
Merge b
r
anch 'jc/m
a
int-1
.
6
.
0
-keep-pack' into
mai
n
t
.
.
.
commit
|
commitdiff
|
tree
2009-05-03
Junio C
Hamano
Merge branch 'jc/mai
n
t-1
.
6
.
0-d
i
ff-b
o
rrow-ca
r
e
f
u
l
ly
.
.
.
commit
|
commitdiff
|
tree
2009-05-03
Junio C
Hamano
Merge
b
r
anch 'b
s
/maint-1
.
6
.
0
-tre
e
-
w
alk-prefix' into
.
.
.
commit
|
commitdiff
|
tree
2009-05-02
J
u
nio C Hamano
GIT
1
.
6
.
3-rc4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-02
Nicolas Pitre
honor repack
.
usedeltabaseoffset wh
e
n
f
etchi
n
g packs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-02
Jun
i
o C Hamano
Merge
git:/
/
r
ep
o
.
or
.
cz/git
-
gui
commit
|
commitdiff
|
tree
next