repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jc/ll-merge-expose-path' into next
2015-05-29
Ste
f
an B
e
ller
glossary:
a
dd "remote",
"
submodule", "superproject"
Helped-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-29
Jeff K
i
n
g
setup_git_directory
:
del
a
y
c
ore
.
bare/core
.
worktree
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-29
Jeff King
Makefile:
silence
p
e
rl/PM
.
stamp recipe
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-29
Jeff Ki
n
g
Makef
i
l
e: avoid
time
s
tam
p
updat
e
s to GIT-BUILD-OPTION
S
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-29
Jeff King
Ma
k
efile
:
d
rop dependency bet
w
ee
n
gi
t
-i
n
sta
w
eb and
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-29
Paul
Tan
t552
0
: chec
k
r
eflog ac
t
i
o
n
i
n fast-forw
a
r
d me
r
g
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-29
Paul T
a
n
t5521: test --
d
r
y
-run does not make
a
n
y
c
hanges
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-29
Pa
u
l T
a
n
t
5
520: tes
t
-
-reb
a
se fa
i
lure on unborn branch with
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t
5
520: te
s
t --rebase with multi
p
le branc
h
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t5520: t
e
s
t work tree fas
t
-forward when f
e
t
ch updates
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t5520: test for fai
l
u
re if i
n
dex has unresol
v
e
d
entr
i
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-28
Stefan
Beller
submodule doc
:
reord
e
r
i
n
t
r
oductory paragrap
h
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-28
Jun
i
o C Ha
m
ano
Merge
b
r
a
n
ch
'
ah/usage-s
t
ri
n
g
s
' in
t
o next
commit
|
commitdiff
|
tree
2015-05-28
Junio C Hamano
Merge bran
c
h
'jc/merge-drop-old
-
s
ynt
a
x' into next
commit
|
commitdiff
|
tree
2015-05-28
Junio C Hamano
Me
r
ge branch
'
l
d
/p4-e
d
itor-multi-
w
or
d
s'
i
nto
next
commit
|
commitdiff
|
tree
2015-05-28
SZED
E
R Gábor
Doc
u
mentation: include
'merge
.
b
ranchde
s
c' for merge
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-28
Junio
C
Hamano
x
mmap(): drop "Out of memo
r
y?"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-28
Jeff
King
config
.
c:
r
ew
r
ite
E
N
O
D
E
V
into
E
ISDIR when mm
a
p fa
i
l
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-28
Jef
f
Ki
n
g
c
o
nfig
.
c: avoid xmmap
error messages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-28
Jeff King
config
.
c
:
fix mmap l
e
a
k
w
h
e
n writing con
f
ig
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-28
Jeff King
read-ca
c
he
.
c:
drop
P
ROT_WRITE from
mmap
of index
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Miguel
T
orroj
a
p4: ret
r
ieve the right
r
e
visi
o
n
of the
fil
e
i
n
UTF
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Michael
Haggerty
r
ef_transaction_commit():
do not c
a
pitali
z
e
e
r
r
o
r messa
g
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Michael Haggerty
veri
f
y
_
lo
c
k(): do not capit
a
l
i
ze error messages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Michae
l
Haggerty
verif
y
_lock():
r
eport errors
via a strbuf
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Jun
i
o C Hamano
Sync w
i
th
master
commit
|
commitdiff
|
tree
2015-05-27
Je
f
f King
diff
.
h: rena
m
e DIFF
_
PLA
I
N color slo
t
t
o
D
IFF_CONTEXT
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Jeff King
dif
f
:
a
ccept c
o
lor
.
diff
.
context as
a
synonym for "
p
l
a
in"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Junio C H
a
mano
Merge
b
r
a
nch 'nd/untracked-cache'
commit
|
commitdiff
|
tree
2015-05-27
Jef
f
King
t
7
0
6
3: hid
e
stderr from setup ins
i
de prereq
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Junio C
Hamano
t9001: write $HO
M
E/, not ~/, to help shells without
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Allen
H
ubbe
send-email: ad
d
send
m
ail email
a
l
iases for
m
a
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
M
ichael Ha
g
gerty
v
erify_lock(): on errors, let the ca
l
ler unlock the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
M
i
chael H
a
gge
r
ty
v
erify
_
lock(): ret
u
rn 0/-1 rather than
s
truct ref_lock *
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Jeff
K
ing
clone:
r
eor
d
er --dis
s
ociate
a
nd
-
-refere
n
ce
o
pti
o
n
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Jeff
K
ing
clone:
u
se OPT_STRING_
L
IST
for
--reference
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Junio C Hamano
diff
.
c:
--ws-error-highli
g
h
t
=<kind> option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Juni
o
C
Hama
n
o
diff
.
c: add e
m
it_del_line() a
n
d emit_context_line()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-26
Junio C H
a
mano
Sync with
m
ast
e
r
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merge bran
c
h 'bc
/
objec
t
-id' into
next
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hama
n
o
Merge branch 'jk/at-push-s
h
a
1
'
into next
commit
|
commitdiff
|
tree
2015-05-26
J
u
ni
o
C
H
amano
Merge branc
h
'sb/test-bitmap-free-at-end'
i
nto next
commit
|
commitdiff
|
tree
2015-05-26
Jun
i
o C Hamano
Me
r
g
e
branch 'm
m
/rebase-i
-
post-
r
ewrite-exec'
into next
commit
|
commitdiff
|
tree
2015-05-26
Junio C H
a
m
ano
Me
r
ge br
a
nch 'fm/fe
t
ch-r
a
w
-
sh
a
1' into
n
ext
commit
|
commitdiff
|
tree
2015-05-26
Junio C Haman
o
Me
r
g
e
b
ranc
h
'sg/help-group
'
into ne
x
t
commit
|
commitdiff
|
tree
2015-05-26
Junio C H
a
m
a
no
Merge
b
ranch 'mm/
l
o
g
-format-
r
a
w-doc' int
o
next
commit
|
commitdiff
|
tree
2015-05-26
Junio C
H
a
m
ano
M
e
rge br
a
nch 'dt
/
cat-file-follow
-
symlink
s
' int
o
next
commit
|
commitdiff
|
tree
2015-05-26
Jun
i
o
C
Hamano
Merge br
a
nch 'rs/jani
t
orial' into next
commit
|
commitdiff
|
tree
2015-05-26
J
u
nio
C
Ham
a
no
Merge branc
h
'jk/stash-options' int
o
next
commit
|
commitdiff
|
tree
2015-05-26
J
u
nio C
Ha
m
ano
Merge
b
ranch 'da/mergetool-winmerge'
i
n
t
o
next
commit
|
commitdiff
|
tree
2015-05-26
Ju
n
io C H
a
m
a
no
Merge branch 'mc/com
m
it-doc-grammofix' int
o
n
e
xt
commit
|
commitdiff
|
tree
2015-05-26
J
u
nio C Haman
o
Merge branch 'j
h
/filter-empty-contents' into next
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
M
e
rge
b
ra
n
c
h
'jk/
h
ttp-backend-d
e
ad
l
ock' i
n
t
o
ne
x
t
commit
|
commitdiff
|
tree
2015-05-26
Juni
o
C Hamano
Merge branch 'dt/clea
n
-pathspe
c
-filt
e
r-the
n
-lstat'
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Junio
C
Ham
a
n
o
S
ync with 2
.
4
.
2
commit
|
commitdiff
|
tree
2015-05-26
Junio
C
H
amano
Git 2
.
4
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-26
Junio
C
H
a
mano
Mer
g
e bra
n
ch
'jk/s
t
ill-interesti
n
g' into ma
i
nt
commit
|
commitdiff
|
tree
2015-05-26
Jun
i
o C Hamano
Mer
g
e b
r
anch 'jc/hash-object
'
int
o
maint
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merge bran
c
h 'jk/
r
ebase-quiet-noop'
i
n
to maint
commit
|
commitdiff
|
tree
2015-05-26
Junio
C
Hamano
M
e
rge br
a
nch
'sg/compl
e
te-decora
t
e
-
ful
l
-not-
l
ong' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merge
branch '
j
k
/
fil
t
er-branch
-
use-of-sed-on
-
incompl
e
te
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Ju
n
io C
Ha
m
a
n
o
Merg
e
bran
c
h 'j
c
/daemon-no-ipv6-f
o
r-2
.
4
.
1'
into maint
commit
|
commitdiff
|
tree
2015-05-26
J
uni
o
C Haman
o
M
e
rge
branch 'jk/stash-require-clean-index' i
n
to maint
commit
|
commitdiff
|
tree
2015-05-26
J
u
nio C Hamano
Merge
branc
h
'jk/git
-
no-more-a
r
gv0-path-mungin
g
' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Jun
i
o C
H
a
mano
Fif
t
h batch f
o
r 2
.
5
c
ycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
M
e
rge
b
ranch 'nd/untrack
e
d
-
cache'
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merge branch 'r
s
/plug-leak
-
in-pac
k
-bitmaps'
commit
|
commitdiff
|
tree
2015-05-26
Juni
o
C Hamano
Merge
b
ranch 'pt/
p
ull-ff-vs-mer
g
e-ff'
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merg
e
branch 'pt/pull-log-n'
commit
|
commitdiff
|
tree
2015-05-26
J
u
nio C Ha
m
ano
Merge branc
h
'jk/rer
e
re-forget-check-enab
l
ed'
commit
|
commitdiff
|
tree
2015-05-26
Luke Diamand
git-p4: tests: use
t
e
st-chmtime in place
of touch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hama
n
o
t4015
:
separat
e
common setup and
per-test expectation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-26
Junio C
H
a
m
ano
t4015:
m
odernise style
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hama
n
o
M
e
r
g
e
branch '
j
k/http-
b
ackend-deadlo
c
k-2
.
3' into jk
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merge branch 'jk/http
-
b
a
ckend-
d
eadlo
c
k-2
.
2' into
j
k
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
J
eff King
h
t
t
p-
b
ackend: spool ref negotiation
r
equests to b
u
ffer
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggert
y
struct ref_lock: co
n
vert old_sh
a
1 member to object_id
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Hagg
e
r
t
y
wa
r
n_if
_
dang
l
ing_symref():
conver
t
loca
l
variab
l
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggert
y
eac
h
_
r
e
f
_fn_adapter():
remove adapter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
M
ichael
H
a
gger
t
y
rev_list_inser
t
_
r
ef(): remo
v
e
u
nneed
e
d a
r
guments
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
M
i
chael Haggerty
rev_li
s
t
_
insert_ref_oid
(
): new function, t
a
k
ing a
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Mi
c
h
a
e
l
Ha
g
gerty
mark_complete
(
):
remove unnee
d
e
d
arg
u
ments
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
M
i
chael Hagger
t
y
m
a
rk_c
o
m
plete_o
i
d()
:
n
e
w function,
tak
i
ng
a
n
object_oid
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Hag
g
ert
y
clear_marks():
r
e
w
rite
to
take
a
n object_id argument
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
m
a
r
k
_
c
omplete():
rewrite
t
o take an
o
bject_id argument
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Hagge
r
ty
send_r
e
f():
c
on
v
ert local variable "peel
e
d
"
to object_
i
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
M
i
c
hael Hag
g
erty
upload
-
pack: rewrite
fun
c
tions t
o
take obj
e
ct_id argu
m
e
nts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Mich
a
el Hagg
e
rty
find_symref(): convert loca
l
v
a
riable
"unused" to object_i
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Micha
e
l
Haggerty
find_symref(): rewrite to t
a
ke an obj
e
ct_i
d
argument
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
M
i
chael Hagge
r
ty
write_on
e
_
r
e
f(): rewrite to take an
object_id argume
n
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael
Hagge
r
ty
w
r
ite_refs_to_t
e
mp_
d
ir
(
): convert local variable sh
a
1
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
submod
u
le: rewrite to t
a
ke an o
b
ject_id argument
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
shallo
w
: rewrite
functions to
tak
e
o
bje
c
t
_id argum
e
nt
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael
H
a
g
g
e
rty
h
a
ndle
_
one
_
ref(): rewrite
t
o take
a
n object_i
d
argu
m
en
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Hagger
t
y
a
dd_info_ref(): rewrit
e
to tak
e
an object_id argument
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Ha
g
gerty
hand
l
e_one_refl
o
g
():
rewrite to
t
a
k
e an object_id argument
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Micha
e
l Haggerty
reg
i
s
t
er_rep
l
ace_ref(): rewrite to take an obj
e
ct_id
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
remot
e
: rewrite f
u
nctions to
t
a
ke object_id arguments
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
Michael Ha
g
gerty
a
dd_on
e
_r
e
f
(): rewrite to take an object_id argument
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-25
M
ichael H
a
ggerty
string_li
s
t_add_one
_
ref(): rewrite to take an object_id
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next