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 'jk/stash-options' into next
2015-05-26
Junio C Hamano
Merge branch
'
j
k
/stash-option
s
'
into next
commit
|
commitdiff
|
tree
2015-05-26
J
u
n
io C Ha
m
a
n
o
Merge bran
c
h
'
da/mergetool-winmerge' into
n
ext
commit
|
commitdiff
|
tree
2015-05-26
Junio C H
a
m
ano
Merge branch 'mc/commit-doc-gr
a
m
m
ofi
x
' i
n
to next
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merg
e
branch '
j
h/filt
e
r-empty-contents' i
n
t
o
next
commit
|
commitdiff
|
tree
2015-05-26
Junio C Ha
m
a
n
o
Mer
g
e
b
ranch 'jk/
h
ttp-
b
ackend-deadlock' int
o
n
ext
commit
|
commitdiff
|
tree
2015-05-26
Junio C Haman
o
Mer
g
e branch 'dt
/
clean-pathspec-fil
t
er-then-lstat'
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merge branch 'j
k
/
htt
p
-backend-deadlock-2
.
3' into
j
k
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Junio C Ha
m
ano
M
e
rg
e
branch 'jk/http-backend-deadlock-2
.
2' into jk
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Jeff Kin
g
http-backe
n
d:
sp
o
o
l re
f
n
e
gotiation
r
eq
u
ests
to
buffer
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-23
Junio C Hamano
Sync with master
commit
|
commitdiff
|
tree
2015-05-22
Jun
i
o C Ha
m
a
n
o
F
o
ur
t
h ba
t
ch for 2
.
5 c
y
cle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-22
Jun
i
o C H
a
mano
Merge
b
ranc
h
'ps/doc-pac
k
file
-
v
s
-
p
ack-file'
commit
|
commitdiff
|
tree
2015-05-22
Junio C Hamano
Merg
e
branch 'sb/t1
0
20-cleanup'
commit
|
commitdiff
|
tree
2015-05-22
Junio C Hamano
Merge branc
h
'lm/squelch-b
g
-pr
o
gress'
commit
|
commitdiff
|
tree
2015-05-22
J
unio C H
a
mano
Merge br
a
nch 'jc/ignore-epipe-
i
n
-
f
i
lter'
commit
|
commitdiff
|
tree
2015-05-22
Juni
o
C Hamano
Merge branch 'mh/clone-ve
r
bosity-fix'
commit
|
commitdiff
|
tree
2015-05-22
Junio
C Ham
a
no
Merge br
a
nch 'pt/pull-t
a
gs-e
r
ror-diag'
commit
|
commitdiff
|
tree
2015-05-22
Junio C Hamano
Merge branch 'm
h
/lockfile-ret
r
y'
commit
|
commitdiff
|
tree
2015-05-22
Junio C Hamano
Merge branch 'jk
/
ad
d
-e-
k
i
ll-edi
t
or'
commit
|
commitdiff
|
tree
2015-05-22
Junio C
H
amano
Me
r
ge branch 'sg/completion-config'
commit
|
commitdiff
|
tree
2015-05-22
J
u
n
io C Hamano
Merg
e
branch 'mh/
r
ef
-
dire
c
t
o
r
y-file'
commit
|
commitdiff
|
tree
2015-05-22
J
u
nio
C Hamano
Merge branc
h
'mh/write
-
refs-sooner-2
.
4'
commit
|
commitdiff
|
tree
2015-05-22
Ju
n
io C Ha
m
ano
Merge branch 'mg
/
lo
g
-decorate-HEAD'
commit
|
commitdiff
|
tree
2015-05-22
J
u
n
io C Hamano
Me
r
ge branch
'jk
/
asciidoc-ma
r
kup-fix'
commit
|
commitdiff
|
tree
2015-05-22
Junio
C Hamano
M
e
rge
br
a
nch 'jk/stripspace-asciid
o
ctor-fix'
commit
|
commitdiff
|
tree
2015-05-22
J
unio C Hamano
Merge branch 'ja
/
tutor
i
a
l-asciidoc
t
or-
f
ix'
commit
|
commitdiff
|
tree
2015-05-22
Junio C Ha
m
ano
Merge branch 'sg
/
help-
s
ubcommands'
commit
|
commitdiff
|
tree
2015-05-22
Junio C Hamano
Merge branch '
p
s/bu
n
dle-verify-arg'
commit
|
commitdiff
|
tree
2015-05-22
J
u
nio C Ham
a
no
Merge
b
ranch 'ls/htt
p
-ssl-c
i
pher-list'
commit
|
commitdiff
|
tree
2015-05-22
J
u
nio
C
Hamano
Merge branch 'dl/
s
ubtree-avoid-tricky-echo'
commit
|
commitdiff
|
tree
2015-05-22
J
u
n
io C Hamano
Merge
b
ranch 'j
k
/sk
i
p-http-test
s
-
under-n
o
-curl'
commit
|
commitdiff
|
tree
2015-05-22
Juni
o
C Hamano
Merge b
r
a
n
c
h
'dl/subtre
e
-push-no-squash'
commit
|
commitdiff
|
tree
2015-05-22
Ju
n
io C H
a
mano
Merge branch 's
g
/complet
i
on-omit
-
crede
n
tial-helpers'
commit
|
commitdiff
|
tree
2015-05-22
Junio C Hamano
Mer
g
e bra
n
c
h
'dl/branch-error
-
message'
commit
|
commitdiff
|
tree
2015-05-22
Patrick Steinhar
d
t
doc: fix incons
i
stent spelling
o
f "packfile"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-20
Junio
C Hamano
Merge
branch 'rs/plug
-
leak-in
-
pack-bitmaps' into next
commit
|
commitdiff
|
tree
2015-05-20
Junio
C Ha
m
ano
Merge branch 'ps
/
doc-pack
f
i
l
e-vs-p
a
ck-file' into
next
commit
|
commitdiff
|
tree
2015-05-20
Junio C H
a
man
o
Merge branch
'sb/t102
0
-cleanup' into next
commit
|
commitdiff
|
tree
2015-05-20
Juni
o
C
Hamano
Mer
g
e branch 'pt/pull-log-n
'
into ne
x
t
commit
|
commitdiff
|
tree
2015-05-20
Ju
n
i
o C Hama
n
o
Merge branch 'pt/p
u
ll-ff
-
vs-me
r
ge-ff' into next
commit
|
commitdiff
|
tree
2015-05-20
Junio C Hamano
Me
r
ge
b
ranch 'jc/
i
gnore-epipe-i
n
-f
i
l
ter' int
o
n
ext
commit
|
commitdiff
|
tree
2015-05-20
Junio C Hamano
Merge br
a
nch 'lm/sque
l
ch-bg-
p
rogress' into next
commit
|
commitdiff
|
tree
2015-05-20
Junio
C
Hamano
Merge branch
'
mh/c
l
one-
v
erbosity
-
f
i
x' into next
commit
|
commitdiff
|
tree
2015-05-20
J
un
i
o
C Hamano
Merge br
a
nch
'
pt/pull-tag
s
-er
r
or-diag'
int
o
nex
t
commit
|
commitdiff
|
tree
2015-05-20
Junio C
Hamano
Me
r
ge branch 'm
h
/lockfi
l
e-
r
e
try'
i
n
to next
commit
|
commitdiff
|
tree
2015-05-20
Je
f
f K
i
n
g
s
tash:
r
e
cog
n
ize "--help" fo
r
s
u
b
c
o
mman
d
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-20
Jef
f
King
stash: co
m
plain about unkno
w
n fla
g
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-20
David Aguilar
mer
g
e
t
o
o
ls: add winmerge as
a
bu
i
ltin
t
o
ol
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-20
David Agui
l
a
r
mergetoo
l
--lib: set IFS f
o
r difftool and m
e
rgetool
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-20
Jeff
King
t5
5
51: factor o
u
t
tag creation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-20
Junio C Hamano
filter_b
u
ff
e
r_or_fd(): ignore
E
PIPE
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-20
Mich
a
el Coleman
Docum
e
ntati
o
n
/git
-
commit:
g
rammo
f
ix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
copy
.
c: make co
p
y
_
fd() re
p
ort its statu
s
silently
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
Sync wit
h
master
commit
|
commitdiff
|
tree
2015-05-19
J
u
n
i
o C Hama
n
o
Merge br
a
nch '
m
h/w
r
ite-re
f
s-so
o
ner-2
.
4
'
into next
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
M
e
rge bra
n
ch 'nd/
u
ntracked
-
cache'
i
nto next
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
Merge branch 'jk/rere
r
e-fo
r
get-check-e
n
abled
'
into
.
.
.
commit
|
commitdiff
|
tree
2015-05-19
Junio
C
Hamano
Merge branc
h
'jk/asciido
c
-markup-fix' into next
commit
|
commitdiff
|
tree
2015-05-19
J
unio C Hamano
Merge branc
h
'mg/log-dec
o
rate-HEAD' into
n
ext
commit
|
commitdiff
|
tree
2015-05-19
Junio
C Hamano
M
erge b
r
anch '
s
g/complet
i
on-
c
o
nfig' into next
commit
|
commitdiff
|
tree
2015-05-19
Ju
n
io C Hamano
Me
r
ge branch 'jk
/
ad
d
-e-kill-editor' i
n
to next
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hama
n
o
Me
r
ge branch
'
jk/stripspace-ascii
d
oc
t
or-fix'
i
nto next
commit
|
commitdiff
|
tree
2015-05-19
Junio C Ha
m
ano
Merge branch
'
ja/tut
o
rial
-
asciidoc
t
or-fix'
into next
commit
|
commitdiff
|
tree
2015-05-19
Junio
C
H
a
mano
Merge branch 'mh
/
ref-direct
o
r
y
-file' into
n
e
xt
commit
|
commitdiff
|
tree
2015-05-19
Jun
i
o
C H
a
ma
n
o
T
h
ird ba
t
c
h
f
or
2
.
5 cycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-19
J
u
nio
C
Hamano
Merge br
a
nch '
s
b/ref-lock-lose-lo
c
k-fd'
commit
|
commitdiff
|
tree
2015-05-19
Jun
i
o C Hamano
Merge branch 'kn/cat-file-literally'
commit
|
commitdiff
|
tree
2015-05-19
Jun
i
o C H
a
mano
Merge branch
'
nd/dwim-wildcards-as-pathsp
e
c
s'
commit
|
commitdiff
|
tree
2015-05-19
Junio
C
Hamano
Merge branch 'jc/merge'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Ha
m
ano
Merge branch 'ph/rebase-i-red
o
'
commit
|
commitdiff
|
tree
2015-05-19
Junio C
H
amano
Me
r
ge
b
ra
n
ch 'jc/te
s
t-pre
r
e
q
-
v
al
i
date'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
Merge branch 'bc/connect-plink'
commit
|
commitdiff
|
tree
2015-05-19
J
u
nio C Haman
o
Merg
e
branch
'jk/test-chain-lint'
commit
|
commitdiff
|
tree
2015-05-19
Juni
o
C Hamano
Merge branch 'fg
/
d
ocument-commit
-
mes
s
a
ge-stripping'
commit
|
commitdiff
|
tree
2015-05-19
Junio C
Hamano
M
e
r
ge bra
n
ch '
j
k/
s
tash-requir
e
-clean-i
n
dex'
commit
|
commitdiff
|
tree
2015-05-19
Jun
i
o C Hamano
Merge branch 'jk/
g
it-no-more-argv0-path-munging'
commit
|
commitdiff
|
tree
2015-05-19
Jun
i
o C Hamano
M
erge
branc
h
'jc/gitign
o
re
-
precedenc
e
'
commit
|
commitdiff
|
tree
2015-05-19
Junio C
Hamano
Merge bran
c
h '
n
d
/
diff-i-t-a'
commit
|
commitdiff
|
tree
2015-05-19
Jeff King
p
ro
g
ress:
t
reat "no terminal
"
as
b
eing in the foreground
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-19
René Scharfe
pack-b
i
t
m
aps
:
plug memory lea
k
, fix allocation size
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-19
Mike Homm
e
y
c
l
one: call transport
_
set_verbosity before anythi
n
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-18
Stefan Bel
l
er
s
ubdirectory tests: co
d
e
c
leanup, u
n
comment
t
est
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-18
Davi
d
Tu
r
n
e
r
clean: only ls
t
at files in pathsp
e
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-18
P
aul Tan
pull: parse
p
u
l
l
.
ff as a
b
ool or string
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-18
P
a
u
l Tan
pull: m
a
ke pull
.
ff=true override merge
.
ff
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-18
Paul Tan
pull: handle -
-
lo
g
=<n>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-18
J
i
m Hill
sha
1
_fi
l
e: pass empty buf
f
er to inde
x
e
mp
t
y fil
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-17
Patric
k
Steinha
r
dt
pack-proto
c
o
l
.
txt:
fix ins
c
onsistent s
p
elling
of "pa
c
kfile"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-17
Pat
r
ick St
e
inhar
d
t
git-unpack-objects
.
tx
t
: fi
x
inconsis
t
ent spel
l
ing
o
f
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-17
P
atrick Steinhardt
git-verify
-
pac
k
.
txt: fix
inconsistent
s
p
elling of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-15
Jeff King
http-ba
c
kend: fix die recurs
i
on with custom handler
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-14
Michae
l
Hag
g
erty
lock_packed
_
refs
(
): a
l
low retrie
s
when acquiring
t
he
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-14
Michael H
a
gg
e
rty
lockfile:
a
llow
f
ile locking
to be retri
e
d with
a
tim
e
out
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-14
Jef
f
King
rerere: exit silently on "fo
r
get"
when rere
r
e is
d
isa
b
led
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-14
Paul Tan
p
ull: remove --tag
s
e
rror in no merg
e
c
andida
t
es case
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-14
Jeff King
doc: c
o
nvert AsciiD
o
c {?
f
o
o
}
to if
d
ef::foo[]
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-13
J
u
nio C Hamano
S
ync with m
a
ster
commit
|
commitdiff
|
tree
2015-05-13
J
unio C H
a
m
a
no
S
ync with 2
.
4
.
1
commit
|
commitdiff
|
tree
2015-05-13
Junio C Hamano
Git
2
.
4
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-13
Junio
C
H
a
m
a
n
o
Mer
g
e branch 'sb/l
i
ne-lo
g
-plug-
p
airdiff-leak' i
n
to
.
.
.
commit
|
commitdiff
|
tree
next