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 'sg/completion-no-redundant-all-command-list' into next
2015-05-07
Junio C Ham
a
no
Merg
e
branch
'
sg/compl
e
tion-n
o
-redundant-all
-
comma
n
d
.
.
.
commit
|
commitdiff
|
tree
2015-05-07
Junio C Hamano
Merge branch 'sg/complete-
d
ecorate-full-not
-
l
o
n
g
'
into
.
.
.
commit
|
commitdiff
|
tree
2015-05-07
Ju
n
io C Ha
m
ano
Merge branch 'nd/dwim-wildcards-as-pathspecs'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2015-05-07
Junio C Ham
a
no
Merge b
r
anch 'jc/merge' into n
e
xt
commit
|
commitdiff
|
tree
2015-05-07
Junio C Hamano
Merge
b
r
anch 'ph/reba
s
e-i-red
o
' into next
commit
|
commitdiff
|
tree
2015-05-07
Junio
C
Hamano
Me
r
ge
b
ranc
h
'j
k
/filt
e
r-
b
ra
n
c
h
-
u
s
e-of-sed-on-incomplete
.
.
.
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge bra
n
ch
'tb/bla
m
e
-
resur
r
ect-convert-to-git' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge branch 'jn/c
l
ean-use-error-not
-
f
p
rintf-on-st
d
err
.
.
.
commit
|
commitdiff
|
tree
2015-05-06
J
u
nio C
H
amano
M
e
rge branch 'jc/daem
o
n-no-ipv6-f
o
r-2
.
4
.
1' into next
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
M
e
rge bran
c
h
'jc/t
e
st
-
p
rereq-validate' into next
commit
|
commitdiff
|
tree
2015-05-06
Junio
C
Hamano
M
erge branch 'bc/connect-plink' into next
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge bran
c
h
'jk/test-cha
i
n-lint'
i
nto next
commit
|
commitdiff
|
tree
2015-05-06
J
u
nio C
Hamano
Merge branch 'va/fix-git
-
p4-te
s
ts' i
n
to next
commit
|
commitdiff
|
tree
2015-05-06
J
u
nio C
Hama
n
o
Me
r
ge
b
r
a
nch 'ld/p4-case-fo
l
d' into next
commit
|
commitdiff
|
tree
2015-05-06
J
u
n
io C Hamano
Merge br
a
nc
h
'jk/rebas
e
-
quiet-noop
'
in
t
o next
commit
|
commitdiff
|
tree
2015-05-06
J
unio C Hamano
Mer
g
e b
r
anch
'
f
g/document
-
co
m
mit-message-strippin
g
.
.
.
commit
|
commitdiff
|
tree
2015-05-06
Junio
C
Haman
o
M
e
rge branch '
j
k
/s
t
ash-require-
c
lean-index' into next
commit
|
commitdiff
|
tree
2015-05-06
Junio
C Hamano
Merge bra
n
ch '
j
k/gi
t
-no
-
mor
e
-
a
rgv0-path-munging' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Mer
g
e
branch 'jc/gitignore-prece
d
enc
e
'
into next
commit
|
commitdiff
|
tree
2015-05-06
J
u
n
i
o C Hamano
Mer
g
e
bra
n
c
h
'tb/t
0
027-crl
f
'
into
ne
x
t
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merg
e
branch 'va/p4-client
-
path' into next
commit
|
commitdiff
|
tree
2015-05-06
J
u
nio C Hamano
Merge br
a
n
c
h
'
mm/add-p-split-error
'
into next
commit
|
commitdiff
|
tree
2015-05-06
Junio
C
H
amano
M
erge
branch
'l
s
/p4-ch
a
nges-block-size' in
t
o next
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge branch 'jc/pl
u
g-fmt-merge-msg-leak' into next
commit
|
commitdiff
|
tree
2015-05-06
Ju
n
io
C
H
amano
Merge branch
'
nd
/
s
l
im
-
index-pack-
m
emory-us
a
g
e
' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-06
Ju
n
i
o
C
Haman
o
Merge branch 'j
k
/still-
i
ntere
s
ting' into next
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
M
e
rge branch 'jk/r
e
a
d
i
n
g
-pac
k
ed-r
e
fs' int
o
n
e
xt
commit
|
commitdiff
|
tree
2015-05-06
Juni
o
C Hamano
Merge branch 'l
m
/squelch-bg
-
progress' i
n
t
o
next
commit
|
commitdiff
|
tree
2015-05-06
J
unio C
H
amano
Merge b
r
anch 'jk
/
sha1-fi
l
e-r
e
du
c
e-useless-wa
r
nings
.
.
.
commit
|
commitdiff
|
tree
2015-05-06
J
u
nio C Hamano
Merge branch 'nd/
m
ultiple-work-trees' into
next
commit
|
commitdiff
|
tree
2015-05-06
J
u
n
io C Hamano
Merge branch 'nd/
d
iff
-
i-t-a' into next
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merg
e
branch 'pt/cred
e
ntial-xdg' into next
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
First batch
f
or 2
.
5
cycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge branch 'jk
/
pru
n
e-mtime'
commit
|
commitdiff
|
tree
2015-05-06
J
unio C H
a
m
ano
M
e
r
ge bra
n
ch 'mm/u
s
ag
e
-lo
g
-l-ca
n
-tak
e
-
regex'
commit
|
commitdiff
|
tree
2015-05-06
Junio
C
Hama
n
o
Merge
b
ranch 'ep/fi
x
-
t
est
-
lib-functions-report'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Haman
o
Merge br
a
nch 'c
n
/bom-in-gitign
o
re'
commit
|
commitdiff
|
tree
2015-05-06
Ju
n
io
C
Hamano
M
erge b
r
anch
'jc/epochtim
e
-
wo-tz'
commit
|
commitdiff
|
tree
2015-05-06
Juni
o
C Hamano
Merge bra
n
ch
'nd/t15
0
9-chroot-test'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merg
e
branch
'
oh/f
i
x-config-de
f
ault-user
-
na
m
e-sectio
n
'
commit
|
commitdiff
|
tree
2015-05-06
Jun
i
o C
H
amano
Merge
b
ranch 'jk/type-from-string-gently'
commit
|
commitdiff
|
tree
2015-05-06
Junio
C
Haman
o
Merge branc
h
'
s
b/tes
t
-b
i
tma
p
-fre
e
-
a
t-end'
commit
|
commitdiff
|
tree
2015-05-06
Juni
o
C Hamano
Merge branch 'ld/p4-fil
e
t
y
pe-detect
i
on'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hama
n
o
Merge bra
n
ch
'
ts/checkout-ad
v
ice-plural'
commit
|
commitdiff
|
tree
2015-05-06
Junio
C Hamano
Merge branch 'jk/
i
n
it-core
-
worktree-at-r
o
ot'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Haman
o
Merg
e
branch 'mh/show-branch-top
i
c'
commit
|
commitdiff
|
tree
2015-05-06
Junio C H
a
m
a
no
Me
r
ge bra
n
ch
's
b
/
l
i
ne-log-plug-pairdiff
-
leak'
commit
|
commitdiff
|
tree
2015-05-06
Juni
o
C Ham
a
no
Merge branch 'jc/diff-n
o
-index-d-f'
commit
|
commitdiff
|
tree
2015-05-06
Jun
i
o
C Hamano
Merge
b
ranch 'bc/obj
e
ct-id'
commit
|
commitdiff
|
tree
2015-05-05
Jun
i
o C
H
amano
daemon: unbre
a
k NO_IPV6 b
u
ild regr
e
s
s
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-30
J
u
nio C Hamano
Git 2
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C
Hamano
merge:
depre
c
a
t
e 'git
m
er
g
e <m
e
ssage> HEAD <commit
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
J
un
i
o
C
Hamano
merg
e
: handle
F
ETC
H
_HEAD internally
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
m
e
rge: deci
d
e if we auto-g
e
nerate the message early
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
J
u
nio C Hamano
merge:
make c
o
llect
_
pare
n
ts() au
t
o-generate the m
e
rge
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C
Hamano
merg
e
: extrac
t
prepare
_
merge_messag
e
() l
o
gic out
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
J
u
nio C Ha
m
ano
mer
g
e: narrow
scope of
m
e
r
g
e
_names
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C Hamano
merge: spl
i
t
reduce
_
parent
s
() out o
f
collect_parents(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C
Ham
a
no
m
e
rge: clarify collect_p
a
r
e
nt
s
() logic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
J
uni
o
C Hama
n
o
mer
g
e: small leakfix and code simplifi
c
ation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge:
do not
c
hec
k
argc to det
e
rmin
e
number of remo
t
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Ju
n
i
o C Hamano
merg
e
: clar
i
f
y "
p
ulling into vo
i
d" special ca
s
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
t5520: test pulling
a
n octopus int
o
a
n
unbo
r
n branch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C
Hamano
t
5
5
20: style f
i
xes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
m
erge: simplify code flow
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: tes
t
the top-
l
evel mer
g
e
driver
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-28
Junio C
Hamano
test
:
validat
e
prere
q
u
i
s
tes
syn
t
ax
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-28
Junio C Haman
o
Merge branch
'
mh/
m
ultimail-renewal'
commit
|
commitdiff
|
tree
2015-04-28
Ju
n
io
C
H
ama
n
o
Merge branch 'mg/show-note
s
-doc'
commit
|
commitdiff
|
tree
2015-04-28
Ju
n
i
o C Hamano
Me
r
ge branch 'nd/ver
s
ioncmp-prer
e
leases'
commit
|
commitdiff
|
tree
2015-04-28
Junio
C Ha
m
ano
Merge branch
'
mg/sta
t
u
s
-
v-v'
commit
|
commitdiff
|
tree
2015-04-27
J
unio C Hamano
Sync with
2
.
3
.
7
commit
|
commitdiff
|
tree
2015-04-27
Junio C Hamano
Git 2
.
3
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-27
J
unio C
H
am
a
n
o
Merge bran
c
h
'tb/connec
t
-ipv6-parse-f
i
x' i
n
to maint
commit
|
commitdiff
|
tree
2015-04-27
Junio C Ha
m
an
o
Merge branch 'ma/bas
h
-comp
l
e
tion-
l
eaking-x' into
m
aint
commit
|
commitdiff
|
tree
2015-04-27
Junio C Hamano
Merge branch 'jc/push-cert' into mai
n
t
commit
|
commitdiff
|
tree
2015-04-22
Junio C Hamano
i
g
n
o
re: info/exclude
should trump co
r
e
.
ex
c
ludesf
i
le
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-22
J
u
nio C Ha
m
an
o
Git 2
.
4
.
0-rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-21
Jun
i
o
C
Hamano
Sync with ma
i
nt
commit
|
commitdiff
|
tree
2015-04-21
J
unio C Hamano
Git 2
.
3
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hamano
Merge branch 'jk/colors' into maint
commit
|
commitdiff
|
tree
2015-04-21
Ju
n
io C Hamano
Merge branch 'jk/test-anno
y
ances'
int
o
maint
commit
|
commitdiff
|
tree
2015-04-21
Junio
C H
a
mano
Merge branch 'pt/ent
e
r
-repo-comment-fix
'
into maint
commit
|
commitdiff
|
tree
2015-04-21
J
unio C Hamano
Merge br
a
nc
h
'jz
/
gitw
e
b-co
n
f-doc-fix' into ma
i
nt
commit
|
commitdiff
|
tree
2015-04-21
Ju
n
io C Hamano
Merge branch 'jk/cher
r
y-p
i
ck
-
docfix' into maint
commit
|
commitdiff
|
tree
2015-04-21
J
unio C Hamano
Merge b
r
anch
'
iu/fix-parse-options-h-comme
n
t
'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2015-04-21
J
un
i
o C
Hamano
Mer
g
e bra
n
ch 'jg
/
cg
u
ide-we-cannot-c
o
unt' i
n
t
o main
t
commit
|
commitdiff
|
tree
2015-04-21
Junio
C
H
a
mano
Merge b
r
anch 'jk/pack-corrupti
o
n-post-mor
t
e
m' into
.
.
.
commit
|
commitdiff
|
tree
2015-04-21
Ju
n
io C Ham
a
n
o
Merge br
a
nch 'j
n
/
d
o
c-fast-impor
t
-
n
o-16-octo
p
us-limit
.
.
.
commit
|
commitdiff
|
tree
2015-04-21
J
unio C
H
a
m
ano
R
elNote
s
: "merge --qui
e
t" chan
g
e has been reverted
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-20
Junio C
Ham
a
n
o
Hopefully the last batch for 2
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-20
Juni
o
C H
a
mano
Merge branch 'ps/
g
rep-help-all-
c
al
l
back
-
arg'
commit
|
commitdiff
|
tree
2015-04-20
Ju
n
io C Hamano
Merge
b
r
a
n
c
h
'tb/conne
c
t-i
p
v6
-
parse-fix'
commit
|
commitdiff
|
tree
2015-04-20
Junio C Hamano
Merge
b
r
anch '
v
a
/
fix-git-p4-tests'
commit
|
commitdiff
|
tree
2015-04-20
Junio C Hamano
M
e
rge branch 'jc/push-cert'
commit
|
commitdiff
|
tree
2015-04-20
Junio C
H
ama
n
o
Merg
e
branch 'm
a
/bash
-
co
m
pleti
o
n-
l
eak
i
ng-x'
commit
|
commitdiff
|
tree
2015-04-20
Ju
n
io C Hamano
fmt
-
merge
-
msg: plug small leak of commit
b
uffer
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-19
Junio C Hamano
Merge tag 'gitgui-0
.
20
.
0' of h
t
tp:
/
/r
e
po
.
or
.
cz/r/
g
it-g
u
i
commit
|
commitdiff
|
tree
2015-04-16
Junio C Ha
m
ano
at
t
r: s
k
ip UTF8 BOM at t
h
e beginning of
t
he i
n
put file
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-16
Junio C
Haman
o
config: use u
t
f8_bom[] from u
t
f
.
[ch] in git_parse_source()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next