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 'sg/completion-commit-cleanup' into next
2015-06-16
J
unio C
Hamano
Merge branch 'sg/completio
n
-com
m
it-cleanup'
i
n
t
o
next
commit
|
commitdiff
|
tree
2015-06-16
Juni
o
C Hamano
Merge
b
ranch 'pt/am-abort-fix' into next
commit
|
commitdiff
|
tree
2015-06-16
Junio
C H
a
mano
Merge branch 'nd/
u
ntracked
-
cache
'
into ne
x
t
commit
|
commitdiff
|
tree
2015-06-16
Junio
C Hamano
Merg
e
branch 'mh/
f
sck
-
reflog-entri
e
s' into next
commit
|
commitdiff
|
tree
2015-06-11
Junio
C Hama
n
o
Me
r
ge branch 'master' int
o
next
commit
|
commitdiff
|
tree
2015-06-11
Jun
i
o
C
Hamano
Me
r
ge branch 'js/
s
lee
p
-without-selec
t
'
int
o
next
commit
|
commitdiff
|
tree
2015-06-11
Junio C Hamano
M
erge bra
n
ch 'es/u
t
f
8-stupid-compile
r
-workar
o
u
nd' into
.
.
.
commit
|
commitdiff
|
tree
2015-06-11
Ju
n
io C Hamano
Mer
g
e
branch
'rl/am-3
w
ay-conf
i
g' into next
commit
|
commitdiff
|
tree
2015-06-11
J
u
ni
o
C Hamano
Merg
e
branch 'jc
/
ll
-
merge
-
expos
e
-path' into next
commit
|
commitdiff
|
tree
2015-06-11
Junio
C
Hamano
Merge branch 'es/os
x
-
h
eader-pollutes-mask-
m
acro
'
i
n
to
.
.
.
commit
|
commitdiff
|
tree
2015-06-11
Jun
i
o C Ha
m
ano
Merge branch 'es/con
f
igure-getdelim' into next
commit
|
commitdiff
|
tree
2015-06-11
Junio C Hamano
Me
r
ge
branch 'pt
/
pull-optpars
e
'
i
n
to next
commit
|
commitdiff
|
tree
2015-06-11
Junio C Hamano
Merge branc
h
'qn/blame-show-ema
i
l
'
i
n
t
o
n
ext
commit
|
commitdiff
|
tree
2015-06-11
Junio C Hamano
Mer
g
e
branch 'jc/do
-
not-feed-tags
-
to
-
clear-commit-marks
.
.
.
commit
|
commitdiff
|
tree
2015-06-11
Junio C Ham
a
no
Merge branch 'es/s
e
nd-email
-
sen
d
mai
l
-alias' into next
commit
|
commitdiff
|
tree
2015-06-11
J
unio C Hamano
Merge bra
n
ch '
j
c/apply-re
j
ect-noop-hunk' int
o
next
commit
|
commitdiff
|
tree
2015-06-11
Junio
C
Hamano
Second half of
sev
e
nth batch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-11
Junio
C Hamano
Merge bran
c
h 'tb/complete
-
s
equenci
n
g'
commit
|
commitdiff
|
tree
2015-06-11
Jun
i
o C Hamano
Merge branch 'j
k
/sque
l
c
h-missing-
l
ink-war
n
ing-
f
o
r
-
u
nreachable'
commit
|
commitdiff
|
tree
2015-06-11
Junio
C
Haman
o
Merge br
a
nch
'
pt/
p
ul
l
-te
s
t
s'
commit
|
commitdiff
|
tree
2015-06-11
Junio C Hamano
M
e
rge b
r
anch 'sb/glossary-s
u
bmodule'
commit
|
commitdiff
|
tree
2015-06-11
J
u
nio C
H
amano
Mer
g
e
branch 'sb/
s
ubm
o
dule-doc-intr
o
'
commit
|
commitdiff
|
tree
2015-06-11
Ju
n
io C Hamano
Merge
bra
n
ch 'jk/diagnose-c
o
nfig-mmap-failu
r
e'
commit
|
commitdiff
|
tree
2015-06-11
Junio C Hamano
Merge
br
a
nch
'mt/p4-depotFile-at-v
e
rsion'
commit
|
commitdiff
|
tree
2015-06-11
Juni
o
C Hamano
Me
r
ge branch 'mh/
v
erify-loc
k
-
error-report'
commit
|
commitdiff
|
tree
2015-06-11
J
u
nio C Hamano
Merg
e
b
ranch
'jk
/
c
o
lor-diff
-
plain
-
i
s-c
o
nt
e
xt'
commit
|
commitdiff
|
tree
2015-06-11
Junio C Hamano
Merge branch
'
jk/clon
e
-dissociate
'
commit
|
commitdiff
|
tree
2015-06-11
J
u
nio
C
Hama
n
o
M
e
rge
b
r
anch 'jc
/
diff-ws-e
r
ror
-
highlight'
commit
|
commitdiff
|
tree
2015-06-08
Paul T
a
n
a
m
--abort
:
keep unrelated commits o
n
unborn branc
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-08
Paul T
a
n
am --
a
bor
t
:
suppo
r
t abor
t
ing
t
o
u
nborn branch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-08
P
a
ul Tan
am --abort: rever
t
c
h
a
nges
i
n
tr
o
d
u
ced by failed 3way
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-08
Paul Tan
am --skip: support skippin
g
while
o
n
unbo
r
n branch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-08
P
a
ul Tan
am
-
3: su
p
port 3way
m
erge on unbo
r
n branch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-08
Paul Ta
n
am
--skip: revert changes introduc
e
d by
failed 3wa
y
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-08
Michael Haggerty
fsck: report errors if reflo
g
entries poin
t
at invalid
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-08
Michael Hagge
r
ty
fsck_handle_r
e
flog_sha1()
:
n
ew function
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-08
Nguy
ễ
n Thái Ngọc Duy
read-cac
h
e:
fix untracked cache inva
l
idation when
s
plit
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-08
SZ
E
DER Gábor
completion: teach 'sc
i
ssors' mod
e
to
'git comm
i
t
-
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-05
Eric Suns
h
ine
utf8: NO_I
C
O
NV: silenc
e
u
n
i
nit
i
al
i
zed
v
ariable warning
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-05
Johannes Sixt
loc
k
f
i
l
e
:
wait
usin
g
sleep_millisec() instead
of se
l
ect(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-05
Johannes Sixt
lock
f
ile:
c
onvert retry t
i
meout computations
t
o millisecond
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-05
Joh
a
nnes
S
ixt
hel
p
.
c: wrap
wait-only poll() invo
c
ation in sleep_mil
l
isec()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-05
Johannes Sixt
l
o
ck
f
ile: replace r
a
n
dom() by rand()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
S
y
n
c with mast
e
r
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o C Hamano
Sync with 2
.
4
.
3
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Git 2
.
4
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-05
Junio
C Hamano
The first half
of the seventh
ba
t
ch for 2
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-05
J
u
n
i
o C Haman
o
Merge bra
n
ch '
l
d/p4
-
editor-multi-words'
commit
|
commitdiff
|
tree
2015-06-05
Junio C
H
amano
M
erge bra
n
ch 'bc/object-id'
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
i
o
C Hamano
Merge branch
'jk/at-pu
s
h-sha1'
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio C Haman
o
Mer
g
e
b
r
anch
'
dl/
b
ranc
h
-error-message'
into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Haman
o
Merge branch
'
j
k/skip-ht
t
p-tests-unde
r
-n
o
-
curl
'
into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
J
unio C Hama
n
o
M
e
r
ge branch 'ps/doc-packfile
-
vs
-
pa
c
k-file' int
o
main
t
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merg
e
b
ranc
h
'f
g
/doc
u
ment
-
commi
t
-messag
e
-stri
p
ping
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
i
o
C Hamano
Merge bran
c
h 'jk/rerere
-
forget-check-enabled'
into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C H
a
mano
Merge branch 'pt/pu
l
l
-log-n' int
o
maint
commit
|
commitdiff
|
tree
2015-06-05
Junio
C Ham
a
n
o
Merge branch 'pt/pull-ff-vs-me
r
g
e
-ff'
i
n
t
o maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C
Hamano
Merg
e
branch 'rs
/
plug-l
e
ak-
i
n-p
a
ck-bitmaps' in
t
o maint
commit
|
commitdiff
|
tree
2015-06-05
J
u
n
io C Hamano
Mer
g
e branch 'ja/tutor
i
al-asciidoctor-fi
x
' into maint
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C
H
amano
Merge branch 'jk/str
i
pspace
-
asciidoctor-fix' into m
a
int
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branch 'j
k
/
a
s
c
i
idoc-m
a
rkup-fix'
i
nto maint
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio C H
a
ma
n
o
Me
r
g
e
b
ranch 'ps/bu
n
dle
-
verify
-
arg
'
into maint
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io C Hamano
Mer
g
e branch 'mh/write-
r
efs-sooner-
2
.
4' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merg
e
br
a
nch
'
mh/ref
-
d
irectory-
f
il
e
' into main
t
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio
C
Hamano
Merge branch 'mg
/
log-decorate-HEAD'
into
m
aint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Ham
a
no
M
e
rge
branch 'sb/t
1
020-clea
n
up' into main
t
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio C
Ham
a
n
o
Merge branch 'jc/
g
iti
g
nor
e
-
precede
n
ce' i
n
t
o
m
aint
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C Hamano
Merge br
a
nch
'
bc/connect-plink'
into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge
branch
'
ph
/
rebase-
i
-redo' into ma
i
nt
commit
|
commitdiff
|
tree
2015-06-05
Junio
C Hamano
M
e
rg
e
branch 'jk/add-e-kill-editor' into m
a
i
nt
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o
C Hamano
Merge branch 'mh/clone-verbosity-
f
ix' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hama
n
o
Merge branch '
j
k/s
h
a
1
-file
-
r
e
d
u
ce-useless-warnin
g
s
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
M
erge branch 't
b
/
b
lam
e
-r
e
sur
r
e
c
t-convert-to-git' into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio
C H
a
m
a
no
Merge
branch
'
jc/plug-fmt-mer
g
e
-
msg-leak' into mai
n
t
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
Hamano
Merge b
r
an
c
h
'
pt/x
d
g-
c
onfig-path' into maint
commit
|
commitdiff
|
tree
2015-06-04
Jun
i
o C Ha
m
ano
ll-
m
erge:
pass th
e
o
r
igi
n
al
pat
h
to
external drivers
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-04
Junio C Hamano
M
erg
e
branch
'
nd/slim-inde
x
-
p
ac
k
-
memory-usage'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2015-06-04
Junio C Hamano
Mer
g
e branch 'sb/pack-prot
o
c
ol-ment
i
on-smart-htt
p
'
.
.
.
commit
|
commitdiff
|
tree
2015-06-04
Ju
n
io C Ham
a
no
Merge bra
n
ch
'
jk/make-fix-d
e
pendencies' int
o
next
commit
|
commitdiff
|
tree
2015-06-04
J
unio C Hamano
Merge
b
ran
c
h 'jk/die-on-bogus
-
wor
k
tree-late
'
i
n
to next
commit
|
commitdiff
|
tree
2015-06-04
Juni
o
C Hamano
Merge branch '
s
g/merge-summ
a
r
y-config' into next
commit
|
commitdiff
|
tree
2015-06-04
Junio C
Hamano
Merge branch '
a
h/send-email-send
m
ail-alias' int
o
next
commit
|
commitdiff
|
tree
2015-06-04
R
e
mi
L
espinet
gi
t
-am: add am
.
threeWay co
n
fig variable
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-04
Remi Lespinet
t4150-am: refa
c
tor am -
3
test
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-04
Remi
L
e
s
pinet
git-am
.
sh: fix i
n
it
i
a
lizati
o
n
of the threeway variabl
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-04
Jeff King
index-pack
:
f
ix tr
u
ncation
of of
f
_t in compariso
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-03
E
ri
c
Sunshine
configur
e
:
a
d
d getd
e
lim(
)
check
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-03
Eric Suns
h
ine
c
o
n
f
ig
.
mak
.
uname: Da
r
win: def
i
ne HAVE_GETDELIM for
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-03
Jeff King
e
w
ah
:
use l
e
ss
g
e
neri
c
macro
n
ame
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-03
Eric S
u
ns
h
ine
e
wah/bi
t
map: silence warn
i
ng about MASK ma
c
ro redefinition
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-02
Ste
f
a
n
Bel
l
er
Documentation/techni
c
al/pa
c
k-
p
r
o
t
ocol: m
e
n
t
ion http
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-02
Paul Tan
pull: u
s
e git-r
e
v-parse --p
a
rseopt for
o
pt
i
on parsi
n
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-02
Paul Tan
pu
l
l: han
d
le git-fetch's opti
o
ns as well
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-02
Junio C Hamano
Mer
g
e b
r
a
nch
'pt/p
u
ll-tests'
i
nto pt/pull-optparse
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
format-pat
c
h: do not feed tags to clear_commit_marks()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-01
Eric Sunsh
i
ne
s
end-email: fur
t
her warn
a
b
out
unsuppor
t
ed sendmail
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-01
Eric Sunshine
t9001
:
add s
e
nd
m
ai
l
aliases line continu
a
tion
tes
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-01
Eric Sunshine
t9001: refactor sendma
i
l a
l
iases
test i
n
fra
s
truc
t
u
re
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-01
E
ric
S
u
nshi
n
e
s
e
nd-emai
l
: imp
l
ement se
n
dmail a
l
iases
line
c
o
nt
i
nua
t
ion
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-01
E
ric S
u
nshine
send-emai
l
: simplify sendmail aliases comment
and blank
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next