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 'dt/clean-pathspec-filter-then-lstat'
2015-05-11
Junio C Ha
m
an
o
Merge branch '
j
k/reading-
p
a
cked-refs'
commit
|
commitdiff
|
tree
2015-05-11
Junio
C
Hamano
Mer
g
e branch 'lm/squelch-bg
-
progress'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Haman
o
M
e
r
ge
b
ra
n
ch 'jk/sha1-
f
ile-
r
educ
e
-usele
s
s-war
n
ings'
commit
|
commitdiff
|
tree
2015-05-11
Junio
C
Haman
o
Merge b
r
anch 'nd/m
u
lt
i
ple-work-tr
e
es'
commit
|
commitdiff
|
tree
2015-05-11
Ju
n
io C Hamano
Mer
g
e branch 'pt
/
credential-xdg
'
commit
|
commitdiff
|
tree
2015-05-07
Ju
n
io C
Hamano
tests:
skip dav http-p
u
sh t
e
sts under NO_EXPAT
=
NoThanks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-06
Junio C Haman
o
F
i
rst batc
h
for 2
.
5 cycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-06
Junio C Haman
o
Me
r
ge branch 'jk/prune-mtime'
commit
|
commitdiff
|
tree
2015-05-06
Jun
i
o C
Haman
o
Merge branch '
m
m/usage-log-l-can-take-
r
egex'
commit
|
commitdiff
|
tree
2015-05-06
J
u
nio C Hamano
Merge branch '
e
p/fix
-
test-lib-fun
c
tion
s
-
r
eport'
commit
|
commitdiff
|
tree
2015-05-06
Jun
i
o C Hamano
Me
r
ge
b
ranc
h
'
c
n/bom
-
in-gitignore'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge
b
ranch 'jc/epochtime-wo-tz'
commit
|
commitdiff
|
tree
2015-05-06
Junio
C Hamano
Merge b
r
anch 'nd
/
t150
9
-chroo
t
-test'
commit
|
commitdiff
|
tree
2015-05-06
Juni
o
C Ha
m
ano
Merge branch
'oh/fi
x
-co
n
fig-default-user-name-
s
ecti
o
n'
commit
|
commitdiff
|
tree
2015-05-06
Juni
o
C Hamano
M
erge branch '
j
k/type-from-string-gently
'
commit
|
commitdiff
|
tree
2015-05-06
Juni
o
C Hamano
Merge branch
'sb/test-bitmap-free-at-end'
commit
|
commitdiff
|
tree
2015-05-06
Juni
o
C Hamano
Merge branch 'ld/p4-
f
i
le
t
ype-det
e
ction
'
commit
|
commitdiff
|
tree
2015-05-06
Juni
o
C Hamano
Merge bra
n
ch 'ts/checkout-advice-plu
r
a
l
'
commit
|
commitdiff
|
tree
2015-05-06
J
u
nio C Ham
a
no
Merge
b
r
anch 'jk/in
i
t
-cor
e
-workt
r
ee-
a
t-root'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hama
n
o
Merge branch 'mh/show-branch-topic'
commit
|
commitdiff
|
tree
2015-05-06
Jun
i
o C Hamano
M
erge branch 'sb/line-l
o
g-plug-pairdif
f
-
l
eak'
commit
|
commitdiff
|
tree
2015-05-06
Junio
C
Hamano
Merge
bran
c
h 'jc/diff
-
no-index
-
d-f'
commit
|
commitdiff
|
tree
2015-05-06
Ju
n
io C Hama
n
o
Mer
g
e branch
'
b
c
/obje
c
t-id
'
commit
|
commitdiff
|
tree
2015-05-05
Junio C Hama
n
o
d
aemon: u
n
break NO
_
IPV6
b
uild r
e
gression
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-05
Junio C Hamano
wri
t
e_sha1_
f
ile(): do no
t
u
se a
s
eparate sha1[] array
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-30
J
unio C Haman
o
Git 2
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Jun
i
o C Ha
m
ano
merge: deprecate 'git merg
e
<m
e
ssage> HEAD
<
c
o
m
mit
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge:
h
andle
FET
C
H_HEAD i
n
tern
a
lly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
me
r
ge: dec
i
de if we auto-gen
e
r
at
e
the m
e
ssage ear
l
y
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C
Ham
a
no
m
e
rge: make collect_parent
s
() a
u
t
o-generate the
merge
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Ju
n
i
o C Ham
a
n
o
me
r
g
e
: ex
t
r
act pre
p
are_merge_message() logic
o
ut
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Juni
o
C
H
amano
merge: narrow sc
o
pe
o
f
m
erg
e
_names
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
J
u
nio C
H
am
a
n
o
merge: split reduce_parents() out of collect_parent
s
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C H
a
m
ano
me
r
ge: clarify collect_p
a
ren
t
s() logic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
J
un
i
o C Ha
m
ano
mer
g
e: sma
l
l
l
eakfix and co
d
e simplif
i
cation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
J
unio
C
Hamano
merge: do not check arg
c
to de
t
e
r
m
i
ne number
of remote
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
J
u
nio C Hamano
merge
:
cl
a
rify "pulling i
n
t
o
v
o
id" special case
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
J
unio
C Haman
o
t5520: test
pulling an oc
t
opus
i
nto an un
b
orn branch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
t
5
520: style fixes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Ju
n
i
o
C Hamano
m
e
rge: si
m
p
l
ify code flow
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: te
s
t the
t
op-
l
ev
e
l
me
r
g
e driv
e
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-28
J
u
nio C Hamano
test
:
validate prerequistes syntax
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-28
Junio C Haman
o
Merge bra
n
ch 'mh/
m
ultimail-rene
w
al'
commit
|
commitdiff
|
tree
2015-04-28
J
u
nio C Hamano
Mer
g
e br
a
nch 'mg
/
show
-
notes-doc'
commit
|
commitdiff
|
tree
2015-04-28
Junio C Hama
n
o
M
erge branch 'nd/v
e
r
s
io
n
cmp-prereleases'
commit
|
commitdiff
|
tree
2015-04-28
Junio C Hamano
M
e
rge branch
'mg/
s
tatus-v-v'
commit
|
commitdiff
|
tree
2015-04-27
Jun
i
o C
H
amano
Sync
w
i
th 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
Junio C Haman
o
Merge branc
h
'
t
b/
c
onnect
-
ipv6-pars
e
-fix' into maint
commit
|
commitdiff
|
tree
2015-04-27
Junio C
Hamano
Me
r
ge branch
'ma/b
a
sh-co
m
p
l
e
tion-leaking-x' into main
t
commit
|
commitdiff
|
tree
2015-04-27
Junio C Ham
a
no
Merge branch
'
jc/push-
c
ert' in
t
o
m
ain
t
commit
|
commitdiff
|
tree
2015-04-22
Junio C Haman
o
ignor
e
: info/exclu
d
e sho
u
ld t
r
ump core
.
excludes
f
ile
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-22
Junio C H
a
ma
n
o
Git 2
.
4
.
0
-rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-21
Junio
C Hamano
Sync with maint
commit
|
commitdiff
|
tree
2015-04-21
J
u
nio C Hamano
Git 2
.
3
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hamano
Me
r
ge branch
'jk/color
s
' into maint
commit
|
commitdiff
|
tree
2015-04-21
Junio C Haman
o
M
e
rg
e
branch 'jk/te
s
t-annoyances' into maint
commit
|
commitdiff
|
tree
2015-04-21
Junio C Ha
m
ano
Merge br
a
nch 'pt
/
e
n
t
er
-
r
e
po-co
m
ment-fix' into mai
n
t
commit
|
commitdiff
|
tree
2015-04-21
Junio
C
Hamano
Merge branch 'jz/gitweb-conf-doc-fix' into maint
commit
|
commitdiff
|
tree
2015-04-21
Junio C Ha
m
an
o
Merge
br
a
n
ch 'jk/cherry-pick-docf
i
x
' into m
a
int
commit
|
commitdiff
|
tree
2015-04-21
Juni
o
C Hamano
M
erge branch 'iu/
f
i
x
-pars
e
-option
s
-h-comme
n
t
'
i
n
to
.
.
.
commit
|
commitdiff
|
tree
2015-04-21
J
u
nio C Hama
n
o
Merge branch 'jg/
c
guide-we-
c
a
nnot-count' into maint
commit
|
commitdiff
|
tree
2015-04-21
J
unio C Hamano
Me
r
ge branch '
j
k/pack-corruption
-
po
s
t
-mortem
'
int
o
.
.
.
commit
|
commitdiff
|
tree
2015-04-21
J
u
ni
o
C Hamano
M
e
rge b
r
a
nch 'jn/doc-f
a
s
t-import-no-16-octopus-l
i
mi
t
.
.
.
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hamano
Rel
N
otes: "merge --quiet" change
h
as been
reve
r
ted
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-20
Junio C Hamano
Hopefull
y
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
m
a
no
Merg
e
b
r
anch 'ps/grep-he
l
p-all-callback-a
r
g'
commit
|
commitdiff
|
tree
2015-04-20
Junio
C
Hamano
Merge branch 'tb/connect-ipv6-parse-fix'
commit
|
commitdiff
|
tree
2015-04-20
Junio C Hamano
Merge branch 'va/f
i
x-git-p4-t
e
sts'
commit
|
commitdiff
|
tree
2015-04-20
J
unio C
H
amano
Merge branch 'jc/push-cer
t
'
commit
|
commitdiff
|
tree
2015-04-20
Ju
n
io C Hamano
M
e
rge branch '
m
a/
b
a
sh-completio
n
-leaki
n
g-
x
'
commit
|
commitdiff
|
tree
2015-04-20
Junio C
H
a
m
ano
fmt-merge-msg: plug small lea
k
of commit
buff
e
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-19
Junio
C
Hamano
Merge tag 'gitg
u
i
-0
.
20
.
0' of http:
/
/repo
.
o
r
.
cz/r/git-gui
commit
|
commitdiff
|
tree
2015-04-16
Junio C Hama
n
o
a
ttr: skip UTF8 BOM at the b
e
gin
n
ing of the inp
u
t fil
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-16
Junio C Hamano
config
:
use utf8_b
o
m
[
] from utf
.
[ch] in git_p
a
rse
_
source()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-16
Junio C
H
amano
utf8-bom
:
introd
u
ce s
k
ip_u
t
f8_bom(
)
helper
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-16
Jun
i
o C Hamano
add_excludes_
f
rom
_
file
:
clari
f
y the bom skipping logic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-16
Junio
C
Hamano
Rever
t
"merge: pass verb
o
sity fla
g
down to
m
erge-recursi
v
e
"
commit
|
commitdiff
|
tree
2015-04-15
Junio C Hamano
pa
r
s
e
_
date_basic()
:
let
t
he s
y
stem handle DST conversi
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-15
Junio C Ham
a
n
o
p
arse_d
a
t
e_basic
(
): return early w
h
en gi
v
e
n a bogus
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-14
Juni
o
C Hamano
Git 2
.
4
.
0-rc
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-14
Ju
n
i
o C Hamano
Merge bra
n
ch 'jk
/
colors'
commit
|
commitdiff
|
tree
2015-04-14
Jun
i
o C
Hamano
Merge bran
c
h 'jk/merge-quiet'
commit
|
commitdiff
|
tree
2015-04-14
Junio C
Hamano
Merge
branch 'jk
/
p
ack-co
r
r
u
ptio
n
-post-m
o
r
t
em'
commit
|
commitdiff
|
tree
2015-04-14
J
u
n
io C H
a
mano
Merge branch 'jc/u
p
date-instead-into-void
'
commit
|
commitdiff
|
tree
2015-04-14
Junio C Ham
a
no
Me
r
ge
b
ranch 'sb/plug
-
st
r
eaming-l
e
a
k
'
commit
|
commitdiff
|
tree
2015-04-14
Junio C Hamano
Merge branch 'jn/doc-fast-impo
r
t-no-16-octopus-limit'
commit
|
commitdiff
|
tree
2015-04-14
J
unio C
Hamano
M
erge branch '
s
b/plu
g
-wt-shortstatus-tracking-le
a
k'
commit
|
commitdiff
|
tree
2015-04-14
Junio C Hama
n
o
Merge
b
ranch
'pt/ente
r
-rep
o
-commen
t
-fix'
commit
|
commitdiff
|
tree
2015-04-14
Junio C Hamano
M
e
rge branch 'jz/g
i
twe
b
-c
o
n
f
-doc-f
i
x
'
commit
|
commitdiff
|
tree
2015-04-14
Juni
o
C Hamano
M
e
rge branch
'jk/cherry-pick-docfi
x
'
commit
|
commitdiff
|
tree
2015-04-14
Junio C Haman
o
Merge bra
n
c
h
'iu/fix-p
a
rse-options
-
h
-c
o
m
m
ent'
commit
|
commitdiff
|
tree
2015-04-14
Junio C Ha
m
a
no
Me
r
ge b
r
anch 'jg/
c
gui
d
e-
w
e-can
n
ot-c
o
unt'
commit
|
commitdiff
|
tree
2015-04-09
Junio C Hamano
Merge tag 'l10n-2
.
4
.
0-rn
d
2
'
of
git://git
h
ub
.
c
o
m/git
.
.
.
commit
|
commitdiff
|
tree
2015-04-02
Junio C
Hamano
Git
2
.
4
.
0-rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-02
J
u
n
i
o C
H
a
m
ano
M
e
rge branch 'sb/atomic
-
push'
commit
|
commitdiff
|
tree
2015-04-02
Jun
i
o C
Ha
m
ano
push --signed:
t
ig
h
ten wh
a
t the re
c
eivin
g
end can ask
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-02
J
u
ni
o
C Hamano
push-to-deploy: a
l
low pushing into an unborn branch
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-31
Ju
n
io C Ha
m
ano
S
y
nc with 2
.
3
.
5
commit
|
commitdiff
|
tree
2015-03-31
Juni
o
C Hamano
Git 2
.
3
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next