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 'es/send-email-sendmail-alias'
2015-06-01
Thomas Braun
com
p
le
t
io
n
: suggest sequencer comma
n
d
s for revert
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Stefan Beller
glossary: add "rem
o
t
e
", "submodule", "su
p
erp
r
ojec
t
"
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Je
f
f King
setu
p
_git_directory
:
de
l
ay co
r
e
.
bare/core
.
w
orktr
e
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Jeff Ki
n
g
M
akef
i
le
:
silence perl/
P
M
.
stamp recipe
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Jeff King
Mak
e
file: avoid timestamp upd
a
tes
t
o
GIT-BUILD-O
P
TI
O
NS
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Jeff King
Makefile: drop
d
ependency between gi
t
-instaw
e
b and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul
T
a
n
t5520: chec
k
r
eflog action in fast-forward merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t5521: test --dr
y
-
run does not make any changes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t5520
:
test --rebase fa
i
lure on unborn branch with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t5520: test --rebase with multipl
e
b
r
an
c
hes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
P
a
ul
T
a
n
t5520
:
test
work tree fast-forward when fetch up
d
a
tes
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
P
a
ul Ta
n
t5520: tes
t
for failure
i
f index has
u
nresolv
e
d
entries
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-28
Stefan B
e
ller
submodule doc: reorder
introdu
c
tory par
a
graphs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-28
SZEDER
Gábor
Doc
u
me
n
tation: include 'merg
e
.
branchdesc
'
for
m
e
r
g
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-28
Junio
C
Ha
m
ano
x
mmap(
)
:
drop "O
u
t of memory?"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-28
Jeff
King
config
.
c
: rewrite E
N
ODEV into
EI
S
DIR when mmap fails
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-28
Jeff King
config
.
c: avoid x
m
map error
m
essages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-28
Jef
f
King
c
onfi
g
.
c
: fix mma
p
leak when writi
n
g
co
n
fig
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-28
Jeff Ki
n
g
re
a
d-cache
.
c: drop P
R
OT_WRITE fro
m
mmap o
f
i
n
dex
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Miguel Torroj
a
p4:
r
etrieve
t
h
e
r
igh
t
r
evision of the file in
U
TF
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
M
i
c
ha
e
l
Haggerty
ref_
t
ran
s
action_commit(): do not
capitalize e
r
ror messag
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Michael Ha
g
g
e
r
ty
verify_lock()
:
d
o
not
capitalize error
m
essage
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Michael
Haggerty
verify_lock(): r
e
port error
s
via a strbuf
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Jef
f
King
d
i
ff
.
h: rename DIFF_P
L
AIN color slot to D
I
FF_C
O
NTEXT
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Jeff King
diff: acc
e
pt color
.
diff
.
c
ontext
a
s
a syn
o
nym f
o
r "plain
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Ju
n
io C
H
amano
M
e
rge
b
ranch 'nd/unt
r
a
cked-cache'
commit
|
commitdiff
|
tree
2015-05-27
Jeff King
t7063: hide
s
tderr
f
rom setup ins
i
de prereq
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Junio C
Hamano
t
900
1
: write $HO
M
E/, not
~
/,
t
o help shells witho
u
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Alle
n
Hub
b
e
send
-
email: add sendm
a
il email aliases format
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
M
i
chael Haggerty
verify_lock
(
):
o
n errors
,
l
et th
e
c
aller unlo
c
k the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Mi
c
hael Haggerty
verify_lock()
:
retur
n
0/-1 rather than
str
u
ct ref_l
o
ck *
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Jef
f
King
cl
o
ne: reorde
r
--d
i
ssociate and -
-
reference options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
J
e
ff
K
ing
c
l
one:
use OPT_ST
R
I
NG_LIST for --refere
n
c
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Junio C Ham
a
no
diff
.
c
:
-
-ws-error-
h
i
gh
l
ight=<kind
>
option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Junio
C H
a
mano
diff
.
c: add emit_del_
l
ine() and emit_context_l
i
n
e
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Sync w
i
th 2
.
4
.
2
commit
|
commitdiff
|
tree
2015-05-26
Junio
C Ham
a
no
Git 2
.
4
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-26
J
un
i
o C Hamano
M
erge b
r
anch 'jk
/
still-interesting'
i
nto
ma
i
nt
commit
|
commitdiff
|
tree
2015-05-26
J
u
ni
o
C Hamano
Merge branch 'jc/hash-
o
bject'
i
nto maint
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merge branch 'jk
/
rebas
e
-
q
u
iet-noop' into maint
commit
|
commitdiff
|
tree
2015-05-26
Junio C
H
amano
M
e
rge bra
n
ch 'sg/com
p
lete-deco
r
ate-
f
ull-
n
ot-long' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Juni
o
C H
a
ma
n
o
Mer
g
e branch 'jk/fil
t
er-
b
r
anch-use-of-sed-on-inc
o
mpl
e
te
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
J
u
nio
C Hamano
M
erge branch 'jc/daemon-no-ipv6-fo
r
-2
.
4
.
1' i
n
to
m
aint
commit
|
commitdiff
|
tree
2015-05-26
Junio
C H
a
mano
M
er
g
e
br
a
nch 'jk/
s
tash-require
-
clean-index' into ma
i
nt
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merge bran
c
h '
j
k/g
i
t-
n
o-more-argv
0
-pat
h
-munging' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Fi
f
th ba
t
c
h fo
r
2
.
5
cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-26
Jun
i
o
C Haman
o
Merge bran
c
h 'nd/u
n
tracke
d
-cache'
commit
|
commitdiff
|
tree
2015-05-26
J
u
nio C
H
amano
Merge bra
n
ch 'rs/plug
-
leak-in
-
pack-bitmaps'
commit
|
commitdiff
|
tree
2015-05-26
J
u
n
i
o C
H
a
mano
M
erge
b
ra
n
ch '
p
t/pull-ff-
v
s-m
e
rge-ff'
commit
|
commitdiff
|
tree
2015-05-26
Junio C Ham
a
no
Merge branch '
p
t/pull-
l
o
g
-n'
commit
|
commitdiff
|
tree
2015-05-26
Junio C Haman
o
M
erge bran
c
h 'jk/re
r
e
r
e-forget-check-enabled'
commit
|
commitdiff
|
tree
2015-05-26
Lu
k
e Diamand
git-p4: test
s
:
use tes
t
-chmtim
e
in p
l
ace of touch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
t40
1
5: sep
a
rate co
m
mon setup
a
nd per-test expectat
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-26
Junio
C H
a
mano
t
40
1
5: modernise style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-26
Jun
i
o C Ham
a
no
Merge branch 'jk/http-backend-deadlock-
2
.
3
'
into
j
k
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Junio C
Hamano
Merge
b
ranch 'jk/http-b
a
ckend-dea
d
l
ock
-
2
.
2' in
t
o jk
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Jeff K
i
ng
http-backend: spool r
e
f nego
t
ia
t
i
o
n requests to buffer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael
H
aggerty
struct
ref_lo
c
k: convert ol
d
_
sha1 member to object_id
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Mich
a
e
l
Hagge
r
ty
warn_if_dangling_symre
f
(): convert loc
a
l variable
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
M
ichael Ha
g
g
e
rty
e
a
c
h_r
e
f_fn_adapter
(
):
remo
v
e
a
dapter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael
H
aggerty
rev_li
s
t_insert_
r
e
f(
)
:
r
emove unneeded arguments
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Mic
h
ael Haggerty
rev_list_insert_ref_oid(): new function, tak
i
n
g an
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Mi
c
hael
H
a
gg
e
rt
y
m
ark_complete()
:
remove unnee
d
e
d ar
g
umen
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggert
y
mark
_
c
omplet
e
_o
i
d(): new function, ta
k
ing an object_oid
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
clear_ma
r
k
s
(
):
rewri
t
e to ta
k
e an object_id arg
u
me
n
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Ha
g
gerty
ma
r
k_c
o
m
plete(): re
w
rite to tak
e
a
n objec
t
_id argument
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
M
i
chael Haggerty
send_re
f
(
)
: convert local va
r
iable "peeled" to object_id
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Mic
h
ael Haggerty
u
p
load-
p
ack: rew
r
i
t
e functions to
t
ake
objec
t
_id argument
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
M
ichae
l
Hag
g
erty
f
ind
_
s
ym
r
ef(): convert local v
a
riable
"
unused"
t
o object_id
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Mi
c
hael Hag
g
erty
find_symre
f
():
re
w
ri
t
e
t
o
take an objec
t
_
id argument
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michae
l
Haggerty
write_
o
ne_re
f
(
)
: rew
r
ite to
take an ob
j
ect_id ar
g
ument
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michae
l
Haggert
y
wr
i
te
_
refs_t
o
_
t
emp_d
i
r(): con
v
ert local variable s
h
a1
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Mic
h
a
e
l Haggerty
submodu
l
e: rewri
t
e t
o
take an o
b
j
e
ct_i
d
argume
n
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michae
l
Haggert
y
shallow: r
e
w
rite functions to
t
ake object_id ar
g
uments
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
hand
l
e_on
e
_
ref():
rewrite to tak
e
a
n
o
b
ject_id argument
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Mic
h
a
e
l Haggerty
add_info_r
e
f(): rewrite to
t
ake an
o
bject_id argument
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Mic
h
a
el Hagg
e
rty
h
a
n
dl
e
_one_reflog(): r
e
write to take
an ob
j
e
ct_id argument
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Micha
e
l
H
aggerty
regist
e
r_rep
l
ace_ref(
)
: rewrite to
t
a
k
e
an obj
e
ct_id
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Mic
h
ael
H
agge
r
ty
remot
e
:
r
ewrite
functions to take object_id a
r
guments
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael
Hagge
r
ty
add_one_ref(): rewr
i
te
t
o t
a
ke an obj
e
ct_
i
d ar
g
umen
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Micha
e
l
H
agger
t
y
string_list_add_
o
n
e
_ref(): rewrite t
o
take an object_
i
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Hagg
e
rty
add_ref_decor
a
tion(): convert local var
i
able original_sha1
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
M
ic
h
ael Haggerty
add_ref
_
deco
r
ation():
r
ewrite
t
o take
a
n object_id
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
M
ich
a
el Ha
g
gerty
show_head_ref(): co
n
ver
t
local
variab
l
e
"unused" to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael H
a
ggerty
ht
t
p-backend: r
e
write to take
an object_id argument
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Micha
e
l Haggerty
a
ppe
n
d_s
i
m
i
lar_ref(): rewri
t
e
to ta
k
e an object
_
id
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Mi
c
hael Haggerty
buil
t
in/show
-
ref: rew
r
i
te t
o
tak
e
an obj
e
ct_id argument
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
show_re
f
(): convert l
o
c
a
l variable peeled to object_id
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Hagge
r
ty
builtin/sh
o
w-ref
:
rewri
t
e to use obje
c
t
_
id
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael H
a
g
g
e
rty
fsck: change functio
n
s
t
o use object_id
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Mich
a
el Hagge
r
ty
cmd_show_
b
ranch(): fix
e
rror me
s
sage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
b
u
iltin/show-bran
c
h:
r
ewrite
f
u
nctions to work with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Hagge
r
ty
append_one_rev(): rewrite
t
o
w
o
rk with obj
e
ct_id
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Mich
a
el Hagger
t
y
bu
i
ltin/sh
o
w-branch: re
w
rite functions to ta
k
e
o
bject_id
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggerty
a
ppen
d
_
m
atch
i
ng_
r
e
f():
r
ewrite t
o
take an object_id
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
M
i
chael H
a
gge
r
ty
show_referenc
e
(): rewrit
e
to take an object_id argumen
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Hagge
r
ty
builtin/rem
o
t
e: rewrite fun
c
tion
s
to
t
ake ob
j
ect_id
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
M
ichael Haggerty
add_branch_f
o
r_removal(): don't s
e
t "
u
til" field of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Michael Haggert
y
a
dd_branch_for_rem
o
val(): re
w
rite to
t
ake
a
n object_id
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-25
Mic
h
ael Haggerty
builti
n
/re
f
log: rewrit
e
ref functions
to
t
ake an object_id
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next