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-omit-credential-helpers'
2015-05-22
Junio C Hamano
Merge branch 'sg/com
p
letion-omit
-
cr
e
d
en
t
ial-h
e
l
p
ers'
commit
|
commitdiff
|
tree
2015-05-22
Jun
i
o C Haman
o
Merge branch 'dl/branch-error-me
s
sa
g
e'
commit
|
commitdiff
|
tree
2015-05-19
J
u
ni
o
C Hama
n
o
Third batch for
2
.
5 cy
c
l
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-19
Junio C
H
amano
Merge br
a
nc
h
'sb/
r
ef-lock-l
o
se-lock-fd'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Haman
o
M
e
rge branch 'kn/cat-file-literally'
commit
|
commitdiff
|
tree
2015-05-19
J
u
n
io C Haman
o
Merge branch 'nd/
d
wim-w
i
l
d
c
ar
d
s-as-
p
a
thsp
e
cs'
commit
|
commitdiff
|
tree
2015-05-19
J
unio C Hama
n
o
Merge b
r
anch 'jc/m
e
rge'
commit
|
commitdiff
|
tree
2015-05-19
J
u
n
i
o
C
Ha
m
ano
M
e
rge
branch '
p
h/reb
a
se-i-redo'
commit
|
commitdiff
|
tree
2015-05-19
J
unio C
H
a
mano
M
erg
e
branch 'jc/t
e
st
-
p
rereq-validate'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
M
e
rge branch '
b
c/connect-
p
li
n
k
'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Haman
o
Merge
branc
h
'
j
k/test-
c
ha
i
n-lint'
commit
|
commitdiff
|
tree
2015-05-19
Junio
C Hamano
Merge branch 'fg/d
o
cument-commit
-
message-stripping'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
Merge branch 'jk/sta
s
h
-
require-cl
e
an-index'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
M
erge bran
c
h 'jk/git-no-more
-
argv0-pa
t
h-mung
i
ng'
commit
|
commitdiff
|
tree
2015-05-19
J
u
nio C Hamano
M
erge b
r
anch 'jc/gitignore-prece
d
e
nce'
commit
|
commitdiff
|
tree
2015-05-19
Jun
i
o C Hamano
Merge branch 'nd/diff-
i
-t-a'
commit
|
commitdiff
|
tree
2015-05-13
Ju
n
i
o C Hamano
S
y
nc with 2
.
4
.
1
commit
|
commitdiff
|
tree
2015-05-13
Jun
i
o C Hamano
Git 2
.
4
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-13
Junio C Ham
a
no
Merge branch
'sb/line-log-plug-paird
i
ff-leak' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2015-05-13
J
un
i
o C Hamano
Merge branch 'sb
/
test-bitmap
-
f
r
ee-at-en
d
' into maint
commit
|
commitdiff
|
tree
2015-05-13
J
un
i
o C Hamano
Merg
e
branch 'nd/t150
9
-
c
hro
o
t-tes
t
'
into maint
commit
|
commitdiff
|
tree
2015-05-13
J
un
i
o C
H
ama
n
o
Me
r
ge
b
ranch '
j
k/
t
ype-from-string-gently' into ma
i
nt
commit
|
commitdiff
|
tree
2015-05-13
Ju
n
io C Hamano
Mer
g
e
branch
'
ep/fix-test-lib-functi
o
ns-report' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-13
Junio
C
Haman
o
Mer
g
e b
r
a
nch 'cn/bom-in-gitignore'
into
maint
commit
|
commitdiff
|
tree
2015-05-13
Junio
C
Ha
m
ano
Merge branch 'j
k
/prune-mt
i
me' in
t
o m
a
i
n
t
commit
|
commitdiff
|
tree
2015-05-13
Junio C Ha
m
ano
M
erge bran
c
h
'
j
k/init-core-workt
r
e
e
-at-root' i
n
to maint
commit
|
commitdiff
|
tree
2015-05-11
J
u
nio C Hama
n
o
M
e
rge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Sync
with 2
.
3
.
8
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-11
J
u
nio C Hamano
Git 2
.
3
.
8
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-11
Jun
i
o C Hamano
M
erge branch 'mm/usage-log-l-c
a
n-
t
ak
e
-regex' in
t
o maint-2
.
3
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge
br
a
n
ch 'jc/d
i
ff
-
n
o
-inde
x
-d-f
'
i
nto ma
i
n
t-2
.
3
commit
|
commitdiff
|
tree
2015-05-11
Junio C
Hama
n
o
Merg
e
b
r
a
n
ch '
o
h/fix-
c
o
n
fi
g
-defa
u
l
t
-us
e
r-name-
s
ection
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge b
r
a
nch 'jc/ep
o
chtime-wo-t
z
' into
m
ai
n
t-2
.
3
commit
|
commitdiff
|
tree
2015-05-11
Jun
i
o
C Hamano
Second
batch for 2
.
5
c
ycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-11
Ju
n
io C Hamano
M
erg
e
br
a
n
c
h 'p
t
/xdg-confi
g
-path'
commit
|
commitdiff
|
tree
2015-05-11
J
unio C Hamano
Mer
g
e branch 'ep/do-not-feed-a-p
o
inter-to-array-size'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Haman
o
Merge branch 'jc/
h
ash
-
o
b
ject'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge branch
'
sb/prefix-pat
h
-free-resul
t
s'
commit
|
commitdiff
|
tree
2015-05-11
J
unio C Hamano
M
e
rge branch 'sg/com
p
letion-no-re
d
u
ndant-
a
ll
-
comman
d
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
J
u
nio C
Hamano
Merge branch 'sg/complete-de
c
or
a
te-full-no
t
-l
o
ng'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge branch 'jk/filter
-
branch-u
s
e-of
-
se
d
-
on-incomplete
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Junio C
H
am
a
no
Merge b
r
anch 'jc/daemon-no-ipv
6
-fo
r
-2
.
4
.
1'
commit
|
commitdiff
|
tree
2015-05-11
Juni
o
C Hamano
Me
r
ge branch 'jn/cle
a
n-use-error-not-fprintf-
o
n-stderr'
commit
|
commitdiff
|
tree
2015-05-11
J
u
nio C H
a
m
an
o
Merge branch
'
tb/blame-res
u
rrect-conv
e
rt-to-git'
commit
|
commitdiff
|
tree
2015-05-11
Junio
C
Hamano
Merge bra
n
c
h
'va/fix-g
i
t
-p4-te
s
ts'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Haman
o
Mer
g
e b
r
a
n
ch '
l
d/
p
4-case-fold'
commit
|
commitdiff
|
tree
2015-05-11
Junio C
H
amano
M
erge branch
'
jk/rebase
-
quiet-noop'
commit
|
commitdiff
|
tree
2015-05-11
Junio C
H
amano
Merg
e
b
ran
c
h
'
v
a/p
4
-client-pat
h
'
commit
|
commitdiff
|
tree
2015-05-11
Junio C H
a
mano
Merge branch '
m
m/add-
p
-
split
-
error'
commit
|
commitdiff
|
tree
2015-05-11
J
u
ni
o
C Hamano
M
e
r
ge branch 'tb/t0027-cr
l
f'
commit
|
commitdiff
|
tree
2015-05-11
Junio C
Ham
a
no
Merge branch 'ls/
p
4-cha
n
ges-bloc
k
-size'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Me
r
ge bran
c
h '
j
c/plug-fmt-merge-msg
-
l
eak'
commit
|
commitdiff
|
tree
2015-05-11
Junio C
H
a
mano
Merg
e
branch 'nd/
s
lim-i
n
d
ex-p
a
ck-memory-usage
'
commit
|
commitdiff
|
tree
2015-05-11
Junio
C
Hamano
Merge branch 'jk/st
i
ll-interesting'
commit
|
commitdiff
|
tree
2015-05-11
Junio
C H
a
man
o
Mer
g
e b
r
anch 'jk/reading-packed-refs'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hama
n
o
Mer
g
e branch 'lm/sq
u
elch-bg-progre
s
s'
commit
|
commitdiff
|
tree
2015-05-11
Junio
C Hamano
M
erge branc
h
'jk/sha
1
-file
-
r
educ
e
-useless-w
a
rnings
'
commit
|
commitdiff
|
tree
2015-05-11
Junio
C
Hamano
Mer
g
e branch '
n
d/multi
p
le-work-tre
e
s'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Ham
a
n
o
Merge branch 'pt/credenti
a
l-xdg'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
First batch f
o
r 2
.
5 cycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge bra
n
ch 'jk/prune-mti
m
e'
commit
|
commitdiff
|
tree
2015-05-06
J
u
n
i
o
C Hamano
Merge branch 'mm/usage-log-l-can-ta
k
e
-r
e
g
ex'
commit
|
commitdiff
|
tree
2015-05-06
J
u
nio C Hamano
Merg
e
br
a
nch 'ep/fix-test-lib-funct
i
ons-report'
commit
|
commitdiff
|
tree
2015-05-06
Junio C H
a
mano
Mer
g
e branch
'
c
n/
b
om-in-gitignore'
commit
|
commitdiff
|
tree
2015-05-06
Ju
n
io C H
a
mano
Mer
g
e br
a
nch
'
j
c/epochtime-wo-
t
z'
commit
|
commitdiff
|
tree
2015-05-06
J
unio
C H
a
mano
Merge
b
ran
c
h '
n
d/t150
9
-
c
h
r
oot-tes
t
'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hama
n
o
M
er
g
e bran
c
h 'oh/
f
ix-config-de
f
ault-user
-
name-section'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge branch '
j
k/ty
p
e
-
f
r
o
m-string-gently'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Ha
m
ano
Merge branc
h
'sb/test-b
i
tma
p
-fr
e
e-at-end'
commit
|
commitdiff
|
tree
2015-05-06
J
u
nio C Hama
n
o
Mer
g
e branch 'ld/p4-filetype-detection'
commit
|
commitdiff
|
tree
2015-05-06
Junio C
Hamano
Mer
g
e b
r
anch 'ts/che
c
kout-adv
i
ce-plu
r
al'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge b
r
an
c
h
'jk
/
init-core-work
t
r
ee-a
t
-root'
commit
|
commitdiff
|
tree
2015-05-06
Junio C
H
am
a
no
Merge branch 'mh/show-branch-topic'
commit
|
commitdiff
|
tree
2015-05-06
J
u
nio
C
Hamano
Mer
g
e bran
c
h
'
s
b/line-log-plug-pairdif
f
-leak'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Ha
m
ano
Merge branch 'jc/diff-no-ind
e
x
-
d
-f'
commit
|
commitdiff
|
tree
2015-05-06
J
u
nio C Hamano
Merge branch 'bc/object-id'
commit
|
commitdiff
|
tree
2015-05-05
Junio
C Hamano
d
a
e
mon: un
b
re
a
k NO_IPV6 build regre
s
sion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-05
J
unio C
Ham
a
no
write
_
sha1_file
(
)
:
do not use a separate sha
1
[] array
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-30
J
unio C Ha
m
ano
Git 2
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Ha
m
ano
m
e
rge: deprec
a
te 'g
i
t mer
g
e <m
e
ss
a
ge> HEAD
<
commit
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C H
a
m
ano
merge: handle FETCH_HEAD intern
a
lly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Juni
o
C Hamano
m
erge:
d
eci
d
e if we a
u
to-generate the mes
s
age
early
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
J
unio C H
a
mano
mer
g
e: make
collect
_
par
e
nts
(
) auto-generate the merge
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hama
n
o
merge: extract prepare_mer
g
e_message(
)
l
ogic
o
ut
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hama
n
o
me
r
ge: narrow scope of merge_names
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Jun
i
o
C Haman
o
m
e
rge: split reduc
e
_pa
r
ents() out o
f
collect_pa
r
ent
s
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Juni
o
C Hamano
merge
:
clarify co
l
le
c
t_par
e
nt
s
() logic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Juni
o
C Hamano
mer
g
e: small
l
e
akfix an
d
c
ode s
i
mplif
i
cation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Ju
n
io C Hamano
merge:
do n
o
t check argc to determine number of rem
o
t
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Juni
o
C Hamano
merge:
c
larify "pulling into void"
s
p
ecial
case
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C Hamano
t5520:
test pulling
a
n octopus into a
n
unborn b
r
anch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
J
u
nio C
H
am
a
n
o
t5
5
20: style
f
ixes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
m
erge: simpl
i
f
y code flow
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C
H
amano
m
e
rge: test
the t
o
p-level me
r
ge
dr
i
ver
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-28
Juni
o
C Hamano
te
s
t: v
a
lidate prerequist
e
s syn
t
ax
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-28
Junio C Hamano
M
e
rge br
a
nch 'mh/multi
m
ail
-
re
n
ewal'
commit
|
commitdiff
|
tree
2015-04-28
Junio
C
Hamano
Merge bran
c
h 'mg/sh
o
w-not
e
s-doc'
commit
|
commitdiff
|
tree
2015-04-28
Junio
C
Hamano
M
erge
branch
'
n
d
/
v
e
rs
i
oncmp-prereleases'
commit
|
commitdiff
|
tree
2015-04-28
J
unio C
Hamano
M
erge branch 'mg/status-v
-
v'
commit
|
commitdiff
|
tree
2015-04-27
Junio
C Hamano
S
ync wit
h
2
.
3
.
7
commit
|
commitdiff
|
tree
next