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
t1404: add a bunch of tests of D/F conflicts
2017-10-25
Michael Haggerty
t
1
404
:
a
dd a
b
unch o
f
test
s
of D/F
c
onflicts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-09-08
Michael
Hag
g
erty
files_t
r
a
n
saction_finish(
)
: del
e
te reflogs before references
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-09-08
Mi
c
hael Haggerty
packed-backen
d
: rip out some now-unu
s
e
d
c
ode
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-09-08
Micha
e
l Haggerty
f
iles_ref_store
:
u
se a transacti
o
n to update p
a
ck
e
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-09-08
Michael H
a
ggerty
t14
0
4:
d
em
o
n
s
t
ra
t
e two p
r
oblems
wi
t
h reference tr
a
nsaction
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-09-08
Michael Haggerty
fil
e
s_init
i
al
_
transa
c
tion_c
o
mmit(
)
: use a
transaction
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-09-08
M
i
chael Haggert
y
prune_refs()
:
also free
t
he linked li
s
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-09-08
Michael Hagger
t
y
files_pack_refs(): use
a
refe
r
e
n
ce
tr
a
nsaction
t
o w
r
i
t
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-09-08
M
i
c
hael H
a
ggerty
packed_del
e
te_refs()
:
implement method
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-09-08
Michael Hag
g
erty
packed_ref_store: imple
m
ent reference tran
s
actions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-09-08
Michael Ha
g
g
erty
s
t
r
u
ct ref_
t
ransaction: add a pl
a
ce for
backends
to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-09-08
M
ichael Haggerty
p
a
ck
e
d-backen
d
: don't
adjust the reference
c
ount on
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-08-27
Junio C
H
amano
The fif
t
h batch
post 2
.
14
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-08-27
Junio C Ha
m
a
n
o
Mer
g
e bran
c
h 'mg/killed-merg
e
'
commit
|
commitdiff
|
tree
2017-08-27
Junio C H
a
mano
Merg
e
branch 'j
t
/pack
m
igrate'
commit
|
commitdiff
|
tree
2017-08-27
Junio C
H
amano
Merge
branch 'mh/ref-lock-ent
r
y'
commit
|
commitdiff
|
tree
2017-08-27
Ju
n
io C
H
a
m
a
no
Merge
b
ranch '
j
t/doc
-
pack-objects-fi
x
'
commit
|
commitdiff
|
tree
2017-08-27
Ju
n
io C Hamano
M
e
rge branch '
j
c/cutof
f
-config'
commit
|
commitdiff
|
tree
2017-08-27
Jun
i
o C Hamano
Merge br
a
n
c
h 'kw/write-inde
x
-
r
educe-al
l
o
c
'
commit
|
commitdiff
|
tree
2017-08-27
Junio C
Hamano
Me
r
g
e
branch 'bw/subm
o
d
u
l
e-conf
i
g-cleanup'
commit
|
commitdiff
|
tree
2017-08-27
Jun
i
o C
H
aman
o
Merge branch 'js/gitweb
-
raw-blob-
l
ink-in-history'
commit
|
commitdiff
|
tree
2017-08-27
Junio C
H
ama
n
o
Merge bran
c
h
'
po/objec
t
-id'
commit
|
commitdiff
|
tree
2017-08-27
Junio C Ha
m
ano
Merge branch '
j
n/
v
c
s
-svn-clea
n
up'
commit
|
commitdiff
|
tree
2017-08-27
Junio C Hamano
Merge bra
n
ch 'bc/vcs-
s
vn
-
cleanup'
commit
|
commitdiff
|
tree
2017-08-27
Junio
C Hamano
Me
r
g
e
bran
c
h 'tb/apply-
w
ith-crlf'
commit
|
commitdiff
|
tree
2017-08-27
Juni
o
C
Ha
m
ano
Merge branch 'jt/stash-tests'
commit
|
commitdiff
|
tree
2017-08-27
Jun
i
o
C Hama
n
o
Merge branch 'jk/tr
a
ilers-parse'
commit
|
commitdiff
|
tree
2017-08-27
Junio C Hamano
Me
r
ge bran
c
h 'pb/trai
l
ers
-
f
r
o
m-command-lin
e
'
commit
|
commitdiff
|
tree
2017-08-27
Junio C Hamano
M
erge branch 'jt/d
i
ff-color-move
-
fix
'
commit
|
commitdiff
|
tree
2017-08-27
Junio
C
Hamano
M
e
r
g
e branch 'sb/diff-color-m
o
ve'
commit
|
commitdiff
|
tree
2017-08-24
Junio
C
Hama
n
o
The fourth batch post 2
.
14
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-08-24
Junio C Hamano
Merge branch 'jk/doc-the-thi
s
'
commit
|
commitdiff
|
tree
2017-08-24
Junio C Hamano
Merge
branc
h
'rs/commit-h-s
i
ngle-parent-cle
a
nup
'
commit
|
commitdiff
|
tree
2017-08-24
Junio C
H
amano
Me
r
ge bra
n
ch
'j
c
/simplify-
p
rogress
'
commit
|
commitdiff
|
tree
2017-08-24
Juni
o
C
H
a
mano
Me
r
ge branch 'tc/curl-
w
ith-backports'
commit
|
commitdiff
|
tree
2017-08-24
Junio
C
Haman
o
Merge
b
ranch 'cc/subpro
c
e
s
s
-
handsh
a
ke-mi
s
sing-c
a
pabilities'
commit
|
commitdiff
|
tree
2017-08-24
Junio C H
a
m
a
no
M
e
rge b
r
a
n
ch 'rs/object-id'
commit
|
commitdiff
|
tree
2017-08-24
Junio C Hama
n
o
M
e
rge branch 'lg/mer
g
e-signoff'
commit
|
commitdiff
|
tree
2017-08-23
Jonathan Tan
pa
c
k:
move for_each_packed_object()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-08-23
Jonatha
n
Tan
pack:
move h
a
s_pack_index(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-08-23
Jonathan Tan
pack: move h
a
s_sha1_
p
ac
k
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-08-23
Jonathan Tan
pack: move
f
i
nd_p
a
ck_entry() and
make it
g
lobal
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-08-23
Jonathan Tan
pack
:
move find_sha1_pack()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-08-23
Jonathan Tan
p
a
ck:
m
ove find_pa
c
k_entry
_
o
ne(), is_pack_valid()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-08-23
Jonat
h
an Tan
pack
:
m
o
ve
check_pack_index_ptr(), nth_packed_object_offs
e
t()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-08-23
Jon
a
than Tan
pack: mov
e
n
th_pack
e
d_object_
{
sha1,oid}
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-08-23
Jonathan
Tan
p
ack
:
move clear_delta_ba
s
e_
c
ache(), pac
k
ed_object_inf
o
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-08-23
Jonathan Tan
pack: move unpack_o
b
ject_header
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-08-23
Jonat
h
an Tan
pa
c
k: move
g
e
t
_
size_from_de
l
ta()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-08-23
Jona
t
han
Tan
p
a
ck: move unpack_objec
t
_header_buffer()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-08-23
Jonat
h
an Tan
p
ack: move {,re}prepare_packed_git and approximate_ob
j
ect_count
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-08-23
Jonatha
n
Tan
pack: mo
v
e i
n
st
a
ll
_
packed_git
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-08-23
Jonathan Tan
p
a
ck: mo
v
e
add_pa
c
ked
_
g
i
t(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-08-23
Jonathan Tan
pa
c
k
:
move
u
nuse_pa
c
k()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-08-23
Jonathan Tan
pa
c
k: move
use_
p
a
ck()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-08-23
Jo
n
athan Tan
pack: m
o
ve
pack-cl
o
si
n
g
functions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-08-23
Jonathan Tan
pac
k
: m
o
ve rele
a
s
e_pac
k
_memory()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-08-23
Jonathan Tan
pack: move open_pa
c
k_index(), parse_pack_index()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-08-23
J
onathan Tan
p
ack: move pack_report()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-08-23
Jo
n
a
t
han Tan
pa
c
k: mo
v
e static state variables
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-08-23
Jonat
h
an Tan
pack: move
p
ack name
-
related
f
u
n
c
tions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-08-23
Junio C Hamano
Sync wit
h
maint
commit
|
commitdiff
|
tree
2017-08-23
Ju
n
io C H
a
ma
n
o
Prepare for 2
.
14
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-08-23
Junio
C Haman
o
Merge
branch 'jt/t1450-fsck-corrupt
-
pac
k
f
ile' into
.
.
.
commit
|
commitdiff
|
tree
2017-08-23
Junio C Hamano
Mer
g
e b
r
an
c
h 'jb/t8
0
0
8-cl
e
anup' into maint
commit
|
commitdiff
|
tree
2017-08-23
J
unio
C
Hamano
Merge b
r
an
c
h 'jt/subproces
s
-ha
n
dshake' into maint
commit
|
commitdiff
|
tree
2017-08-23
Junio C Hama
n
o
M
erge branch 'dc/fmt-merg
e
-msg-mic
r
ocleanu
p
'
i
n
to
m
aint
commit
|
commitdiff
|
tree
2017-08-23
Junio C Hamano
Merge
branch
'ah/doc
-
wserr
o
rhigh
l
ight' into maint
commit
|
commitdiff
|
tree
2017-08-23
Junio C Hamano
M
e
rge b
r
a
n
ch 'c
c
/r
e
f-is-hidden-mic
r
ocleanu
p
' into
m
aint
commit
|
commitdiff
|
tree
2017-08-23
J
unio C H
a
m
a
n
o
Merge branch 'j
s
/
run-process-parallel-api-f
i
x' into
.
.
.
commit
|
commitdiff
|
tree
2017-08-23
J
unio
C
Hamano
Merge bra
n
ch 'rs/pack-objects-pbase-cleanup' int
o
maint
commit
|
commitdiff
|
tree
2017-08-23
Jun
i
o C
H
a
m
ano
Merge br
a
n
c
h
'
jt/fsck-cod
e
-
c
lea
n
up' i
n
to maint
commit
|
commitdiff
|
tree
2017-08-23
Junio C Hamano
Merge
b
ranch 'rs/stat-data-unal
i
gned-
r
ead
s
-fix'
into
.
.
.
commit
|
commitdiff
|
tree
2017-08-23
Junio C H
a
mano
Merge branc
h
'rs/
m
ov
e
-
a
rray' into
m
a
in
t
commit
|
commitdiff
|
tree
2017-08-23
Junio C Ham
a
no
Merge bran
c
h 'r
s
/bs
w
ap-u
b
san
-
fix' into m
a
int
commit
|
commitdiff
|
tree
2017-08-23
Junio C Hamano
Merg
e
branch 'd
l
/credential-
c
ache-so
c
ke
t
-in-xdg-c
a
che
.
.
.
commit
|
commitdiff
|
tree
2017-08-23
J
unio C Hamano
Merge branch 'hb/git
w
e
b
-proj
e
ct-list' into mai
n
t
commit
|
commitdiff
|
tree
2017-08-23
Junio
C
Hamano
Merge br
a
nch 'ks/commit-abort-on-emp
t
y-mes
s
age-fix
.
.
.
commit
|
commitdiff
|
tree
2017-08-23
J
unio C Hamano
Mer
g
e branch '
j
k/reflog-walk' into maint
commit
|
commitdiff
|
tree
2017-08-23
Ju
n
io C H
a
man
o
Merge br
a
nc
h
'jc
/
h
t
tp-sslkey-and-ssl-cert-are-p
a
ths
.
.
.
commit
|
commitdiff
|
tree
2017-08-23
J
u
n
i
o C Haman
o
Mer
g
e branch 'jk/r
e
f-filter-colo
r
s' into maint
commit
|
commitdiff
|
tree
2017-08-23
Ju
n
io C Hamano
Merg
e
branch
'js/git-gui-msgfm
t
-on-windows'
into maint
commit
|
commitdiff
|
tree
2017-08-23
Jun
i
o
C Hamano
The thi
r
d batch
p
ost 2
.
14
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-08-23
J
u
nio C Hamano
Me
r
ge
b
ran
c
h 'm
g
/forma
t
-ref
-
doc-fix'
commit
|
commitdiff
|
tree
2017-08-23
Junio C Hamano
Merge branch 'sb/subm
o
dule-parallel-update'
commit
|
commitdiff
|
tree
2017-08-23
Jun
i
o C Hamano
Merge branch 'j
c
/diff-sane-tr
u
ncate-no-more'
commit
|
commitdiff
|
tree
2017-08-23
Junio C Hamano
Merge
b
r
a
nc
h
'
h
v/t5526-andand-chain-
f
ix'
commit
|
commitdiff
|
tree
2017-08-23
Junio C Hamano
Merge branch 'as/grep-qui
e
t-no-match
-
exit-code-fix'
commit
|
commitdiff
|
tree
2017-08-23
Juni
o
C
Ham
a
no
Merge
branch 'kw/c
o
mmit
-
keep-
i
nd
e
x
-when-pre-com
m
it
.
.
.
commit
|
commitdiff
|
tree
2017-08-23
Junio
C
Hamano
Merge branc
h
'
s
b/sha1-file-clean
u
p'
commit
|
commitdiff
|
tree
2017-08-23
J
unio C Hamano
M
e
rge branch 'rs/t1
0
02-do-not-use
-
sum'
commit
|
commitdiff
|
tree
2017-08-23
Junio C Hamano
Mer
g
e
branch 'kd
/
sta
s
h-wit
h
-
b
ash-4
.
4'
commit
|
commitdiff
|
tree
2017-08-23
J
u
nio C Hamano
M
erge branch 'ah/doc-empty-string-
i
s-f
a
lse'
commit
|
commitdiff
|
tree
2017-08-23
Junio C Hamano
Merge branch 'kw/r
e
base-prog
r
ess'
commit
|
commitdiff
|
tree
2017-08-23
Ju
n
io C Hamano
Merge b
r
a
n
ch 'ks/pre
p
are-commit-msg-sample-f
i
x'
commit
|
commitdiff
|
tree
2017-08-23
Junio C
H
amano
Mer
g
e bra
n
c
h
'
nm/stas
h
-untrac
k
ed'
commit
|
commitdiff
|
tree
2017-08-23
J
u
n
io
C
Hamano
Merge branch
'jt/sha1-file-cleanup
'
commit
|
commitdiff
|
tree
2017-08-23
Jonathan Nieder
v
c
s-svn: move remaining repo_tree functio
n
s
to
f
ast_
e
xport
.
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-08-23
J
o
nathan
Nieder
v
c
s-svn: remove
r
epo_
d
e
lete w
r
apper f
u
nction
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-08-23
Jon
a
than Nieder
vcs-svn:
remove cu
s
to
m
mode constant
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next