repo.or.cz
/
git
/
mingw
/
j6t.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jk/make-fix-dependencies'
2015-06-16
J
u
nio C Ham
a
no
Merge branch 'jk/ma
k
e-fi
x
-dependencies'
commit
|
commitdiff
|
tree
2015-06-16
Junio C Hamano
Merg
e
br
a
nch 'jk/die-on-bogus-w
o
rktree-late'
commit
|
commitdiff
|
tree
2015-06-16
Juni
o
C Hamano
Merge branch 'sg/merge-summar
y
-config
'
commit
|
commitdiff
|
tree
2015-06-16
J
unio C Hama
n
o
Merge bran
c
h 'ah/
s
e
nd-
e
mail-sen
d
mail-alias'
commit
|
commitdiff
|
tree
2015-06-11
Juni
o
C
H
a
mano
Secon
d
ha
l
f
o
f
seve
n
th batch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-11
Junio
C
Haman
o
Merge branch
'tb/comp
l
ete-sequencing'
commit
|
commitdiff
|
tree
2015-06-11
Junio
C Hamano
M
e
rge branch 'jk/squel
c
h-
m
issing-link-warning-for-unreachable'
commit
|
commitdiff
|
tree
2015-06-11
J
u
n
io C H
a
mano
Merge b
r
anch 'pt/pull-tests'
commit
|
commitdiff
|
tree
2015-06-11
Junio C H
a
ma
n
o
Merge branch
'sb/g
l
ossary-submodule'
commit
|
commitdiff
|
tree
2015-06-11
Ju
n
io C Ha
m
a
no
Merge branch 'sb/submodule-doc-in
t
r
o
'
commit
|
commitdiff
|
tree
2015-06-11
Jun
i
o C Hama
n
o
Merge branch 'jk/d
i
agnose-c
o
nfig-mmap-fa
i
lure'
commit
|
commitdiff
|
tree
2015-06-11
Jun
i
o C Hamano
Merge b
r
anc
h
'mt
/
p
4
-depotFile-a
t
-
version'
commit
|
commitdiff
|
tree
2015-06-11
Junio C
Hamano
Merge b
r
anch 'mh/verify-l
o
ck-e
r
ror-r
e
port'
commit
|
commitdiff
|
tree
2015-06-11
Junio C H
a
mano
Merge branch 'jk/c
o
lor-
d
i
f
f
-
plain-is-context'
commit
|
commitdiff
|
tree
2015-06-11
Junio C Hamano
Merge branch 'jk/clone-di
s
s
o
ciate'
commit
|
commitdiff
|
tree
2015-06-11
J
un
i
o
C
Hamano
Merg
e
branch 'jc/diff-ws-er
r
or-hig
h
ligh
t
'
commit
|
commitdiff
|
tree
2015-06-05
J
unio C Hamano
Sy
n
c with
2
.
4
.
3
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
G
i
t
2
.
4
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-05
J
unio
C
Hamano
The f
i
rst half of the sev
e
nth batch f
o
r 2
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io C Hamano
Me
r
ge branch 'ld/p4
-
editor-multi-words'
commit
|
commitdiff
|
tree
2015-06-05
Junio C Ham
a
no
Merge bran
c
h
'bc/object-id'
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio C Ha
m
ano
Merge b
r
anch 'j
k
/a
t
-pu
s
h-s
h
a1'
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o C Hamano
Mer
g
e
branch 'dl/b
r
anch-er
r
or-message'
i
n
to maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C
Hamano
M
e
rg
e
b
ranch 'jk/skip-http-test
s
-under-no-cur
l
' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C
H
aman
o
Merge bran
c
h 'ps/do
c
-p
a
ckfile-
v
s-pack-f
i
le' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
M
e
r
ge branch
'
f
g/document-commit-mess
a
ge-strip
p
ing
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio
C Hamano
M
erge branch '
j
k
/
rer
e
r
e-forg
e
t-check
-
ena
b
le
d
' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
i
o
C
Hamano
M
erge branch 'pt/pu
l
l-lo
g
-n' into maint
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o
C
Ha
m
ano
Merge branch 'pt/pull-ff-vs-merge-ff' into maint
commit
|
commitdiff
|
tree
2015-06-05
J
unio C Hamano
Merge branch 'rs/plug-leak-in-pack-bitmaps' into
maint
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
Ha
m
ano
Merge branc
h
'ja
/
tuto
r
i
a
l
-
asc
i
idoctor-fix' int
o
maint
commit
|
commitdiff
|
tree
2015-06-05
J
unio C Hama
n
o
M
erge branch 'jk
/
s
tripspace-asciido
c
tor-fix' i
n
t
o
maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branch 'jk/asciid
o
c-markup-fix' in
t
o maint
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio C Hamano
M
erge b
r
anch
'ps/
b
undle-verify-arg' in
t
o maint
commit
|
commitdiff
|
tree
2015-06-05
J
unio C Ham
a
no
Me
r
ge
b
r
a
nch 'mh/write-refs-sooner-2
.
4
'
into maint
commit
|
commitdiff
|
tree
2015-06-05
J
u
n
i
o C Ha
m
ano
Merge branch
'
mh/ref-dir
e
c
tory-file' into
m
a
i
nt
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branc
h
'
m
g/l
o
g
-decorat
e
-
HEAD' i
n
t
o maint
commit
|
commitdiff
|
tree
2015-06-05
Junio
C Haman
o
Merge
br
a
nch
'sb/t102
0
-
c
l
eanup'
into m
a
int
commit
|
commitdiff
|
tree
2015-06-05
Junio C H
a
m
a
n
o
Merge
b
ranch 'jc/gitignore-
p
r
ec
e
dence' into mai
n
t
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branch
'bc
/
conne
c
t
-plink'
into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Me
r
ge br
a
nch 'ph/reb
a
se-i
-
redo' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Mer
g
e branch 'jk/add-e-kill-
e
d
i
t
or'
into
m
aint
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o C
H
ama
n
o
Merge branc
h
'mh/clone-verbosity-fix' i
n
to
m
a
int
commit
|
commitdiff
|
tree
2015-06-05
J
u
n
io C H
a
mano
Merge bra
n
c
h 'jk/sha1-file-reduc
e
-useless-warni
n
g
s
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o C Hamano
Merge br
a
nch 'tb/blame-resurrect-convert-to-
g
it
'
into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio C Hamano
Mer
g
e br
a
n
ch 'jc/plug-f
m
t-merge-
m
sg
-
l
e
ak' into
m
a
int
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
M
e
r
g
e bran
c
h
'
pt/xdg-c
o
nfi
g
-path' into
main
t
commit
|
commitdiff
|
tree
2015-06-01
J
u
nio
C Haman
o
Sixth batch for 2
.
5 cycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merge branch 's
b
/test-bitma
p
-f
r
ee-at-e
n
d'
commit
|
commitdiff
|
tree
2015-06-01
Junio C
H
ama
n
o
Merg
e
b
r
a
nch 'mm
/
re
b
ase
-
i-po
s
t
-rewrite-ex
e
c'
commit
|
commitdiff
|
tree
2015-06-01
Junio
C
H
amano
Merge branch
'fm/fetch-raw-sha1'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merge branch 'sg/help-group'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Ha
m
ano
Merge b
r
an
c
h 'm
m
/log-f
o
rmat-ra
w
-
d
oc'
commit
|
commitdiff
|
tree
2015-06-01
J
u
nio C
H
aman
o
Merge branch
'dt/ca
t
-fil
e
-
f
ollow-symlin
k
s'
commit
|
commitdiff
|
tree
2015-06-01
Junio
C Hamano
Merg
e
b
ra
n
ch 'rs/janitor
i
al'
commit
|
commitdiff
|
tree
2015-06-01
J
uni
o
C Hamano
Merge bra
n
ch 'jk/stash-option
s
'
commit
|
commitdiff
|
tree
2015-06-01
Junio C
Hama
n
o
Merge branch 'da
/
mergetoo
l
-winmerg
e
'
commit
|
commitdiff
|
tree
2015-06-01
Junio C
Hamano
Mer
g
e
branc
h
'mc/
c
ommi
t
-doc-gr
a
mmofix'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Mer
g
e bran
c
h 'jh/filter-empty-contents'
commit
|
commitdiff
|
tree
2015-06-01
Jun
i
o C Hamano
Merg
e
branch
'ah/usage-strings'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merge
b
r
a
n
c
h 'jk/http
-
bac
k
end-deadlock'
commit
|
commitdiff
|
tree
2015-06-01
J
unio C Hamano
Merge
branch 'dt/c
l
ean-pathspec-fil
t
er
-
then
-
lstat'
commit
|
commitdiff
|
tree
2015-06-01
Jef
f
K
i
n
g
suppress erro
r
s on missing UNINTERESTING li
n
ks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-01
Jeff
K
ing
sile
n
ce broken li
n
k warnings with revs->ignore_
m
issing_
l
inks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-01
Jef
f
King
add
q
uieter versions of parse_{tree,commit}
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-01
T
homas Braun
complet
i
on: suggest
s
e
quence
r
commands fo
r
r
e
vert
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-29
Stefan
Beller
gloss
a
ry
:
a
d
d "remote",
"s
u
bmodule",
"
superproje
c
t"
Helped-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-29
Jeff Ki
n
g
setup_
g
it
_
directory: delay core
.
bare/core
.
wor
k
tree
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-29
Jeff King
Makefile: silen
c
e
p
erl/PM
.
stamp recipe
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-29
Jeff King
Makefile: avoi
d
timestamp updat
e
s to
G
I
T
-
BUIL
D
-OPTIONS
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-29
Jeff
King
Makefile: drop depen
d
ency
b
e
t
w
een
g
i
t
-i
n
stawe
b
and
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t5520:
c
heck reflog
a
c
tion in fas
t
-forwar
d
merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-29
P
a
u
l
Ta
n
t5521:
te
s
t --dry-
r
un
d
oe
s
not ma
k
e any c
h
anges
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t
5520: tes
t
--reba
s
e failure on u
n
b
orn branch
with
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t5520: test
--rebase with mul
t
i
p
le
branches
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t55
2
0
:
t
e
st w
o
rk
t
ree fast-forw
a
rd
when fe
t
ch updates
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t5520: t
e
st for failure
i
f index has unresolved
e
ntries
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-28
Ste
f
an
B
e
ll
e
r
submodule doc: reorde
r
intr
o
duc
t
ory paragraphs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-28
S
ZEDER Gábor
Docume
n
tation: include 'merge
.
br
a
nchdesc' for merge
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-28
J
unio
C
H
amano
xmmap(): drop "Out of
memory?"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-28
J
e
ff Kin
g
co
n
fig
.
c:
rewri
t
e ENODEV into EISDIR whe
n
mmap fails
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-28
Jeff Ki
n
g
config
.
c: avoid xmmap err
o
r messag
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-28
Jeff King
config
.
c: fix
m
ma
p
lea
k
w
hen writing config
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-28
J
e
ff King
read-cache
.
c: drop PRO
T
_WRITE from mmap of index
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Mig
u
el Torroja
p
4: re
t
r
i
ev
e
the right revision o
f
t
he file in
U
TF
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Micha
e
l Haggerty
r
e
f_tr
a
n
saction_commit():
d
o
not c
a
pit
a
liz
e
error messages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Michae
l
Haggerty
verify_lock(): do not capit
a
lize error
m
essage
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
M
i
chael Haggerty
v
erify
_
lock(
)
: rep
o
rt errors via a strb
u
f
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Jef
f
King
diff
.
h: re
n
ame DIFF_
P
LAIN color slot to
DIFF_
C
ONTEX
T
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
J
e
ff Ki
n
g
d
iff: accept c
o
l
or
.
d
i
ff
.
context as a s
y
nonym for "plain"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Junio C Hamano
Merge branch 'nd/u
n
tracked-ca
c
he'
commit
|
commitdiff
|
tree
2015-05-27
J
eff King
t7063: hide
s
tderr fro
m
setu
p
i
n
sid
e
prereq
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Jun
i
o C Hama
n
o
t9001: wri
t
e $HOME/, not
~/, to
h
elp shell
s
without
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Allen Hubbe
send-emai
l
:
a
d
d
send
m
ail e
m
ail aliases for
m
at
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Mich
a
el Haggert
y
verify_lock(
)
:
on
errors,
l
et th
e
caller unlock the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Micha
e
l Haggerty
verify_lock
(
): return
0
/-1 rat
h
er
than struc
t
ref_lock *
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Jeff
K
i
n
g
clone:
r
eorder --di
s
sociate and
--re
f
e
rence o
p
ti
o
ns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Jeff King
clone:
u
se OPT_STRING_LIST for
-
-reference
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Junio C Haman
o
diff
.
c: --ws-error-highlight=<kind> option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Junio
C
H
amano
diff
.
c: add
e
mit_del_l
i
n
e
(
)
and emit_context_l
i
n
e
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next