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 'sb/prefix-path-free-results' into next
2015-05-07
J
unio C Hamano
Merge br
a
nch
'
sb/prefix
-
path-free
-
resu
l
ts' into
next
commit
|
commitdiff
|
tree
2015-05-07
Junio C
Haman
o
Me
r
ge
branch 'sg/completion-no-redundant-
a
l
l-command
.
.
.
commit
|
commitdiff
|
tree
2015-05-07
Junio
C Hamano
Merge branch 'sg/complete-de
c
o
rate-full-no
t
-long' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2015-05-07
Junio C Hamano
Merge branch 'nd/dwim-wildcards-
a
s-pa
t
hspecs'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2015-05-07
J
unio C Hamano
M
e
rge branch 'jc/merge' into next
commit
|
commitdiff
|
tree
2015-05-07
J
u
nio C H
a
m
ano
Merge bra
n
ch '
p
h
/
rebas
e
-i-r
e
do' into next
commit
|
commitdiff
|
tree
2015-05-07
Jun
i
o C Hamano
M
erge
b
r
anch
'
jk/f
i
lter-b
r
anch-
u
se-of-sed-on-inco
m
p
lete
.
.
.
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
M
erge branch 'tb/b
l
ame-resurre
c
t-convert
-
to-g
i
t' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge
branch 'jn/clean-us
e
-error
-
not-fprintf-on-stderr
.
.
.
commit
|
commitdiff
|
tree
2015-05-06
Jun
i
o
C Hamano
M
erge bra
n
ch 'jc/d
a
emon
-
no-
i
pv6-
f
or-2
.
4
.
1' into next
commit
|
commitdiff
|
tree
2015-05-06
Junio C Ha
m
ano
Me
r
ge
b
ranch 'jc/t
e
s
t
-
prereq-vali
d
ate' into
next
commit
|
commitdiff
|
tree
2015-05-06
J
u
nio C Hamano
Merge br
a
nch
'
bc
/
connect-
p
link' into next
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hama
n
o
Merge branch
'jk/test-chain-li
n
t' into next
commit
|
commitdiff
|
tree
2015-05-06
Ju
n
io C Haman
o
Mer
g
e br
a
nch 'va/fix-git-p4-tests' into
n
ext
commit
|
commitdiff
|
tree
2015-05-06
J
unio C
H
amano
Merge
br
a
nch 'l
d
/p
4
-
case-fold' i
n
t
o
n
ext
commit
|
commitdiff
|
tree
2015-05-06
J
u
n
i
o C
H
a
m
ano
Mer
g
e branch 'jk
/
reb
a
s
e-quiet-noop' int
o
next
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge branch 'fg
/
documen
t
-comm
i
t
-
message-stripping
.
.
.
commit
|
commitdiff
|
tree
2015-05-06
J
u
nio C
H
amano
Merge branch 'jk/
s
t
a
s
h-require-clean-in
d
ex' into next
commit
|
commitdiff
|
tree
2015-05-06
Junio C Ha
m
a
no
Merge br
a
nch 'jk
/
g
it-no-more-argv0-
p
ath-m
u
nging' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-06
J
u
n
i
o
C Ham
a
no
M
e
rge branch 'jc/gitignore-pr
e
ce
d
en
c
e
'
into next
commit
|
commitdiff
|
tree
2015-05-06
Ju
n
i
o C Ha
m
a
n
o
Merge br
a
nch 'tb
/
t0027-crlf'
i
n
t
o
nex
t
commit
|
commitdiff
|
tree
2015-05-06
Junio
C
Hama
n
o
M
erge branch
'va/p4-cli
e
nt-pa
t
h' int
o
next
commit
|
commitdiff
|
tree
2015-05-06
Ju
n
io C Hama
n
o
M
e
r
g
e
branch '
m
m/
a
dd-p-
s
pl
i
t-error' into next
commit
|
commitdiff
|
tree
2015-05-06
Junio C
Hamano
Merge b
r
anch 'ls/p4-chang
e
s-bloc
k
-size' into next
commit
|
commitdiff
|
tree
2015-05-06
Junio C
H
a
ma
n
o
M
e
rge branch
'
jc/pl
u
g-fmt-mer
g
e-msg-
l
eak
'
into
next
commit
|
commitdiff
|
tree
2015-05-06
Junio C
H
a
m
an
o
Merge branch '
n
d/slim-i
n
d
e
x-p
a
c
k-memory
-
usage' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-06
Junio
C
Ham
a
no
Merge branc
h
'jk/still-
i
nteresting' into next
commit
|
commitdiff
|
tree
2015-05-06
Junio C Ha
m
ano
Merge
b
ranch 'jk/reading-pa
c
ked-refs'
i
nto nex
t
commit
|
commitdiff
|
tree
2015-05-06
Junio
C
H
amano
Merge
branch '
l
m
/
s
q
uelch-
b
g-prog
r
ess' into ne
x
t
commit
|
commitdiff
|
tree
2015-05-06
Junio C H
a
mano
Merge bra
n
ch 'jk/sha
1
-file-reduce-u
s
eless-warning
s
.
.
.
commit
|
commitdiff
|
tree
2015-05-06
Junio
C
Hama
n
o
Merge bran
c
h 'nd/multi
p
le-
w
o
rk-tre
e
s' into next
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge branch 'nd/di
f
f-i
-
t-a
'
into next
commit
|
commitdiff
|
tree
2015-05-06
Ju
n
io
C
Hama
n
o
Merge branch 'pt/credential-xdg' into
n
ext
commit
|
commitdiff
|
tree
2015-05-06
Junio
C Hamano
Fi
r
s
t
batch for 2
.
5 cyc
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-06
Jun
i
o C Hamano
Mer
g
e bra
n
ch 'jk/prune
-
mtim
e
'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hama
n
o
M
er
g
e
b
ra
n
ch 'mm/
u
sage-log-
l
-can-t
a
ke-regex'
commit
|
commitdiff
|
tree
2015-05-06
Junio
C
Hama
n
o
Merge br
a
nch
'
ep/fix-te
s
t-li
b
-fun
c
tio
n
s-
r
e
p
ort'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
M
e
rge branch
'
cn/
b
o
m
-in-gitignore'
commit
|
commitdiff
|
tree
2015-05-06
Ju
n
io C Hamano
Merg
e
branch 'jc/epoc
h
t
i
me-wo-tz'
commit
|
commitdiff
|
tree
2015-05-06
Junio
C
H
a
mano
Merge branch
'
n
d
/t
1
5
0
9-
c
hroot-test'
commit
|
commitdiff
|
tree
2015-05-06
J
u
nio C Ham
a
n
o
Merge branch
'oh/fix-conf
i
g-default-user-na
m
e-section
'
commit
|
commitdiff
|
tree
2015-05-06
Junio
C
H
a
m
ano
Mer
g
e bran
c
h 'jk/type-from-str
i
ng-gentl
y
'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hama
n
o
Merge b
r
a
n
ch 'sb/test-bitmap-free-at-end'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge
branch 'ld/p4-fil
e
type-
d
etection'
commit
|
commitdiff
|
tree
2015-05-06
Jun
i
o C Ham
a
no
Merge branc
h
't
s
/checkout-advice-plural'
commit
|
commitdiff
|
tree
2015-05-06
Junio C
Hamano
Merge branch 'jk
/
init-co
r
e
-worktr
e
e
-at-root
'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hama
n
o
Me
r
ge branch
'
m
h/show-
b
ranch-topic'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Ham
a
no
Merge branch 'sb/lin
e
-lo
g
-plug-pairdiff-leak'
commit
|
commitdiff
|
tree
2015-05-06
J
unio C H
a
man
o
Merge bran
c
h
'
jc/diff-no
-
inde
x
-d-f'
commit
|
commitdiff
|
tree
2015-05-06
Junio C H
a
mano
Merge
branch
'bc/object-id'
commit
|
commitdiff
|
tree
2015-05-05
J
u
nio C Haman
o
d
a
emon:
unbreak
NO_IPV6
b
uild regres
s
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-30
Junio C Hamano
Git
2
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Jun
i
o C Hamano
merge: deprecate 'git merge <
m
ess
a
ge> HEAD <co
m
m
it
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C
Hama
n
o
merge: hand
l
e
FETCH
_
HEAD
i
nte
r
nally
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
u
nio C Haman
o
merge: d
e
cide
i
f w
e
auto-generate the message early
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Ha
m
a
no
merge: make
c
ollect_parents() auto-generate the merge
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Jun
i
o
C
Ha
m
ano
m
erg
e
: extract prepa
r
e
_
m
erge_m
e
ssage() lo
g
i
c
out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
u
nio C H
a
mano
merge: narrow scope of merge_na
m
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: split r
e
d
u
c
e_parents()
o
u
t
of collect_pare
n
ts()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Ju
n
io C
H
amano
me
r
ge: clarify collect_parents() log
i
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C
Hamano
merge:
small leakfi
x
and code simp
l
ification
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Jun
i
o
C
Hama
n
o
mer
g
e: do not check argc to
de
t
e
r
mine number of remote
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
mer
g
e
:
clarify "pul
l
ing into void" special
c
ase
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C H
a
mano
t5520: test pulling an octopus into an
u
nborn branc
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
u
n
i
o C Hamano
t5520: sty
l
e fixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Ham
a
n
o
merge: simplif
y
co
d
e flo
w
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
mer
g
e: test the
top-le
v
el merge driver
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-28
Juni
o
C
H
am
a
no
test: validate p
r
erequistes syntax
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-28
Junio
C
Ham
a
no
Me
r
ge branch 'mh/multimail-renewal'
commit
|
commitdiff
|
tree
2015-04-28
Ju
n
i
o
C
Haman
o
Me
r
ge branch 'mg/show-notes-doc'
commit
|
commitdiff
|
tree
2015-04-28
J
unio
C
Hamano
M
er
g
e branch 'nd/v
e
r
s
i
oncmp-
p
rereleases'
commit
|
commitdiff
|
tree
2015-04-28
J
u
nio C Hamano
Merg
e
bra
n
ch 'm
g
/status-v-v'
commit
|
commitdiff
|
tree
2015-04-27
Junio C Hama
n
o
Sync wi
t
h
2
.
3
.
7
commit
|
commitdiff
|
tree
2015-04-27
Juni
o
C Ha
m
a
n
o
Gi
t
2
.
3
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-27
J
unio C Hamano
Merge branch 'tb/connect-ipv6-par
s
e-fix'
i
nto
m
a
int
commit
|
commitdiff
|
tree
2015-04-27
Ju
n
io C Hamano
Merge branch
'
ma/bash-c
o
mpletion-leaking-x' into maint
commit
|
commitdiff
|
tree
2015-04-27
Ju
n
io C Haman
o
Merge branch 'jc/pus
h
-c
e
rt' into maint
commit
|
commitdiff
|
tree
2015-04-22
J
unio C H
a
man
o
ignore: info/
e
xclude shoul
d
tru
m
p
core
.
ex
c
lud
e
sfile
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-22
J
u
n
io C Hamano
Git 2
.
4
.
0
-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-21
Junio C
H
amano
Sync with m
a
i
nt
commit
|
commitdiff
|
tree
2015-04-21
Junio C Ham
a
no
Git 2
.
3
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-21
Ju
n
io C H
a
mano
Merg
e
branch 'j
k
/col
o
r
s' into ma
i
nt
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hamano
M
e
rge branch
'
jk/test-annoyances' into
m
a
int
commit
|
commitdiff
|
tree
2015-04-21
Junio
C
H
amano
Merg
e
b
ranch 'pt/enter-r
e
po-
c
o
m
ment-fix' into maint
commit
|
commitdiff
|
tree
2015-04-21
Junio C H
a
m
ano
Merge branch 'jz/git
w
e
b
-conf-doc-fix' in
t
o maint
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hamano
Merge branch '
j
k/ch
e
rry-pi
c
k-docfix' int
o
maint
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hamano
Merg
e
bran
c
h '
i
u/fix-
p
a
rse-options-h-comment' into
.
.
.
commit
|
commitdiff
|
tree
2015-04-21
J
u
nio
C Hamano
Merge bran
c
h 'jg/cguide
-
w
e-canno
t
-count' into
m
aint
commit
|
commitdiff
|
tree
2015-04-21
Ju
n
i
o
C Hamano
Merge branch 'jk/p
a
c
k
-c
o
rruption-po
s
t-mortem' int
o
.
.
.
commit
|
commitdiff
|
tree
2015-04-21
Juni
o
C Hamano
Mer
g
e b
r
a
nch
'
jn/doc-fas
t
-import-no-1
6
-octo
p
us-l
i
mit
.
.
.
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hamano
RelNo
t
es: "merge --quiet" cha
n
ge
h
a
s been reverte
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-20
Juni
o
C Ham
a
no
Hopefully the last batch
for 2
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-20
Junio
C Hama
n
o
Merge branch 'ps/grep
-
hel
p
-all-callback-arg'
commit
|
commitdiff
|
tree
2015-04-20
Juni
o
C
H
amano
Merg
e
br
a
nch
'
tb/connect-ipv6-p
a
r
se
-
f
i
x
'
commit
|
commitdiff
|
tree
2015-04-20
Junio C Hamano
Me
r
ge branch 'va/fix-
g
it-p4-tes
t
s'
commit
|
commitdiff
|
tree
2015-04-20
Juni
o
C Hamano
Merg
e
branch 'jc/push-cert'
commit
|
commitdiff
|
tree
2015-04-20
Junio C Hamano
Merge branch 'ma/bash-completion-leaking-x'
commit
|
commitdiff
|
tree
2015-04-20
Ju
n
io C Hamano
fmt-merge-ms
g
: plug small leak of commit buff
e
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-19
Junio C Ha
m
ano
Mer
g
e tag '
g
itgui-0
.
2
0
.
0' of
h
ttp://repo
.
or
.
cz/r/git-gu
i
commit
|
commitdiff
|
tree
2015-04-16
Junio
C Hamano
attr: skip UTF8
BOM
at the beginn
i
n
g of the
input file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next