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 'pt/t0302-needs-sanity'
2015-06-05
Ju
n
io
C
Hamano
Merge branch 'ps/bundle-verify-arg' into maint
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio
C Hamano
M
e
rge branch
'mh/w
r
ite-refs
-
sooner-2
.
4
'
i
n
to
m
ain
t
commit
|
commitdiff
|
tree
2015-06-05
Junio
C Ham
a
no
Merge branch
'm
h
/ref-
d
irec
t
o
ry
-
fil
e
' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio
C Hamano
M
e
r
ge branch 'mg/log-decorate-HEAD' into maint
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o
C Hamano
Merge branch 'sb/t1
0
20-cleanup' into maint
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io C Hamano
Merg
e
b
r
anc
h
'jc/gitignore-precede
n
c
e' into maint
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C H
a
ma
n
o
Merge branch 'bc/conne
c
t
-
p
l
ink' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
Hama
n
o
Merge bra
n
ch 'ph/rebase-i-redo' into m
a
in
t
commit
|
commitdiff
|
tree
2015-06-05
Junio C
H
aman
o
Merge branch 'jk
/
add-e-kill-editor' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branch 'mh/
c
lone-verbos
i
ty-fix'
i
nto
m
aint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge b
r
an
c
h
'jk/sha1-file-reduce-useless-warnings
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
J
u
ni
o
C
Hamano
M
e
rge branch 'tb/blame-resurre
c
t
-convert-to
-
git' into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
J
u
n
i
o C Hamano
M
erge branch
'
j
c
/plug
-
fm
t
-mer
g
e-msg-l
e
ak
'
i
nto
maint
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C Hamano
Merg
e
branc
h
'pt/xdg-
c
onfig-path'
i
nt
o
mai
n
t
commit
|
commitdiff
|
tree
2015-06-04
Junio C H
a
m
ano
ll-merg
e
: pass the o
r
iginal
path to ex
t
ernal drivers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-04
Remi L
e
s
p
inet
git-
a
m
:
a
d
d am
.
th
r
ee
W
a
y
conf
i
g v
a
riable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-04
R
emi Le
s
pinet
t4150-
a
m: refa
c
tor am -3 tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-04
R
emi Lespinet
git-am
.
s
h
: fix
i
nitializat
i
on of
the threeway variable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-04
J
eff Kin
g
in
d
ex-
p
ack:
f
i
x trun
c
ation of off_t in comparison
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-03
Micha
e
l Hagger
t
y
r
ead_loose_refs(): simp
l
ify function logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-03
Eric
S
unshine
c
onfigure: add getdelim() ch
e
ck
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-03
Eric S
u
n
shine
c
on
f
ig
.
mak
.
uname:
Darwin: d
e
fine HAV
E
_
G
E
T
DELIM for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-03
Je
f
f K
i
ng
ew
a
h: use less generic macro name
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-03
Eri
c
Sunshine
ewah
/
bitma
p
: silence warning about MASK macr
o
redefi
n
i
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-02
Stefan Beller
Documentation/technical
/
pack-protocol: men
t
ion http
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-02
Pau
l
T
a
n
pull: use
gi
t
-rev-parse --parseopt
f
or
optio
n
parsi
n
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-02
P
a
ul Tan
p
u
l
l: handle
g
it-fetch's options a
s
we
l
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-02
Jun
i
o
C
Ham
a
n
o
Me
r
ge b
r
anch 'pt/pull-tests' into pt/pull-optparse
commit
|
commitdiff
|
tree
2015-06-02
M
ichael
H
a
gge
r
t
y
f
or-each-
r
ef: rep
o
rt broken
r
eferences correctly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-02
Michael Hagger
t
y
t6301: new tests of for-each-ref e
r
ror hand
l
ing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
Juni
o
C Hamano
format-patch: do
not
f
e
ed
ta
g
s
to
c
lear_commit_marks
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
Eri
c
Sunshine
s
end-ema
i
l: further warn
a
bout unsuppo
r
ted
sendmail
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
Eric Su
n
shine
t9001: add send
m
ail aliases line continuation tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
E
ric
S
unshine
t90
0
1
:
refac
t
or sendmail aliases test infra
s
t
ruc
t
ure
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
Eri
c
Sunsh
i
n
e
s
end-email:
i
m
plement
sendmail alia
s
es li
n
e co
n
tin
u
atio
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
Eric Sunshine
se
n
d-email
:
simplify
s
endmail a
l
i
a
ses c
o
mment
a
nd blank
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
Eric Sunshin
e
send-email: re
f
a
ct
o
r
s
en
d
ma
i
l aliases par
s
er
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
Eric Sunshi
n
e
send
-
email: fix
s
ty
l
e: cuddl
e
'elsif
'
and
'else' with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
Eric Sunshine
send-email: drop noise
c
o
mments which merely repeat
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
Eric S
u
nshine
s
e
n
d-email: visu
a
lly
distingui
s
h send
m
ail aliases
p
a
rs
e
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
Eric
S
u
nsh
i
ne
sen
d
-email:
f
urther document missing sendmail aliases
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
Quent
i
n Neill
b
l
a
m
e: add bl
a
me
.
s
h
owEmail configur
a
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
Junio C Ham
a
no
S
i
xt
h
batch for 2
.
5 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
J
un
i
o
C Hamano
Me
r
ge br
a
nch 's
b
/
t
e
s
t-bitmap-free-at-end'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Me
r
ge br
a
nch 'mm/rebase-
i
-po
s
t-rewrite-exec'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hama
n
o
M
e
rg
e
branch 'fm/fetch-raw-s
h
a1'
commit
|
commitdiff
|
tree
2015-06-01
J
u
n
i
o
C Hamano
Merge
branch
'
s
g
/
help-gr
o
up'
commit
|
commitdiff
|
tree
2015-06-01
Ju
n
io C Hamano
Merge
bra
n
ch 'mm/log-f
o
rmat-raw-d
o
c'
commit
|
commitdiff
|
tree
2015-06-01
J
u
nio C Hamano
Merg
e
branch 'dt/cat-file-f
o
llow-sy
m
links'
commit
|
commitdiff
|
tree
2015-06-01
J
unio C Hamano
Merge branch 'rs/ja
n
itoria
l
'
commit
|
commitdiff
|
tree
2015-06-01
J
u
n
io C Hamano
M
e
rge
b
ra
n
c
h 'jk/stash
-
o
p
tions
'
commit
|
commitdiff
|
tree
2015-06-01
Junio
C
Hamano
M
e
rge branch 'da/merg
e
to
o
l-
w
inmerg
e
'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
M
e
rge bran
c
h
'
mc/commit-
d
oc-gra
m
m
ofix'
commit
|
commitdiff
|
tree
2015-06-01
J
unio C Hamano
Merge branch 'jh/f
i
lter-empty-c
o
ntents'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hama
n
o
Merge
b
ranch
'
ah/usage-
s
trings'
commit
|
commitdiff
|
tree
2015-06-01
J
unio C Haman
o
Me
r
ge b
r
a
n
ch 'jk/ht
t
p-back
e
nd
-
de
a
dlock'
commit
|
commitdiff
|
tree
2015-06-01
Junio
C
Hamano
Merge branch 'dt/clea
n
-pathspec-filt
e
r-then-ls
t
at'
commit
|
commitdiff
|
tree
2015-06-01
Junio
C
Ha
m
an
o
a
p
ply: reject a hunk
that
d
oes not do
a
nyth
i
n
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
Jeff
King
suppr
e
ss errors on missing UNINTE
R
ESTING links
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
Jeff King
s
i
lence broken lin
k
w
a
r
n
ings with revs->
i
gnore_mi
s
sing_links
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
Jeff Kin
g
add quieter
ve
r
sions of pa
r
se_{
t
r
e
e,co
m
mi
t
}
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-01
Th
o
m
as Braun
c
o
mplet
i
o
n
: suggest
s
equ
e
n
c
er commands for revert
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Stefan Beller
glossa
r
y: add "remote",
"su
b
m
o
dule", "superp
r
oject"
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
se
t
up_git_direc
t
ory: delay c
o
re
.
ba
r
e/core
.
worktree
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Je
f
f King
Make
f
ile: silence perl/PM
.
stamp
rec
i
pe
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Jeff King
Makefile: avoid timest
a
mp updates t
o
GIT
-
BUILD-OPTI
O
NS
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Jeff King
Makefile:
drop d
e
p
e
ndency between git-ins
t
aweb
a
n
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul
T
an
t55
2
0
:
check r
e
f
log action i
n
fast-forwar
d
merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t552
1
: test --d
r
y
-
run does not make a
n
y
c
h
ange
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
P
aul
T
an
t5520:
t
est --rebase failure on
u
n
b
orn bra
n
ch with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t5520: test
--reb
a
s
e
w
it
h
multiple
branches
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t5520: test work t
r
e
e
fast-forward
when fetch updates
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t55
2
0
:
test for fai
l
ure if
i
ndex h
a
s unresolved entries
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-28
Stefan Beller
submodule
doc: reorder introd
u
c
t
ory pa
r
agraphs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-28
SZED
E
R Gábor
Docume
n
tation: include 'merge
.
br
a
nchdes
c
' fo
r
mer
g
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-28
Juni
o
C Hamano
x
mm
a
p(): d
r
o
p
"Out of memory?"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-28
Jeff King
c
o
n
f
i
g
.
c: r
e
write EN
O
DE
V
i
n
to EI
S
DIR when mmap
f
a
i
l
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-28
J
e
ff
King
config
.
c:
a
void x
m
map
e
r
ror mes
s
ages
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
hen
w
ri
t
ing
c
onfig
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-28
J
eff King
read-cache
.
c
:
drop PROT_WRITE
fr
o
m
m
m
a
p o
f
ind
e
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Miguel Torroja
p4: retrieve t
h
e right revis
i
o
n of
the fi
l
e
in
UTF
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Michael
Hag
g
er
t
y
ref_transaction_co
m
mit(): do not capitalize error message
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Michael H
a
ggerty
verif
y
_lo
c
k
(
)
: do not capitalize
e
rror
m
essa
g
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Micha
e
l Hagger
t
y
v
e
rify_l
o
c
k
(): r
e
port e
r
rors via a strb
u
f
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
J
e
ff King
diff
.
h: rename DIFF_PLAIN color slot t
o
D
I
FF_CON
T
EXT
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Jeff Ki
n
g
diff: acce
p
t color
.
diff
.
context as
a
s
ynonym
for "plain"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Junio
C Hamano
Merge branch
'
nd/un
t
rac
k
ed-cache'
commit
|
commitdiff
|
tree
2015-05-27
Jeff King
t
7
0
6
3: hide stderr
f
r
o
m set
u
p inside prereq
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
J
u
nio C Hamano
t
9
001: wr
i
t
e $HOME/, 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:
add sendma
i
l
e
mail alia
s
es
f
ormat
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Mi
c
hael H
a
ggerty
v
e
r
if
y
_lock(): on errors, let the caller unlock the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Michael
H
aggerty
verif
y
_lock(): return 0/-1
rather
t
han struct ref_loc
k
*
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Jeff King
c
lone: reorder --disso
c
iate an
d
--refer
e
n
c
e o
p
t
io
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Jeff King
c
lone: use OPT_STRING_LI
S
T f
o
r --referen
c
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
J
unio C H
a
mano
d
i
ff
.
c
:
--
w
s-error-hi
g
h
l
ight=<kind> o
p
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-27
Juni
o
C Hamano
diff
.
c:
add emit_
d
el
_
li
n
e() and emit_contex
t
_
lin
e
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Sync with 2
.
4
.
2
commit
|
commitdiff
|
tree
2015-05-26
J
u
n
io C Hamano
G
i
t 2
.
4
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merge branch 'jk/still-interesting' into
maint
commit
|
commitdiff
|
tree
2015-05-26
Juni
o
C H
a
mano
Merge branc
h
'jc/h
a
sh-ob
j
e
c
t' into mai
n
t
commit
|
commitdiff
|
tree
next