repo.or.cz
/
git
/
mingw
/
j6t.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'pt/pull-ff-vs-merge-ff' into maint
2015-06-05
Junio C Hamano
Merg
e
branch 'pt/pull-ff-vs-merg
e
-ff' int
o
maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C H
a
mano
Merge
b
r
anch 'rs
/
plug
-
leak-i
n
-pack-bitmaps' into mai
n
t
commit
|
commitdiff
|
tree
2015-06-05
Junio C Ha
m
ano
M
e
rge branch 'ja/tutorial-a
s
ci
i
docto
r
-
fix' into mai
n
t
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o
C
Hamano
Merge branch 'jk/stripspace-asciid
o
c
tor-fix
'
int
o
main
t
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o C Hamano
Merg
e
branch '
j
k/asciido
c
-markup-
f
ix' into mai
n
t
commit
|
commitdiff
|
tree
2015-06-05
J
unio C Hamano
Mer
g
e branch 'ps/bundle-v
e
rif
y
-
arg'
i
n
to
m
a
i
nt
commit
|
commitdiff
|
tree
2015-06-05
Junio C Haman
o
Merge branch
'
mh/write
-
refs-sooner-2
.
4'
i
n
t
o maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Ha
m
ano
M
erge
branch 'mh
/
ref-
d
i
r
ectory-file
'
into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge br
a
nch
'
mg/
l
o
g
-decorate-HEAD' into mai
n
t
commit
|
commitdiff
|
tree
2015-06-05
Junio
C Hamano
M
erg
e
branch '
s
b/t1020
-
clea
n
up' into
maint
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o C
Ham
a
n
o
Merge branch 'jc/gi
t
ig
n
ore-prec
e
dence' i
n
to maint
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io C
H
amano
Me
r
ge
b
ranch
'
bc/
c
o
nnect-plink' into maint
commit
|
commitdiff
|
tree
2015-06-05
J
u
n
i
o
C
Hamano
Merge branch 'p
h
/rebase-i
-
r
e
d
o
' in
t
o maint
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o
C Haman
o
Merge bra
n
ch 'jk/add-
e
-
kill-editor' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Ha
m
ano
Merge
b
ranch 'm
h
/clone-verbosity-f
i
x' into ma
i
nt
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o C Hamano
Merge
b
ranch 'jk/sha1-file-reduce-us
e
le
s
s
-
w
arnings
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C
Hamano
Merge b
r
anc
h
'tb/b
l
ame-resur
r
e
c
t-convert-to-git' into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
J
un
i
o C Hamano
Me
r
g
e branch 'jc/plug-fmt-m
e
rge-msg-leak' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hama
n
o
M
erge bra
n
ch 'pt
/
x
dg-co
n
f
ig-p
a
th' into m
a
int
commit
|
commitdiff
|
tree
2015-05-26
Ju
n
io C H
a
mano
Git 2
.
4
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-26
J
unio C
H
aman
o
M
erge bra
n
ch 'jk/still-interest
i
ng'
i
nto maint
commit
|
commitdiff
|
tree
2015-05-26
Junio C H
a
man
o
M
e
rge branch 'jc/hash
-
objec
t
'
i
nto maint
commit
|
commitdiff
|
tree
2015-05-26
Junio
C
Hamano
Merge branch 'jk/r
e
base-quie
t
-noop'
in
t
o maint
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merg
e
br
a
nch
'
sg/complete
-
decorate-
f
u
l
l-no
t
-long
'
into
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merge
b
r
anch '
j
k/filter-bra
n
ch-use
-
of-sed-on-inco
m
plete
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Junio C H
a
mano
Merg
e
branch
'jc/daemon-no-ipv6-f
o
r
-
2
.
4
.
1
'
into ma
i
nt
commit
|
commitdiff
|
tree
2015-05-26
Junio C
Ham
a
no
Merge br
a
n
c
h 'jk/stash-re
q
uire
-
clean-
i
n
dex' into maint
commit
|
commitdiff
|
tree
2015-05-26
Junio C
H
amano
Merge b
r
anch
'
jk
/
g
i
t
-no-mo
r
e-argv0
-
path-mung
i
ng'
i
nt
o
.
.
.
commit
|
commitdiff
|
tree
2015-05-19
René
Schar
f
e
pack
-
bit
m
aps: pl
u
g memory leak, fi
x
allo
c
at
i
o
n s
i
ze
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-19
M
i
k
e
Hommey
clone:
c
all transport_set_verbosity
before anyt
h
ing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-18
Stefan Beller
subdirec
t
ory tes
t
s
:
code cleanup, uncomment te
s
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-18
P
au
l
Tan
pull:
parse pull
.
f
f as
a
b
ool or
s
tri
n
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-18
Paul Tan
p
ull: make pull
.
ff=tr
u
e
o
v
erride merge
.
ff
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-14
Jeff Ki
n
g
doc: convert Ascii
D
oc {?foo} to ifdef::foo
[
]
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-13
J
u
ni
o
C Hama
n
o
Gi
t
2
.
4
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-13
J
unio C Ha
m
ano
Merge br
a
nch
's
b
/
line-log-plug-pairdiff-leak' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-13
J
u
nio C Hamano
Merge br
a
nch 's
b
/tes
t
-bi
t
map-free-a
t
-end' into ma
i
nt
commit
|
commitdiff
|
tree
2015-05-13
J
u
n
io C Hamano
Merge branch 'nd/t1509-chroot-test' into
m
a
int
commit
|
commitdiff
|
tree
2015-05-13
Juni
o
C Haman
o
Merge branch 'jk/typ
e
-
f
r
o
m
-
string-gently' into ma
i
nt
commit
|
commitdiff
|
tree
2015-05-13
Junio C Hamano
Merge bran
c
h
'
ep/fix-test-
l
ib-functi
o
ns-re
p
ort' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-13
J
u
nio
C
H
amano
Merge b
r
anch 'cn/bom-in
-
g
i
tignore' into
m
a
int
commit
|
commitdiff
|
tree
2015-05-13
Junio C Ham
a
no
Merge branch 'jk
/
p
rune-
m
ti
m
e
' into
maint
commit
|
commitdiff
|
tree
2015-05-13
Junio C Ham
a
no
Merge branch
'
jk
/
i
n
it-core-work
t
ree-at-root' into maint
commit
|
commitdiff
|
tree
2015-05-13
Junio C Hamano
log: do
not shorten decoration names
t
oo
e
arly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-13
Juni
o
C H
a
mano
log:
decorate HEAD with bra
n
ch name under --de
c
orate
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-13
Jeff King
d
o
c
: pu
t
example U
R
Ls and emails inside
l
iteral ba
c
kticks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-13
Jeff King
doc: drop
backsla
s
h quoting
o
f some
c
urly bra
c
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-13
Jeff King
d
oc:
c
o
nvert \--option to --option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-13
Jeff King
doc/add
:
ref
o
rmat `--edit` op
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-13
Je
f
f Ki
n
g
d
oc: fix
l
e
ngth of underlined
s
ection-t
i
t
l
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-13
J
e
f
f
Kin
g
d
o
c: fix
h
a
ngi
n
g "
+
"-continuation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-13
Jeff Kin
g
doc: fi
x
unq
u
oted
use
of "{type}"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-13
J
e
ff Kin
g
doc: fix misrend
e
ring due to `single quote'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-13
Jeff King
doc: f
i
x
u
n
matched
code fences in git-st
r
ipspace
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-13
J
u
nio C Hama
n
o
Merge br
a
n
ch
'
mh/w
r
ite-refs-so
o
ner-
2
.
3'
into
m
h
/
w
rite
.
.
.
commit
|
commitdiff
|
tree
2015-05-13
Michael Ha
g
gerty
ref_transaction_com
m
it(): fix atomi
c
ity a
n
d
a
void
f
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-13
M
ichael H
a
g
g
erty
ref_tra
n
sactio
n
_commit(): remove the
local fla
g
s variable
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-13
Mic
h
ael Haggerty
ref_tran
s
action_commit(): i
n
line call to write_ref_s
h
a1()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-13
Mich
a
el Haggerty
rename_ref():
i
nline calls to write_ref_sha1
(
) f
r
om
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-13
M
ichael Haggerty
commit_ref_
u
pdate(): new function, extracted f
r
om write_ref_
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-13
Michael Haggerty
w
r
i
t
e_ref_to
_
lockfile():
n
ew
f
u
n
ction, ext
r
acte
d
from
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-13
Stef
a
n Beller
t7
0
04:
r
en
a
me ULIMIT test pr
e
requisit
e
to
ULIMIT_STACK_SIZE
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-13
Stefan
Beller
u
p
date-ref: te
s
t handli
n
g large transactions properly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-13
Junio C Hamano
M
e
rge branch 'mh
/
write-refs-sooner-2
.
2' into mh/wri
t
e
.
.
.
commit
|
commitdiff
|
tree
2015-05-13
Micha
e
l H
a
ggert
y
ref_transaction_c
o
mmit(
)
: fix atomicity an
d
avoid fd
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-13
Mi
c
hael Haggerty
ref_transaction_co
m
mit(): r
e
move the
local flags va
r
ia
b
l
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-13
Michael Hagg
e
rty
ref_transaction_
c
omm
i
t
(): in
l
ine call to write
_
ref_sha
1
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-13
M
icha
e
l Hagge
r
ty
rename_re
f
():
inlin
e
calls to write_ref_sha1(
)
from
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-13
Michae
l
H
a
ggerty
com
m
it_re
f
_update
(
): new
f
u
n
ction, extracte
d
from write
_
ref_
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-13
Michael Haggerty
w
r
ite_ref_to_lockf
i
le(): new
f
uncti
o
n, extracted from
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-13
Ste
f
an Be
l
ler
t7004: r
e
name ULIMIT
test prer
e
q
u
isite to ULIMIT_STA
C
K_SI
Z
E
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-13
Jeff King
add
:
check return value of launch_editor
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-12
J
ean-Noel Avi
l
a
doc: fix unmatched code fe
n
ces
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-11
Junio C Ha
m
ano
Sync with 2
.
3
.
8
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-11
J
unio
C
Hamano
G
i
t
2
.
3
.
8
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-11
J
u
n
io
C Hamano
Merge
branch 'mm/usage
-
log-l
-
can-tak
e
-regex' i
n
to
m
aint
-
2
.
3
commit
|
commitdiff
|
tree
2015-05-11
Junio C
H
amano
Merge branch 'jc/diff-no-index-d-
f
' into maint-2
.
3
commit
|
commitdiff
|
tree
2015-05-11
Junio
C
Hamano
Merge branch 'oh
/
fix-config
-
default-user-name-section
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Junio C
H
am
a
no
M
erge
branch 'jc/epocht
i
m
e-w
o
-tz'
i
nto maint-
2
.
3
commit
|
commitdiff
|
tree
2015-05-11
Michael Ha
g
gerty
reflog_expire():
i
nt
e
grate lock_r
e
f_sha1_basic() errors
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
M
ichael Haggerty
ref
_
tran
s
a
c
t
i
on
_
commit(): delete ext
r
a "t
h
e" from err
o
r
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Michael
H
aggerty
ref_tra
n
sa
c
tion_commit(): p
r
ovide
b
etter er
r
or messages
commit
|
commitdiff
|
tree
2015-05-11
M
i
chae
l
Hagger
t
y
rename_ref(): int
e
grat
e
lock_re
f
_
s
ha1_basic() errors
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Michael
H
a
ggerty
lock
_
ref_sha
1
_basic
(
)
:
improve diagnost
i
cs fo
r
ref
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Mic
h
ael
Haggerty
lock_ref_sha1_b
a
sic(): rep
o
rt
e
rrors
via a "struct
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
M
ichael Haggerty
v
e
rify_re
f
n
am
e
_available(): report errors via a "struct
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Michae
l
H
a
ggerty
verif
y
_refname_av
a
i
lable():
rename function
commit
|
commitdiff
|
tree
2015-05-11
Michael
H
a
gge
r
ty
r
efs: check for D/F c
o
nflicts
a
mong refs
created in
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
M
i
chael Haggerty
ref_tr
a
n
sactio
n
_commit():
u
se a s
t
ring_li
s
t for detecting
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Mic
h
ael Hagge
r
t
y
is_
r
efname_a
v
ail
a
ble
(
): use dirname
i
n first loop
commit
|
commitdiff
|
tree
2015-05-11
M
ichael Haggerty
struct nonmatc
h
ing_ref_data: store a refn
a
me i
n
stead
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Michael Hagge
r
ty
r
eport_
r
efname_conflic
t
(): inline function
commit
|
commitdiff
|
tree
2015-05-11
Michael
Haggerty
entry_match
e
s
()
:
inli
n
e fun
c
tion
commit
|
commitdiff
|
tree
2015-05-11
Michael Ha
g
gerty
is_refname_available(): convert local
va
r
iable "dirname
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Michael
Haggert
y
is
_
refna
m
e_avail
a
ble(): avoid shadowing "dir" v
a
r
i
able
commit
|
commitdiff
|
tree
2015-05-11
Mi
c
hael
H
ag
g
erty
is_refname_availab
l
e()
:
r
evamp
t
he comments
commit
|
commitdiff
|
tree
2015-05-11
Michael Hag
g
erty
t1404: new te
s
ts of re
f
D/F
c
onfl
i
cts within
t
r
ansac
t
ions
commit
|
commitdiff
|
tree
2015-05-10
Stefan Beller
upda
t
e-ref: test h
a
n
d
ling l
a
rge transactions
properly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-08
Patrick
S
teinhardt
bundle:
v
eri
f
y arguments m
o
re strictly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-06
P
aul Tan
pat
h
.
c
:
remo
v
e ho
m
e
_conf
i
g_
p
aths(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next