repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'sb/ref-lock-lose-lock-fd'
2015-04-29
Juni
o
C Hamano
merge:
d
eci
d
e
if we auto-genera
t
e the
message early
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Ha
m
ano
me
r
ge: make collect_p
a
rents
(
) aut
o
-generate the me
r
ge
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Jun
i
o C H
a
mano
merge: e
x
tract
p
repare_merg
e
_
m
essage() logic out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: narrow
s
cop
e
of merg
e
_names
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C
H
amano
m
e
rge:
s
p
l
it r
e
duc
e
_
parents(
)
o
ut of
collect_paren
t
s()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Juni
o
C
Hamano
merge
:
cla
r
ify co
l
lect_p
a
r
e
nts() logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hama
n
o
m
erge: small
l
eakfi
x
a
n
d
c
o
de simplification
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Juni
o
C Hamano
me
r
ge:
d
o not c
h
eck
arg
c
to dete
r
m
i
ne number of remote
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: clarify
"
pullin
g
into v
o
id" sp
e
cial
c
a
se
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
unio C Ham
a
no
t5
5
20: t
e
st pulling an octopus
int
o
a
n
unborn br
a
nch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Juni
o
C Hamano
t
5
520: style fix
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Jun
i
o C Hamano
m
erge: simplify code
flo
w
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Jun
i
o
C
Ham
a
no
m
e
r
ge: test t
h
e top-level merge
d
river
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Jeff King
f
i
lt
e
r-branch: avoid
p
assing com
m
it message through sed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Phil Hord
rebase -i: redo t
a
sks tha
t
die during cherry-pick
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-28
Jeff K
i
ng
test-
l
ib: turn on G
I
T_
T
EST_CHAIN_LIN
T
by default
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-28
Ramsay Jones
t7502-
c
ommit
.
sh:
fi
x
a
b
roken an
d
-chai
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-28
brian m
.
carlson
connect: improve check for plink to re
d
uce false positives
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-28
b
r
i
a
n
m
.
carlson
t56
0
1: f
i
x quotation error leading to skipp
e
d tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-28
brian m
.
carls
o
n
connect: simpl
i
f
y SSH con
n
ec
t
ion code path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-28
J
unio C Hama
n
o
test: validate
p
rerequist
e
s syntax
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-28
Junio
C
Hamano
M
e
rge branch 'mh/multima
i
l-renewal'
commit
|
commitdiff
|
tree
2015-04-28
Ju
n
io
C
H
a
mano
M
e
r
ge branch 'mg/show-notes
-
d
oc'
commit
|
commitdiff
|
tree
2015-04-28
Juni
o
C
Hamano
Merge branch 'nd
/
versioncmp-p
r
erel
e
a
s
es'
commit
|
commitdiff
|
tree
2015-04-28
Juni
o
C
H
amano
M
e
rge branch 'm
g
/status-v-v'
commit
|
commitdiff
|
tree
2015-04-28
L
uke Diamand
git-p4: add failin
g
tests
f
or
c
ase-folding p4d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-28
Lu
k
e Diam
a
nd
git-p4: t981
4
:
p
revent --chai
n
-
lint failure
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-28
Jeff King
rebase: silence "git checkout" for noop r
e
b
ase
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-28
Michael Hag
g
e
rty
U
p
date git-mu
l
timail
t
o v
e
rsion 1
.
0
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-27
Junio C
H
amano
Sync w
i
t
h
2
.
3
.
7
commit
|
commitdiff
|
tree
2015-04-27
Junio C Hamano
G
i
t 2
.
3
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-27
Junio C Hamano
Merge branch 'tb/
c
onnect-
i
pv6-pa
r
se-fix' into maint
commit
|
commitdiff
|
tree
2015-04-27
Junio C Hamano
Mer
g
e branch 'ma/bash-com
p
letion-
l
eaking-
x
' into maint
commit
|
commitdiff
|
tree
2015-04-27
Junio C Haman
o
Merge bra
n
c
h
'jc
/
push-
c
ert' into mai
n
t
commit
|
commitdiff
|
tree
2015-04-27
Fr
e
drik
Gusta
f
s
son
Documentation: clarif
y
how "git comm
i
t" cleans up
t
he
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-25
Torsten B
ö
g
ershausen
t0027: Add re
p
o
MIX and L
F
_nul
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-24
Michae
l
Haggert
y
status: document
t
he -v/--verbose option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-23
Mich
a
e
l
Hagg
e
rty
RelNotes:
wor
d
s
mithing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-23
Micha
e
l Haggert
y
RelNotes: refer to the rebase -
i
"to
d
o list", not
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-23
Mic
h
ael
Hagger
t
y
RelN
o
te
s
:
correct name of version
s
ort
.
p
r
e
releas
e
Suffix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-23
M
i
c
h
ael Hagg
e
r
ty
g
i
t ta
g
: mentio
n
versionsort
.
pre
r
e
leaseSu
f
fix in
m
anpag
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-23
V
itor Antunes
git-p4: improve clie
n
t path d
e
tection when b
r
a
nches
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-22
Junio C
H
am
a
no
i
g
nore
:
info/ex
c
lude should trump core
.
excludesfile
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-22
Junio C
Hama
n
o
Git 2
.
4
.
0-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-22
Jeff King
s
top putting
arg
v
[0] dirname a
t
front of PATH
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-22
Jeff King
s
tash: require a clean
inde
x
to a
p
ply
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-22
Jeff
K
i
n
g
t39
0
3:
a
void
applying
o
nto dirty
i
ndex
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-22
Jeff
King
t3903:
s
t
op ha
r
d
-
coding com
m
it
s
ha1s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-22
Vito
r
Antunes
t9801: check g
i
t-p4's bran
c
h dete
c
tion with clien
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hamano
S
yn
c
wi
t
h ma
i
nt
commit
|
commitdiff
|
tree
2015-04-21
Junio C
H
a
mano
Git 2
.
3
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hamano
Merge bra
n
ch 'jk/
c
olors' into maint
commit
|
commitdiff
|
tree
2015-04-21
Junio C H
a
mano
Merge bran
c
h 'j
k
/
t
e
st-ann
o
yan
c
es'
i
nto maint
commit
|
commitdiff
|
tree
2015-04-21
Junio C
H
amano
M
e
rge br
a
nc
h
'pt/enter-repo-comment-fix
'
into m
a
int
commit
|
commitdiff
|
tree
2015-04-21
Ju
n
io C Hamano
Merge
branch 'jz/g
i
tw
e
b-conf-doc-fix' into main
t
commit
|
commitdiff
|
tree
2015-04-21
Jun
i
o
C Hamano
Merge branch '
j
k/cher
r
y-
p
ick-docfix' into
main
t
commit
|
commitdiff
|
tree
2015-04-21
Ju
n
i
o
C Hamano
Merg
e
br
a
nch 'iu/fix-pa
r
s
e
-options-h-comment' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hamano
M
e
rge bra
n
ch
'jg/
c
gu
i
d
e
-we-ca
n
not-coun
t
' into
m
aint
commit
|
commitdiff
|
tree
2015-04-21
Junio C
Hama
n
o
Merge branch 'jk/pack-corruption-post-mortem' into
.
.
.
commit
|
commitdiff
|
tree
2015-04-21
Junio
C
H
a
mano
Merge bra
n
c
h
'
j
n/doc-fast-impo
r
t-no-1
6
-octopus-limit
.
.
.
commit
|
commitdiff
|
tree
2015-04-21
Juni
o
C Hamano
RelNote
s
: "merge --q
u
iet" change has
b
een
reve
r
ted
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-20
Junio C Hamano
Ho
p
e
f
ully the las
t
ba
t
ch for 2
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-20
Junio
C Ha
m
a
no
Merge branch
'ps/grep-he
l
p-a
l
l-callback
-
arg
'
commit
|
commitdiff
|
tree
2015-04-20
Junio
C Hamano
Mer
g
e
branch 'tb/conn
e
ct-ipv
6
-
p
ar
s
e-fix
'
commit
|
commitdiff
|
tree
2015-04-20
Juni
o
C Hamano
M
erge branch 'va/fix-git-p4-tests'
commit
|
commitdiff
|
tree
2015-04-20
Junio
C
Hama
n
o
Merge branch 'jc/push-cert'
commit
|
commitdiff
|
tree
2015-04-20
Ju
n
io C Ha
m
a
n
o
Merge bran
c
h 'ma/bash-co
m
pletion-leaking-
x
'
commit
|
commitdiff
|
tree
2015-04-20
Ju
n
io C Hamano
fm
t
-
merge-msg:
plug s
m
all leak of commit buffer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-20
Jef
f
King
sha1_
f
ile: onl
y
freshen pack
s
once per run
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-20
Jeff Kin
g
sha1_file: fr
e
s
h
en
p
ack object
s
b
e
fore loose
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-20
Jeff Kin
g
reachable: only mark l
o
c
al obj
e
cts as rece
n
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-20
Lex Spoon
git-p4:
u
se -m when running p4 changes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-20
M
a
tth
i
eu Mo
y
log -L:
improve error messa
g
e on malformed argument
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-20
M
a
tthieu M
o
y
D
o
cumentation:
change -
L
:<regex>
t
o -L:<funcname>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-19
Junio
C
Hamano
Merge t
a
g 'g
i
tgui-
0
.
20
.
0' of http://rep
o
.
or
.
cz/r
/
git-
g
ui
commit
|
commitdiff
|
tree
2015-04-19
Nguy
ễ
n Thái Ngọc
Duy
t1
5
0
9
: up
d
at
e
pr
e
pare scrip
t
to be abl
e
to run
t1
5
09
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-19
Nguy
ễ
n
Thái Ngọc Duy
ind
e
x-pack
:
k
i
ll union
del
t
a_bas
e
t
o save memory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-18
T
o
rsten Böger
s
hause
n
t0027
:
sup
p
o
rt NATIVE_CRLF plat
f
orm
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-18
Torsten Bögershausen
t0027: clea
n
u
p
: rename functions; av
o
id non-leading
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-17
Jeff King
limi
t
_list: avoid quadratic behavior fro
m
st
i
ll_interesting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-17
Jeff King
ty
p
e_from_s
t
ring_gent
l
y
:
make sure length
m
atches
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-17
Ossi H
e
rrala
config
:
f
ix
s
e
ttings in
d
efault_user_config template
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-17
Michae
l
J
Gruber
rev-
l
ist-options
.
txt: complete sente
n
ce about notes
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
M
atthie
u
M
o
y
stash -p: demon
s
trate failure of split with mixed y/n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
Matthieu Moy
t
3
904
-
stash-patch
:
f
actor PERL prereq
a
t the top of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
M
atthieu Moy
t
3
9
04
-
stash-patch: fix test
descri
p
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
Matt
h
ieu Moy
add -p:
demonstrate failure when
r
unning 'edit' after
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
Mat
t
h
i
eu Moy
t3
7
01
-
a
dd-interacti
v
e:
s
implify code
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
Elia Pinto
tes
t
-lib-functions
.
sh:
f
ix the second a
r
gument to some
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
Junio C
H
a
m
ano
att
r
: skip U
T
F
8
BOM at
the beginning of th
e
input file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
Junio C Hamano
con
f
ig: use utf
8
_bom[
]
from utf
.
[ch] in git_parse
_
sourc
e
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
Junio C
Hamano
utf8
-
bom: introduce
s
kip
_
ut
f
8_bom() he
l
per
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
Junio C Hamano
add_ex
c
l
u
de
s
_
fr
o
m_file: clari
f
y the bom
s
kip
p
ing
l
ogic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
Carlos Martín Ni
e
to
dir: a
l
low a BOM at the be
g
inning o
f
exclude file
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
J
eff King
t1430:
a
dd another refs-esca
p
e
test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
Jef
f
King
read
_
p
acked_
r
ef
s
: avoid dou
b
le-
c
hec
k
ing sane
r
efs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
Jeff King
s
trbuf_getwhol
e
line: us
e
getdelim
if it
is available
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
Jeff King
strbuf_get
w
hole
l
i
n
e
: avoid callin
g
strbuf_grow
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
Jeff Kin
g
s
t
r
b
uf_a
d
dch: av
o
id calling strbuf_grow
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
Jeff Ki
n
g
c
o
nfig: use getc_unlocked when reading from fil
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next