repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'dl/subtree-push-no-squash'
2015-05-22
Juni
o
C
H
amano
Merge b
r
anc
h
'
d
l/subtree-pus
h
-
n
o-squash'
commit
|
commitdiff
|
tree
2015-05-22
Juni
o
C
H
amano
M
e
rg
e
branch 'sg/
c
o
m
pletion
-
o
m
i
t-
c
redenti
a
l-he
l
p
ers'
commit
|
commitdiff
|
tree
2015-05-22
J
unio C Hamano
M
erge bran
c
h 'dl/bra
n
ch-error
-
mes
s
age'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
Third batch
f
o
r
2
.
5 cy
c
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-19
J
u
nio C Hamano
M
erge b
r
anch 'sb/ref
-
l
ock
-
lose-lock-fd'
commit
|
commitdiff
|
tree
2015-05-19
Juni
o
C H
a
man
o
Merge branch
'
kn/cat-fi
l
e-liter
a
lly
'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
Merg
e
branch 'nd/dwim-wildcards-as-pathspecs'
commit
|
commitdiff
|
tree
2015-05-19
Junio C
H
a
mano
Mer
g
e branch 'jc/me
r
g
e'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
Merge branch
'ph/rebas
e
-i-r
e
do
'
commit
|
commitdiff
|
tree
2015-05-19
J
unio C Hamano
Merge branch 'jc/
t
est-p
r
e
r
eq-va
l
idate'
commit
|
commitdiff
|
tree
2015-05-19
Junio
C Hamano
Merge branch 'b
c
/connect-plink'
commit
|
commitdiff
|
tree
2015-05-19
Ju
n
io C Hamano
Merge
b
ra
n
ch 'j
k
/test-chain-lint'
commit
|
commitdiff
|
tree
2015-05-19
Jun
i
o C
H
ama
n
o
Merge
b
ranch 'f
g
/
d
ocume
n
t-commit-message-stripping
'
commit
|
commitdiff
|
tree
2015-05-19
Juni
o
C
H
amano
M
e
r
ge branch 'jk/stash-re
q
uire-cl
e
an
-
index'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Ham
a
no
Merge branch 'jk/git-no-more-
a
r
gv
0
-
p
ath-munging'
commit
|
commitdiff
|
tree
2015-05-19
Jun
i
o C
H
a
mano
M
erge branch 'jc/
g
itignore-precedence'
commit
|
commitdiff
|
tree
2015-05-19
Jun
i
o C Hamano
Merge
branc
h
'n
d
/dif
f
-i-
t
-a
'
commit
|
commitdiff
|
tree
2015-05-13
Jun
i
o
C Hamano
Sy
n
c wi
t
h 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 Hamano
Me
r
ge
bran
c
h
'sb/line-log
-
plug-pai
r
diff-le
a
k' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-13
J
unio C Haman
o
Mer
g
e br
a
nch 'sb/test-b
i
tma
p
-free-
a
t-end' into maint
commit
|
commitdiff
|
tree
2015-05-13
Junio C Hamano
M
e
rge branch 'n
d
/t1509-chro
o
t-t
e
st' into
m
aint
commit
|
commitdiff
|
tree
2015-05-13
J
un
i
o C
Ham
a
n
o
Merge branch 'jk
/
type-from-s
t
ring-gently'
i
n
to maint
commit
|
commitdiff
|
tree
2015-05-13
Junio C Ham
a
no
Merge branch 'ep/fix-test-lib-f
u
nctions-re
p
ort' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-13
Junio C
H
a
m
ano
Merge branch 'cn/bom-in-gitignore' into maint
commit
|
commitdiff
|
tree
2015-05-13
Junio
C Hamano
M
erge branch 'jk/prune-mtime
'
into maint
commit
|
commitdiff
|
tree
2015-05-13
Junio
C
Hama
n
o
Merge branc
h
'jk/init
-
core-worktree-at-root' into maint
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Me
r
ge
b
ranc
h
'mai
n
t'
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
Junio
C
Hamano
Git 2
.
3
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-11
Junio
C Ha
m
ano
Merge bra
n
ch 'mm/usage-
l
og-l-can-take-regex'
i
nto m
a
int-2
.
3
commit
|
commitdiff
|
tree
2015-05-11
Ju
n
io C Ha
m
an
o
M
e
rg
e
branch 'jc/diff-no-index-d-f' into
m
aint-2
.
3
commit
|
commitdiff
|
tree
2015-05-11
Jun
i
o C
H
a
m
ano
Merge branch '
o
h/fix-config-def
a
ult-user-
n
ame-section
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Me
r
ge
branc
h
'
j
c
/
epochtime-wo-tz' into ma
i
nt-2
.
3
commit
|
commitdiff
|
tree
2015-05-11
Junio C Ha
m
a
no
Second batch for
2
.
5
cyc
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-11
Junio
C H
a
m
a
no
Merge
branch 'pt/xdg-config
-
path'
commit
|
commitdiff
|
tree
2015-05-11
Junio
C
H
a
m
ano
Merge
b
ranch 'ep/do-not-f
e
ed-a-pointer-to-
a
rray-size
'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Me
r
ge bran
c
h 'jc/hash-object'
commit
|
commitdiff
|
tree
2015-05-11
Junio
C
Hamano
Mer
g
e branch 'sb/pre
f
ix-
p
ath-
f
r
e
e-results'
commit
|
commitdiff
|
tree
2015-05-11
J
u
nio C Hamano
Merge branch 'sg/comp
l
etion-no-re
d
undan
t
-all-command
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
J
u
nio C Hamano
Merge branch 'sg/com
p
lete-
d
e
c
or
a
te-full
-
n
ot-l
o
ng'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merg
e
b
ranch
'jk/filter-branch-use-of-sed-on-incomplete
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Jun
i
o C Ham
a
no
Merge branch 'jc/da
e
m
o
n-no-ipv6-for-2
.
4
.
1'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge branch 'jn/
c
lean-use-error-no
t
-fp
r
i
ntf-on-stder
r
'
commit
|
commitdiff
|
tree
2015-05-11
Juni
o
C Hamano
Mer
g
e
b
ranch 'tb/
b
lam
e
-r
e
surrect-convert-to-git'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge bran
c
h 'va
/
fix-
g
it-p4-tests'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge branch 'ld/p4-
c
ase-
f
o
l
d
'
commit
|
commitdiff
|
tree
2015-05-11
J
u
nio C
Hamano
M
e
rge bran
c
h 'jk/rebase-qui
e
t-noop'
commit
|
commitdiff
|
tree
2015-05-11
Ju
n
io C Hamano
Merge br
a
n
ch 'va/p
4
-client-p
a
th'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge branch 'mm/
a
dd-p-split-err
o
r
'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Ha
m
an
o
Merge branch 'tb
/
t002
7
-crlf'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Ham
a
no
Merge bran
c
h 'l
s
/p4
-
c
h
a
nges-block-size'
commit
|
commitdiff
|
tree
2015-05-11
Junio
C
Hamano
Merge branch 'jc/plug-fmt-me
r
ge-msg-le
a
k
'
commit
|
commitdiff
|
tree
2015-05-11
Juni
o
C
H
ama
n
o
M
e
r
ge branch
'
nd/slim-in
d
e
x
-pack-memory-usage'
commit
|
commitdiff
|
tree
2015-05-11
J
u
ni
o
C Hamano
Merge branch 'j
k
/
still-intere
s
ting'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge
branch
'
jk/re
a
ding-
p
acked-refs'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Haman
o
M
e
rg
e
branch 'lm/squelc
h
-b
g
-progress'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge branch 'jk/sha1-file-reduce
-
useless-warnings'
commit
|
commitdiff
|
tree
2015-05-11
Junio C
Ham
a
n
o
M
er
g
e
b
r
anch 'nd/multiple-
w
or
k
-trees'
commit
|
commitdiff
|
tree
2015-05-11
Junio C
Hamano
M
erge b
r
anch 'pt/credential-xdg'
commit
|
commitdiff
|
tree
2015-05-06
Junio
C Hamano
First batch for 2
.
5
cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-06
Jun
i
o C Hama
n
o
Merge bra
n
ch 'jk/prune
-
mtime'
commit
|
commitdiff
|
tree
2015-05-06
Junio
C
Hama
n
o
Merge b
r
anch
'
mm/usag
e
-log-l-c
a
n-ta
k
e
-
regex'
commit
|
commitdiff
|
tree
2015-05-06
Ju
n
io
C
Hamano
M
e
rge bran
c
h
'
ep/fix-
t
est
-
l
ib-fu
n
c
tions-report'
commit
|
commitdiff
|
tree
2015-05-06
Ju
n
io
C Ha
m
ano
Merge branch 'c
n
/bom-in-gitignor
e
'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge bra
n
ch
'
jc/epochtime-wo-tz'
commit
|
commitdiff
|
tree
2015-05-06
J
u
nio C Haman
o
Merge branch 'nd/t1509-chroot-test'
commit
|
commitdiff
|
tree
2015-05-06
Junio
C
Hamano
Merge branc
h
'oh/
f
ix-co
n
fig-
d
e
f
ault-use
r
-
n
ame-section'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge branch 'jk/type-from-string
-
gently'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
M
erge branch 'sb/test
-
bitmap-free-at-end'
commit
|
commitdiff
|
tree
2015-05-06
Junio
C
Hamano
Me
r
ge
bran
c
h
'ld/p4-filetype-det
e
ction'
commit
|
commitdiff
|
tree
2015-05-06
J
u
nio C Hamano
Merge
b
ranch 'ts/chec
k
out-adv
i
ce-pl
u
ral'
commit
|
commitdiff
|
tree
2015-05-06
Junio C H
a
mano
Merge b
r
a
nch 'jk/ini
t
-core-wor
k
tree-at-root'
commit
|
commitdiff
|
tree
2015-05-06
Ju
n
io C Hama
n
o
Merge branch
'mh/show-branch-topic'
commit
|
commitdiff
|
tree
2015-05-06
J
unio C Hamano
Merge branch 'sb/line
-
l
og-plug-pairdiff-l
e
ak'
commit
|
commitdiff
|
tree
2015-05-06
Junio C
H
amano
Me
r
ge b
r
anch 'jc/dif
f
-no-
i
ndex-
d
-f'
commit
|
commitdiff
|
tree
2015-05-06
Jun
i
o C
Hamano
Merge branch
'bc/object-
i
d
'
commit
|
commitdiff
|
tree
2015-05-05
Junio C Hamano
d
a
e
m
o
n
:
unbreak
NO_
I
P
V
6
build regressio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-05
Junio
C
Hamano
w
rit
e
_
s
h
a1_file(): do not us
e
a
s
eparate s
h
a1[] array
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-30
Junio
C
Hamano
G
i
t
2
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C H
a
mano
merge
:
deprecate 'git merge <message>
H
EA
D
<commit
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: handle FETCH_
H
EAD intern
a
lly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C
H
amano
merge: decide if we aut
o
-generate
t
he message
e
arly
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Ha
m
an
o
merg
e
: make c
o
l
lect_
p
a
r
ents()
auto-gener
a
te the m
e
rge
.
.
.
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
(
) logi
c
out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hama
n
o
merge:
n
arrow
scope o
f
merge_na
m
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C H
a
mano
merge: split reduce_parents() out
of
colle
c
t_p
a
rents()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C
Hamano
m
erge: clar
i
fy
co
l
lect_pare
n
ts()
logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C
H
a
mano
m
e
rge: small leakfix
and code si
m
plificat
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Ju
n
io C Ha
m
an
o
merge: do
not c
h
e
ck argc t
o
determin
e
number of remote
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: clarify "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
t
5
520:
test
p
u
l
ling an octopus i
n
to an unborn bran
c
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C
H
ama
n
o
t5520: st
y
le fixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Ju
n
io C Hamano
merg
e
: simplify code
f
low
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: test the
t
op-level merge driver
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-28
Ju
n
i
o C Hamano
test: validat
e
p
r
ereq
u
istes sy
n
ta
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-28
Junio
C
Hamano
Merge b
r
anch '
m
h/multimai
l
-renewal'
commit
|
commitdiff
|
tree
2015-04-28
Junio C Ham
a
n
o
Merge branch 'mg/show
-
note
s
-doc'
commit
|
commitdiff
|
tree
2015-04-28
Junio C Hamano
Me
r
ge br
a
nch 'nd/ve
r
sionc
m
p-prer
e
l
e
ases
'
commit
|
commitdiff
|
tree
2015-04-28
Junio C Hamano
Merge branch 'mg/sta
t
us-v-v
'
commit
|
commitdiff
|
tree
next