repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'pa/auto-gc-mac-osx'
2015-06-05
Jun
i
o C
H
a
mano
Mer
g
e
bran
c
h
'jk/str
i
psp
a
ce
-
as
c
iidoctor-fix' into ma
i
nt
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io C
H
amano
Merge br
a
n
ch 'jk/asciido
c
-marku
p
-fix' into ma
i
n
t
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge bra
n
c
h
'ps/bundle-verify-
a
rg' into ma
i
nt
commit
|
commitdiff
|
tree
2015-06-05
J
unio
C
Hamano
M
e
rge
b
ranch '
m
h/write-refs
-
s
o
oner-2
.
4
'
into mai
n
t
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io C Hamano
Merge branch 'mh/ref
-
directory-fi
l
e' into maint
commit
|
commitdiff
|
tree
2015-06-05
J
u
ni
o
C Hamano
M
e
rge bra
n
ch 'mg/
l
og-d
e
corate-HEAD' into maint
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C H
a
mano
Merge branch 'sb/t1020-cl
e
an
u
p'
i
nto maint
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C Hama
n
o
Merge
bran
c
h 'jc
/
giti
g
nore-precedenc
e
' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branch 'bc/connect-
p
l
ink' into
m
a
int
commit
|
commitdiff
|
tree
2015-06-05
Junio C
H
amano
Merge bra
n
ch
'
ph
/
rebas
e
-i-redo'
into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
Hama
n
o
Merge
branch 'jk
/
add-e-kill-editor' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Ha
m
ano
Merge br
a
n
c
h 'mh/clo
n
e-ver
b
osity-fix' into
m
aint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Ham
a
no
Me
r
g
e
branch 'jk/sh
a
1-file-reduce-useless-w
a
r
n
ings
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branch 'tb/blame-resur
r
ect-conv
e
rt-
t
o-git' into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branc
h
'jc/plug-fmt-merge-msg
-
leak' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branc
h
'pt/xdg-
c
onf
i
g-path' into maint
commit
|
commitdiff
|
tree
2015-06-04
J
u
nio C Hamano
ll-m
e
rge: pa
s
s the
o
riginal path to ex
t
e
r
nal drivers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-04
Remi
L
esp
i
net
git-am: a
d
d am
.
thre
e
Way config variable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-04
Remi Lespi
n
et
t41
5
0-am: refactor am -3
tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-04
R
e
mi Lespin
e
t
git-am
.
sh:
fi
x
in
i
tializa
t
ion of the t
h
reeway variable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-04
Jeff King
index-p
a
c
k
: fix truncatio
n
of off_t i
n
comp
a
ri
s
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-03
M
ichael
H
aggerty
read
_
loose_re
f
s():
simplify
f
un
c
tion lo
g
i
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-03
Eric
S
un
s
hine
c
onfi
g
ure: add getdelim() c
h
eck
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-03
Eric Sunshine
confi
g
.
mak
.
uname: D
a
rwin: define HAVE_GETDELI
M
for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-03
J
e
f
f
King
ewah: use
l
e
ss generi
c
macro name
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-03
E
ric
S
unshine
ewa
h
/b
i
tmap: silence w
a
r
n
i
ng about MASK m
a
cro red
e
finiti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-02
Stefan
B
e
l
ler
Do
c
ument
a
tion/t
e
c
hni
c
al/pack-protocol: mention http
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-02
Pau
l
Tan
pull: use gi
t
-rev-pa
r
se --pars
e
opt for option parsing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-02
Paul Tan
p
u
ll: handle g
i
t
-
fetc
h
's
options as
w
ell
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-02
J
u
nio
C
H
a
mano
Merge
bra
n
ch 'p
t
/pull-tests' into pt/pu
l
l-optp
a
rse
commit
|
commitdiff
|
tree
2015-06-02
Mic
h
ael Hagger
t
y
for-each-
r
ef: report broken references cor
r
ectly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-02
Mi
c
hael Hag
g
erty
t6301: new tests of for-ea
c
h
-re
f
error handling
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
J
u
nio
C Ham
a
no
format
-
patch: do not
f
eed tags to cle
a
r_commit_mark
s
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
Eric
S
u
n
shine
send-emai
l
: fu
r
the
r
wa
r
n ab
o
u
t
u
nsupported
s
e
ndmail
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
Eri
c
Sunshine
t9001
:
add send
m
ail alias
e
s l
i
n
e
continuation tes
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
E
r
ic Su
n
shine
t9
0
01: refactor sendma
i
l
aliases
t
est infrastru
c
tu
r
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
E
ric
S
u
ns
h
ine
send-
e
mail
:
implement send
m
ail ali
a
ses line continuation
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
E
ri
c
Sunshine
sen
d
-email: simplif
y
sen
d
m
a
il a
l
iases comment
and bla
n
k
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
Eric
Sunshi
n
e
send-emai
l
: refa
c
tor sendm
a
il al
i
ases p
a
rser
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
Er
i
c
S
unshi
n
e
send-email: fix st
y
l
e: cudd
l
e 'els
i
f' and 'el
s
e' with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
E
ric
S
unshine
send-email: drop noise
c
o
m
m
ents whic
h
mere
l
y
r
e
p
e
at
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
Eric Su
n
s
hi
n
e
se
n
d
-email: visua
l
ly distinguish send
m
a
i
l alias
e
s parser
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
Eric Sunshine
send-em
a
il: f
u
rther
d
o
cum
e
n
t missi
n
g sendmail aliases
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
Q
u
enti
n
Ne
i
ll
bla
m
e: add
blame
.
s
h
owEm
a
il config
u
ration
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
S
i
xth batc
h
for
2
.
5 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merge branch 'sb/test-bitm
a
p-free-at-e
n
d
'
commit
|
commitdiff
|
tree
2015-06-01
Junio
C
Hamano
Merge br
a
nc
h
'
mm
/
rebase-i
-
post-rewrite-exec'
commit
|
commitdiff
|
tree
2015-06-01
Junio
C
Hama
n
o
Mer
g
e b
r
anc
h
'fm/f
e
t
c
h-raw-sha1'
commit
|
commitdiff
|
tree
2015-06-01
J
unio C Hamano
M
erge branch 'sg/he
l
p-group'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Ham
a
no
Mer
g
e b
r
anch 'mm/log-format-r
a
w-doc'
commit
|
commitdiff
|
tree
2015-06-01
Junio
C
Hama
n
o
Mer
g
e
branc
h
'dt
/
cat-fi
l
e-fol
l
ow-symlinks'
commit
|
commitdiff
|
tree
2015-06-01
Ju
n
io C Hamano
Merge branch '
r
s/
j
anitori
a
l'
commit
|
commitdiff
|
tree
2015-06-01
Junio
C Hamano
Merg
e
br
a
nch '
j
k/
s
tash-op
t
ion
s
'
commit
|
commitdiff
|
tree
2015-06-01
Ju
n
i
o
C Hamano
Merge bra
n
ch 'd
a
/mer
g
etool-
w
inmerge'
commit
|
commitdiff
|
tree
2015-06-01
Jun
i
o C Ham
a
no
Merge
branch
'
mc/commit-doc-grammofix'
commit
|
commitdiff
|
tree
2015-06-01
J
unio C Hamano
Merge b
r
a
nch 'j
h
/filter-em
p
ty-conten
t
s'
commit
|
commitdiff
|
tree
2015-06-01
J
u
nio C H
a
mano
Merge bra
n
ch 'ah/u
s
age-string
s
'
commit
|
commitdiff
|
tree
2015-06-01
Junio C H
a
mano
Merge branch 'jk/http-
b
a
c
kend-deadlock
'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merge branch 'dt/clean-pathspec-filter-then-ls
t
at'
commit
|
commitdiff
|
tree
2015-06-01
Junio
C
Hamano
apply: rej
e
ct a hunk that does not do anyt
h
ing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
Jeff King
suppress err
o
rs on missing UNINTERESTING links
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
Jeff King
s
ilence broken link warn
i
ngs with re
v
s
->ig
n
ore_mi
s
sing_links
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
J
e
ff King
a
dd quieter versions of par
s
e_
{
tr
e
e
,commit}
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
Thomas Brau
n
completion: suggest sequencer
c
ommands for revert
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Stefan Beller
glossary: add "remote",
"
sub
m
odule", "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 King
setup_git_direct
o
ry: delay core
.
bare/cor
e
.
worktree
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Jeff King
Makefile:
s
i
l
e
nc
e
perl/PM
.
stamp recipe
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Jeff King
M
a
k
efi
l
e: av
o
i
d
timest
a
mp
u
p
d
ates to GIT-BUILD-OPTIONS
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Jeff
King
Makefil
e
: drop dependency between
git-inst
a
web
and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul Ta
n
t5520: check
reflog act
i
on
in fast-forward merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
P
a
u
l Tan
t5521: te
s
t
--dry
-
run doe
s
n
ot make any cha
n
ges
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t
5
520:
t
est --rebase failu
r
e on
unborn
branch
w
ith
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
P
a
ul Ta
n
t
5
520: test --r
e
b
ase
with multiple branches
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul Ta
n
t5520: te
s
t w
o
rk tree fast-f
o
r
w
a
rd when
f
etch updates
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t55
2
0: te
s
t
for
f
ailure if index has unreso
l
ved entries
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-28
Stef
a
n B
e
ller
submod
u
l
e doc: re
o
r
d
e
r introductor
y
paragrap
h
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-28
SZEDER Gábor
Docu
m
entat
i
on
:
i
n
c
lude 'merge
.
b
ran
c
h
desc' for merge
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-28
J
uni
o
C Hama
n
o
x
m
map(): drop "Ou
t
of memory?
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-28
Jeff King
co
n
fig
.
c: rewrite ENOD
E
V
into EIS
D
IR wh
e
n
mm
a
p
fails
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-28
J
eff King
conf
i
g
.
c: avoi
d
xmmap error
message
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-28
Jeff King
config
.
c: fix mma
p
lea
k
when
w
riting con
f
ig
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-28
Jef
f
King
rea
d
-
cache
.
c: dro
p
PROT_WRITE from mm
a
p
of index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Miguel Torro
j
a
p4: retrieve
t
h
e right r
e
vision of the fi
l
e in UT
F
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Michael Haggerty
ref_transa
c
tion_commit(): do not capitalize error
messages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Mic
h
a
el Ha
g
ge
r
ty
verify_lock(
)
:
d
o
not capit
a
lize e
r
ror mes
s
ag
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Mic
h
ae
l
Haggerty
verify_lock(): re
p
ort errors v
i
a a strbuf
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Je
f
f
Ki
n
g
di
f
f
.
h:
rename DIFF_
P
LAIN color slot to DIFF_CO
N
TEXT
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Jeff Kin
g
diff: accept color
.
diff
.
con
t
ext as a synonym for "plain"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Junio C Hamano
Merge branch 'nd/untrac
k
ed-
c
ache'
commit
|
commitdiff
|
tree
2015-05-27
Jeff
King
t7063: hide
s
tder
r
from setup insid
e
pre
r
eq
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
J
u
n
i
o C Hamano
t900
1
: write $
H
OME/,
not
~
/, to help shells w
i
thout
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Allen Hub
b
e
send-
e
mail
:
add se
n
d
m
ail
email a
l
iases format
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
M
ichael Haggerty
verify_lock(): on
erro
r
s, let th
e
caller unlock
t
he
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Mich
a
el H
a
gger
t
y
v
e
rify_lock(): re
t
urn 0/-1 r
a
ther than
s
t
ruct ref_lock *
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Jeff King
cl
o
ne:
r
eord
e
r --dis
s
oci
a
te and --reference options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Je
f
f King
cl
o
ne: use OPT_STRING
_
LIST
for --
r
e
ference
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
J
u
nio C Hama
n
o
diff
.
c: --ws-e
r
ror-hi
g
h
lig
h
t
=<kind> opti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
J
unio C Ha
m
ano
d
i
ff
.
c: add emit_del_line()
a
n
d
emit_conte
x
t_l
i
ne()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-26
Ju
n
i
o C H
a
m
a
no
Sync with
2
.
4
.
2
commit
|
commitdiff
|
tree
2015-05-26
Junio
C
H
aman
o
Git 2
.
4
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next