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 'fk/doc-format-patch-vn'
2015-06-05
J
un
i
o C Hamano
Merge branch 'ph/rebase-i-redo
'
into main
t
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C Hamano
Merge branch 'jk/ad
d
-e-k
i
ll-ed
i
tor' into main
t
commit
|
commitdiff
|
tree
2015-06-05
Junio C
H
amano
Merge bra
n
ch 'mh/clone-
v
e
r
b
osi
t
y-fix' into ma
i
nt
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge
b
ranch 'jk/sha
1
-fil
e
-r
e
duce-u
s
eless-warnings
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hama
n
o
Me
r
ge branch
'
tb/bla
m
e-resurre
c
t-convert-to-git' into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio
C Ha
m
ano
Merge branch 'j
c
/pl
u
g-
f
mt-
m
erge-msg-leak'
i
nto m
a
int
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
H
a
m
ano
Mer
g
e
branch 'pt/xdg-config
-
path
'
into main
t
commit
|
commitdiff
|
tree
2015-06-04
Junio C Hamano
ll-
m
erge: pass the original p
a
th to external drivers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-04
Remi Lespinet
gi
t
-
a
m: add a
m
.
t
h
ree
W
ay config vari
a
ble
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-04
Remi Lespinet
t
415
0
-
am: refacto
r
a
m -3 tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-04
Re
m
i Lespinet
git-am
.
sh: fix initialization of the threeway var
i
able
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-04
Jeff King
index-pack: fix trunca
t
i
on of off_
t
in comparison
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-03
Michael Hag
g
er
t
y
rea
d
_
loose_refs(): simp
l
ify function logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-03
Eric Sunshin
e
c
o
nfigure: add getdelim() check
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-03
Eri
c
S
u
nshine
config
.
mak
.
u
n
a
m
e
: Darwin: define HAVE_GETDELIM
for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-03
Jeff King
ewah: use les
s
generic m
a
cro nam
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-03
E
r
ic Sunshine
e
wah/bitmap:
s
ilence
w
arning about MASK m
a
cr
o
red
e
finition
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-02
St
e
fan
Beller
Documentation/technical/pack-protocol: mention h
t
t
p
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-02
Pa
u
l
Tan
pull: use
g
it-rev-parse --parseopt for opt
i
on parsing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-02
Pa
u
l Tan
pull: hand
l
e git-fetch'
s
options as well
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-02
Junio C Hamano
Merge branch 'pt/pull-tests' into pt/pul
l
-opt
p
arse
commit
|
commitdiff
|
tree
2015-06-02
Michael Haggerty
for-each-
r
ef:
rep
o
rt broken re
f
erences co
r
r
ectly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-02
M
ichael Haggerty
t63
0
1: new tests of
for-each-ref error handling
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
Junio C Haman
o
form
a
t-patch
:
do not
f
ee
d
t
a
g
s to cl
e
ar_
c
ommit_
m
ark
s
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
Eric Sunshi
n
e
send-email: further war
n
about unsuppor
t
ed sendmail
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
Eri
c
Sunshine
t9001
:
add sendm
a
il
a
liases line co
n
tinuat
i
on tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
E
r
i
c
Sunshin
e
t90
0
1: r
e
factor
sendmail a
l
iase
s
test infra
s
tr
u
cture
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
Eric Sunshine
send
-
e
m
ail
:
implement sendmail ali
a
ses
l
ine continuation
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
E
r
i
c
Sunshine
se
n
d-email: simplify sendmail aliases comment and blank
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
Er
i
c Suns
h
i
ne
se
n
d-emai
l
: refactor sen
d
ma
i
l a
l
iases parser
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
E
ric Suns
h
ine
sen
d
-e
m
ail: fix sty
l
e: c
u
d
d
l
e
'elsif' and 'else' with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
E
ric Sunshine
send-emai
l
: drop noise comm
e
n
ts w
h
ich
merely re
p
eat
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
Eric
Suns
h
ine
send-email: vis
u
ally distinguish sendmail aliases parse
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
E
r
i
c
Sunsh
i
n
e
send-em
a
il: further documen
t
missing send
m
ail aliases
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
Quent
i
n Neill
blame: add bl
a
me
.
s
howEmail c
o
nfiguration
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hama
n
o
Sixth batch f
o
r 2
.
5 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
Ju
n
io C Hamano
Merge branch 'sb/test-bitmap-free-at-end'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
M
e
r
g
e branch 'm
m
/reb
a
se-i-p
o
st-r
e
write-exec'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
M
e
rge br
a
nch 'fm/
f
etch
-
ra
w
-
sha1'
commit
|
commitdiff
|
tree
2015-06-01
J
u
nio
C
Ham
a
no
M
e
r
g
e branch 's
g
/h
e
lp-
g
roup'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merge bran
c
h 'mm/log-format-raw-
d
oc'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
M
e
r
ge b
r
anch 'dt/cat
-
file-
f
o
llow
-
symlinks'
commit
|
commitdiff
|
tree
2015-06-01
Junio
C
H
ama
n
o
Merge branch '
r
s/janitorial'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Haman
o
Merge bra
n
ch 'jk/stash-options'
commit
|
commitdiff
|
tree
2015-06-01
Junio C H
a
mano
Merge branch 'da/mergetool-winmerge'
commit
|
commitdiff
|
tree
2015-06-01
J
u
nio C
H
a
m
ano
Mer
g
e bran
c
h
'mc/commit-doc
-
gra
m
mofix'
commit
|
commitdiff
|
tree
2015-06-01
Jun
i
o C Hamano
Merge branch
'
j
h/fi
l
ter-empty-con
t
e
nts'
commit
|
commitdiff
|
tree
2015-06-01
J
u
nio
C
H
a
man
o
Me
r
g
e
b
r
anch 'a
h
/usa
g
e-
s
t
r
ing
s
'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merge branch
'
jk/h
t
tp-ba
c
ke
n
d-deadlock'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Haman
o
Mer
g
e branch '
d
t/clean
-
pathsp
e
c-fi
l
ter-then-lsta
t
'
commit
|
commitdiff
|
tree
2015-06-01
Ju
n
io C
H
a
mano
a
pply:
r
eje
c
t a hunk that
does not do anythin
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
J
e
ff K
i
ng
suppres
s
errors on missing UNI
N
TERESTING links
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
Jeff King
silence broken
link
w
arnings
with
revs->ignore_missing_links
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
Jeff King
add q
u
iet
e
r vers
i
ons of p
a
rse_{tree,commit}
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
Thomas Braun
completion: suggest
sequencer
c
ommands for revert
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
S
t
efan Bell
e
r
gloss
a
r
y:
add "r
e
mote", "su
b
module",
"supe
r
project"
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Jeff King
setup_gi
t
_
d
irectory: delay core
.
b
are/co
r
e
.
wor
k
tree
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Jeff
K
ing
Makefile: silence perl
/
PM
.
s
t
a
mp re
c
ipe
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
J
e
ff Ki
n
g
Makefi
l
e: avo
i
d tim
e
stam
p
up
d
ates t
o
GIT-BUILD-OPTIONS
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Jeff King
Makefile: drop
d
ependency b
e
tween git-i
n
sta
w
eb
a
nd
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t
5
520
:
check reflog action i
n
fast-
f
o
rwar
d
me
r
g
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul
T
an
t5521:
tes
t
--dry-run does not make any c
h
ange
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul
T
an
t5520
:
tes
t
--rebase
f
a
i
lur
e
on
unbo
r
n branch with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t
5520: test
-
-rebase w
i
th mu
l
tipl
e
branches
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul
Tan
t5520: t
e
st work tr
e
e fast-forward w
h
en fetch
u
pdates
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Pa
u
l
Tan
t5
5
20: test fo
r
failure if inde
x
h
as unresolved entries
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-28
S
t
efan Beller
sub
m
odule
d
oc: reorder
i
ntroductory paragraphs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-28
SZED
E
R G
á
bor
Doc
u
ment
a
ti
o
n: inc
l
ude 'me
r
ge
.
bra
n
c
h
desc' for merge
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-28
Junio C Hamano
xmmap(): d
r
op "
O
ut of memory?"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-28
Jeff King
config
.
c: rew
r
ite
ENODEV
i
nto
E
ISDIR whe
n
mmap
fails
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-28
Jeff King
config
.
c: av
o
id xmmap error m
e
ssages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-28
J
e
ff King
confi
g
.
c: fix mm
a
p leak when w
r
iting config
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-28
Jeff King
r
e
ad-cache
.
c: drop PROT_WRITE f
r
o
m
m
ma
p
of index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Miguel Torroja
p
4
: retrieve the right revision of the file in
UTF
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Micha
e
l Hag
g
er
t
y
ref_transacti
o
n_commit():
d
o no
t
capi
t
alize error messages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Michael Haggert
y
verify_l
o
c
k
(
): do
n
ot
c
apit
a
lize error messag
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Michael Hagg
e
rty
ver
i
fy_loc
k
()
:
report
errors via a st
r
buf
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Jeff Kin
g
diff
.
h:
r
ename
D
IFF_PLAIN color slot to
D
IFF_CONTEXT
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Jef
f
K
ing
diff:
a
c
cept colo
r
.
diff
.
con
t
ext as a sy
n
ony
m
for "plain"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Jun
i
o
C
Ham
a
no
M
e
rge bra
n
ch 'nd/untracked-cache'
commit
|
commitdiff
|
tree
2015-05-27
Jeff King
t
7
0
6
3
:
hi
d
e std
e
r
r
from setup inside
p
rereq
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Junio C Hamano
t9001: wri
t
e $HOME/, not
~/, to
h
elp she
l
ls withou
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Allen Hubbe
se
n
d
-em
a
i
l: add sen
d
mail email a
l
iases format
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
M
ichae
l
Ha
g
gerty
veri
f
y_l
o
ck()
:
o
n
errors, let the caller unlock
the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Michael Haggert
y
verify_lock()
:
return 0/-1
r
ather
tha
n
struct ref_lock *
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
J
ef
f
King
clo
n
e
: r
e
order --dissoc
i
a
te an
d
--refere
n
ce option
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Jeff King
c
lon
e
:
u
s
e
OPT_STRI
N
G_LIST for -
-
reference
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Junio
C
H
a
man
o
d
i
ff
.
c: --ws-error-
h
i
ghlight=<kind> optio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Junio
C H
a
mano
diff
.
c: ad
d
emit_d
e
l_
l
i
ne() and
e
mit_co
n
te
x
t
_
line()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-26
Jun
i
o C Hamano
Sync with 2
.
4
.
2
commit
|
commitdiff
|
tree
2015-05-26
Junio
C
H
a
mano
Git 2
.
4
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-26
Junio
C
Haman
o
Merg
e
branch 'j
k
/still-in
t
eresting'
i
nto
ma
i
n
t
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merg
e
branch 'jc/ha
s
h-object' int
o
maint
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merge bra
n
ch 'jk
/
r
ebase-quiet-noop' into maint
commit
|
commitdiff
|
tree
2015-05-26
J
u
n
io C Hamano
Merge branch 'sg/complete-decor
a
te-full-not-
l
ong
'
i
n
to
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Ju
n
i
o
C Haman
o
M
erge branch 'j
k
/filter-b
r
anch-use-of-sed-on-incomplete
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Mer
g
e branc
h
'jc/daemon-no-ipv
6
-f
o
r-2
.
4
.
1' i
n
to maint
commit
|
commitdiff
|
tree
2015-05-26
Ju
n
io C Haman
o
M
e
rg
e
branch '
j
k/stash-require-clean-index' int
o
m
aint
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merge branch 'jk/git-no-more-argv0-path
-
mun
g
ing' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Junio C Haman
o
F
ifth ba
t
ch for 2
.
5 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next