repo.or.cz
/
git
/
jrn.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 B
u
ch
a
cher
refuse
t
o me
r
ge during a merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-28
C
l
em
e
ns Buchach
e
r
fix segfau
l
t showin
g
an empty
r
emote
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-26
Junio C Ham
a
no
Prepa
r
e for
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-
l
n-
a
cross-l
i
bexec-and-b
i
n
.
.
.
commit
|
commitdiff
|
tree
2009-05-26
Junio C Hamano
Mer
g
e
branch 'lt/maint-diff-r
e
duce-lstat'
i
nto maint
commit
|
commitdiff
|
tree
2009-05-26
Junio C Hama
n
o
Merge branch 'jm/fo
r
m
a
t-pa
t
c
h-no-a
u
to-n-when-k
-
is
-
gi
v
en
.
.
.
commit
|
commitdiff
|
tree
2009-05-26
Junio C Hamano
Merge br
a
nch
'
do/
m
a
int-me
r
ge-recursive-fix' into maint
commit
|
commitdiff
|
tree
2009-05-26
Juni
o
C
H
amano
M
e
rg
e
branch 'jk/m
a
int-1
.
6
.
0-trac
e
-argv'
into ma
i
nt
commit
|
commitdiff
|
tree
2009-05-26
J
u
nio C
Hamano
Merg
e
branch
'n
p
/push
-
delta' i
n
to maint
commit
|
commitdiff
|
tree
2009-05-26
Jun
i
o C Hamano
Merge
b
ranch 'ar/merge-one
-
file-diag' into maint
commit
|
commitdiff
|
tree
2009-05-26
Junio C Ham
a
no
M
e
rge branch 'a
r
/unlink-err'
i
nto ma
i
nt
commit
|
commitdiff
|
tree
2009-05-26
Junio C H
a
mano
Merg
e
br
a
nch 'jk/maint-ad
d
-empt
y
' into mai
n
t
commit
|
commitdiff
|
tree
2009-05-25
J
eff King
fix c
a
t-file
usag
e
mess
a
g
e
and
docum
e
ntation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-25
Jeff Kin
g
fetch: report ref s
t
o
rage DF errors
more a
c
curately
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-25
Jeff King
lock_ref:
inf
o
rm cal
l
ers of una
v
ailab
l
e
ref
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-25
Michae
l
J
Gruber
merge-options
.
txt: Clar
i
fy
merge --sq
u
ash
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-24
J
u
n
i
o C Hama
n
o
Merge
b
ranch 'maint-1
.
6
.
2
' in
t
o maint
commit
|
commitdiff
|
tree
2009-05-24
Junio C Hamano
M
erge branch 'm
a
int-1
.
6
.
1'
into mai
n
t-1
.
6
.
2
commit
|
commitdiff
|
tree
2009-05-24
Junio
C
Hamano
Merg
e
branch '
m
aint-1
.
6
.
0' into main
t
-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-05-24
Alex R
i
esen
http-pu
s
h
.
c::remove_locks(): fix
u
se
after fr
e
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-21
R
e
n
é Scharfe
grep:
f
ix word-rege
x
p col
o
uring
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-21
Gi
u
se
p
pe Bilo
t
ta
completion: use
g
i
t rev-parse to dete
c
t ba
r
e repos
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-21
Johannes Schindelin
Co
p
e better with a _lot_ o
f
p
a
cks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-20
Je
f
f King
for-each-re
f
: fix
s
egfault in copy_emai
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-17
Step
h
en B
o
y
d
show
-
br
a
nc
h
: Fix die
me
s
sage
i
n
parse
_
reflog_param()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-17
St
e
ph
e
n Boyd
complet
i
o
n
: add missing options to
show-branch and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-17
L
inus Torvalds
dir
.
c:
c
l
ean up handli
n
g
of 'path' parameter in read
_
d
i
recto
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-17
Dan McGee
Fix
t
ype-punnin
g
issues
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-17
Na
n
ak
o
Shiraishi
test:
chec
k
ou
t
shouldn't
say that HEAD has
m
oved if
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-17
J
u
nio C
H
a
m
ano
com
p
letion: enhance
"current b
r
anch" disp
l
ay
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-17
Junio C Ha
m
an
o
co
m
plet
i
on: simplif
y
"current branch"
in
_
_git_ps1()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-17
Junio C Hama
n
o
c
o
mpl
e
tion: f
i
x PS1 display during a me
r
ge on detached
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-16
Da
n
iel
C
ordero
builtin-checko
u
t: Do
n
't tell user t
h
a
t HEAD has moved
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-16
J
i
m Meyering
pre-
c
ommit
.
sample: don'
t
print inc
i
dental SHA1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-16
Stephen
B
oyd
tests: Add tes
t
s for
m
i
s
sin
g
format-p
a
t
c
h long opt
i
ons
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-16
Stephen Boy
d
api-par
s
e
-
options
.
txt:
u
s
e 'fu
n
c' 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
_TIMESPEC for OpenBSD
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-16
Junio C
H
amano
Merge branch 'maint-1
.
6
.
2'
i
nto mai
n
t
commit
|
commitdiff
|
tree
2009-05-14
Junio C
H
amano
Merge branch 'maint-1
.
6
.
1' into maint-1
.
6
.
2
commit
|
commitdiff
|
tree
2009-05-14
Junio
C Hamano
Merge
b
ranc
h
'main
t
-
1
.
6
.
0' in
t
o
mai
n
t-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-05-14
Jo
h
annes S
c
hind
e
lin
A
d
d N
O
_CR
O
SS
_
D
I
RECTORY_HARDLINKS support to
t
he Make
f
ile
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 Hamano
Mer
g
e
bra
n
ch 'maint-1
.
6
.
2' i
n
t
o maint
commit
|
commitdiff
|
tree
2009-05-12
Jun
i
o C Ha
m
an
o
Merge bran
c
h
'j
c
/
m
aint-read-tree
-
mul
t
i' into maint
.
.
.
commit
|
commitdiff
|
tree
2009-05-12
Junio C Hamano
Revert "checkout branch: prime cache-tree fully
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-10
Alex Ri
e
sen
ls-tre
e
m
a
npage: output of ls-t
r
e
e is compatible with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-10
A
l
ex Riesen
ls-tree
manp
a
ge: use
"unles
s
"
inst
e
ad of "when
.
.
.
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-10
Dave
Olsze
w
ski
m
e
rge-recursive:
nev
e
r le
a
ve in
d
ex unmerged while
r
ecursing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-10
Linus T
o
rvalds
T
e
a
ch 'git
checkou
t
' to preload the i
n
dex c
o
nte
n
ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-10
L
i
nus
Torvald
s
Avoid unn
e
cessary 'lstat()' cal
l
s
in '
g
et_stat_data()'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-09
Je
f
f
K
ing
a
dd: do
n
't com
p
lain when addi
n
g
empty
p
r
oject root
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-09
Ji
m
Meyering
format-patch
let
-
k overri
d
e a
config-s
p
ecifie
d
format
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-09
Jeff King
f
ix GIT_TRACE segfau
l
t wit
h
shel
l
-
q
uoted aliases
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-09
A
l
exander P
o
t
ashev
D
o
cumentation: cloning to
empty
d
i
rectory
is
a
llowed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-09
A
l
ex Ri
e
s
en
Clarify
k
i
nd
o
f c
o
nflict i
n
m
e
rge-one-file helper
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-09
Feli
p
e
Con
t
reras
g
i
t
config
:
clarify --add and
-
-get-color
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-09
Junio
C
Hamano
arch
i
v
e-tar
.
c: squelch a type mismatch war
n
ing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-09
Junio C Hamano
S
t
art 1
.
6
.
3
.
1 maintena
n
ce
s
eries
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-09
Junio C Ha
m
ano
Merge b
r
anch 'm
a
i
n
t-1
.
6
.
1' into ma
i
nt-1
.
6
.
2
commit
|
commitdiff
|
tree
2009-05-09
Juni
o
C Hamano
Merge
b
r
anch 'maint-1
.
6
.
0'
into
ma
i
nt-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-05-07
J
unio C Ham
a
no
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 instead of ba
s
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
Brandon Casey
t4200: c
o
nvert sed
expression which oper
a
tes on non
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
B
r
a
ndon
Casey
t
4
200: r
e
m
ov
e
two unnece
s
sary lines
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
Brandon C
a
sey
t/annot
a
t
e
-tests
.
sh
:
av
o
id
p
a
ssing a
non-newline t
e
r
mina
t
ed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
Br
a
n
don Casey
t4118: avoid sed inv
o
ca
t
ion on
f
ile witho
u
t terminati
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
Brandon C
a
sey
t411
8
: a
d
d missin
g
'
&
&'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
Brandon C
a
sey
t80
0
5:
u
s
e
egrep when ex
t
e
nded r
e
gular expressions
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
Junio
C Hamano
g
i
t-clean doc: the co
m
mand only affects paths under
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
Junio C Hamano
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2009-05-06
Juni
o
C Hamano
Merge bran
c
h 'rj/maint-1
.
6
.
0-svn-pars
e
-f
i
x' into m
a
int
commit
|
commitdiff
|
tree
2009-05-06
Junio C Hama
n
o
Merge
b
ranch 'mai
n
t-1
.
6
.
0
' into maint
commit
|
commitdiff
|
tree
2009-05-06
Alex Riese
n
im
p
rove error messag
e
in con
f
ig
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
Brando
n
Casey
t40
1
8-diff-funcname: a
d
d cpp xfuncname pattern to syntax
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
Ber
n
d Ahler
s
Work around BSD w
h
ose
type
o
f
(
tv
.
tv_sec) != tim
e
_t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
Stephen Bo
y
d
g
it-am
.
txt: re
w
ord ex
t
ra headers i
n
messa
g
e
body
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
S
t
ephen Boyd
git-am
.
txt: Use
d
at
e
o
r valu
e
i
n
s
t
ead of time or timest
a
mp
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
Steph
e
n Boyd
git-
a
m
.
txt:
add an
'a', say what
'
it' is,
simplify
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
Stephen Boyd
c
ompletion:
c
om
p
lete values for
s
end-ema
i
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
Stephen Boyd
comp
l
e
tion
:
complete
v
alues for log
.
date
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
S
t
ephe
n
Boyd
c
o
mpletion: comp
l
ete v
a
lues for help
.
format
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
S
t
ephen Boyd
c
o
mple
t
ion: add {gu
i
,diff,merge}tool, man, and
pager
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
S
t
ephen Boyd
comple
t
i
on: add missin
g
configuration
v
ar
i
ables
to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
Allan C
a
f
f
ee
dir
.
c: Fi
x
tw
o
minor
g
r
ammatical e
r
r
o
rs in comm
e
n
ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-06
Rob
i
n H
.
Johnson
git-svn: fix a
s
lop
p
y G
e
topt
:
:L
o
ng usage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-03
Junio C
Hamano
S
y
nc with GI
T
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
Mer
g
e b
r
anch
'
np/maint-no-ofs-delt
a
' into m
a
int
commit
|
commitdiff
|
tree
2009-05-03
Junio
C Hamano
Merge branch 'maint-1
.
6
.
1' into maint
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
Junio C
H
amano
Merg
e
bran
c
h 'jc/maint-read-tree-m
u
lti' into ma
i
nt
commit
|
commitdiff
|
tree
2009-05-03
Ju
n
io C Hamano
Merge branch 'mk/maint
-
apply-swap' into ma
i
nt
commit
|
commitdiff
|
tree
2009-05-03
Junio C Hamano
Merge branch 'mm/ma
i
nt-add-
p
-quit' into m
a
in
t
commit
|
commitdiff
|
tree
2009-05-03
Junio C Haman
o
M
erge branch '
l
t/pack
-
o
bject-m
e
muse
'
i
n
to maint
commit
|
commitdiff
|
tree
2009-05-03
Juni
o
C Hamano
Merge branch
'
jc/maint-1
.
6
.
0-keep-pack
'
into mai
n
t
.
.
.
commit
|
commitdiff
|
tree
2009-05-03
Ju
n
i
o
C Ha
m
a
no
Mer
g
e
b
r
anch
'jc/mai
n
t
-
1
.
6
.
0-diff-bo
r
row-carefully
.
.
.
commit
|
commitdiff
|
tree
2009-05-03
Juni
o
C H
a
mano
Merge br
a
nch '
b
s
/
maint-1
.
6
.
0-tree-walk
-
pre
f
ix' into
.
.
.
commit
|
commitdiff
|
tree
2009-05-02
Junio
C
Ham
a
no
GIT 1
.
6
.
3-
r
c
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-02
Nic
o
la
s
Pi
t
re
hono
r
re
p
a
ck
.
usedeltabaseoff
s
et wh
e
n fetching packs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-02
Junio C H
a
m
ano
Mer
g
e git://repo
.
or
.
cz/git-gu
i
commit
|
commitdiff
|
tree
next